From 147a713cc066d493b50b82a9d475aa9af940e2b4 Mon Sep 17 00:00:00 2001
From: s9e <s9e.dev@gmail.com>
Date: Sat, 22 Nov 2014 20:00:58 +0100
Subject: [ticket/11768] This commit integrates s9e\TextFormatter

This commit integrates s9e\TextFormatter as outlined in
http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 335 +++++++++++++++++++++++++++++++
 1 file changed, 335 insertions(+)
 create mode 100644 phpBB/phpbb/textformatter/s9e/parser.php

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
new file mode 100644
index 0000000000..10e33f47e6
--- /dev/null
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -0,0 +1,335 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\textformatter\s9e;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use s9e\TextFormatter\Parser\BuiltInFilters;
+use s9e\TextFormatter\Parser\Logger;
+
+/**
+* s9e\TextFormatter\Parser adapter
+* @package phpBB3
+*/
+class parser extends \phpbb\textformatter\parser
+{
+	/**
+	* @var s9e\TextFormatter\Parser
+	*/
+	protected $parser;
+
+	/**
+	* @var phpbb\user User object, used for translating errors
+	*/
+	protected $user;
+
+	/**
+	* Constructor
+	*
+	* @param  phpbb\cache\driver_interface $cache
+	* @param  string $key Cache key
+	* @param  phpbb\user $user
+	* @param  Symfony\Component\DependencyInjection\ContainerInterface $container
+	* @return null
+	*/
+	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, \phpbb\user $user, ContainerInterface $container)
+	{
+		$this->user = $user;
+
+		$parser = $cache->get($key);
+		if (!$parser)
+		{
+			list($parser) = $container->get('text_formatter.s9e.factory')->regenerate();
+		}
+
+		$this->parser = $parser;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function parse($text)
+	{
+		return $this->parser->parse($text);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function disable_bbcode($name)
+	{
+		$this->parser->disableTag(strtoupper($name));
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function disable_bbcodes()
+	{
+		$this->parser->disablePlugin('BBCodes');
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function disable_censor()
+	{
+		$this->parser->disablePlugin('Censor');
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function disable_magic_url()
+	{
+		$this->parser->disablePlugin('Autoemail');
+		$this->parser->disablePlugin('Autolink');
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function disable_smilies()
+	{
+		$this->parser->disablePlugin('Emoticons');
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function enable_bbcode($name)
+	{
+		$this->parser->enableTag(strtoupper($name));
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function enable_bbcodes()
+	{
+		$this->parser->enablePlugin('BBCodes');
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function enable_censor()
+	{
+		$this->parser->enablePlugin('Censor');
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function enable_magic_url()
+	{
+		$this->parser->enablePlugin('Autoemail');
+		$this->parser->enablePlugin('Autolink');
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function enable_smilies()
+	{
+		$this->parser->enablePlugin('Emoticons');
+	}
+
+	/**
+	* {@inheritdoc}
+	*
+	* This will translate the log entries found in s9e\TextFormatter's logger into phpBB error
+	* messages
+	*/
+	public function get_errors()
+	{
+		$errors = array();
+
+		foreach ($this->parser->getLogger()->get() as $entry)
+		{
+			list($type, $msg, $context) = $entry;
+
+			if ($msg === 'Tag limit exceeded')
+			{
+				if ($context['tagName'] === 'E')
+				{
+					$errors[] = $this->user->lang('TOO_MANY_SMILIES', $context['tagLimit']);
+				}
+				else if ($context['tagName'] === 'URL')
+				{
+					$errors[] = $this->user->lang('TOO_MANY_URLS', $context['tagLimit']);
+				}
+			}
+			else if ($msg === 'MAX_FONT_SIZE_EXCEEDED')
+			{
+				$errors[] = $this->user->lang($msg, $context['max_size']);
+			}
+			else if (preg_match('/^MAX_(?:FLASH|IMG)_(HEIGHT|WIDTH)_EXCEEDED$/D', $msg, $m))
+			{
+				$errors[] = $this->user->lang($msg, $context['max_' . strtolower($m[1])]);
+			}
+			else if ($msg === 'Tag is disabled')
+			{
+				$name = strtolower($context['tag']->getName());
+				$errors[] = $this->user->lang('UNAUTHORISED_BBCODE', '[' . $name . ']');
+			}
+			else if ($msg === 'UNABLE_GET_IMAGE_SIZE')
+			{
+				$errors[] = $this->user->lang[$msg];
+			}
+		}
+
+		return array_unique($errors);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function set_var($name, $value)
+	{
+		if ($name === 'max_smilies')
+		{
+			$this->parser->setTagLimit('E', $value ?: PHP_INT_MAX);
+		}
+		else if ($name === 'max_urls')
+		{
+			$this->parser->setTagLimit('URL', $value ?: PHP_INT_MAX);
+		}
+		else
+		{
+			$this->parser->registeredVars[$name] = $value;
+		}
+	}
+
+	/**
+	* Filter a flash object's height
+	*
+	* @see bbcode_firstpass::bbcode_flash()
+	*
+	* @param  string  $height
+	* @param  integer $max_height
+	* @param  s9e\TextFormatter\Parser\Logger $logger
+	* @return mixed              Original value if valid, FALSE otherwise
+	*/
+	static public function filter_flash_height($height, $max_height, Logger $logger)
+	{
+		if ($max_height && $height > $max_height)
+		{
+			$logger->err('MAX_FLASH_HEIGHT_EXCEEDED', array('max_height' => $max_height));
+
+			return false;
+		}
+
+		return $height;
+	}
+
+	/**
+	* Filter a flash object's width
+	*
+	* @see bbcode_firstpass::bbcode_flash()
+	*
+	* @param  string  $width
+	* @param  integer $max_width
+	* @param  s9e\TextFormatter\Parser\Logger $logger
+	* @return mixed              Original value if valid, FALSE otherwise
+	*/
+	static public function filter_flash_width($width, $max_width, Logger $logger)
+	{
+		if ($max_width && $width > $max_width)
+		{
+			$logger->err('MAX_FLASH_WIDTH_EXCEEDED', array('max_width' => $max_width));
+
+			return false;
+		}
+
+		return $width;
+	}
+
+	/**
+	* Filter the value used in a [size] BBCode
+	*
+	* @see bbcode_firstpass::bbcode_size()
+	*
+	* @param  string  $size     Original size
+	* @param  integer $max_size Maximum allowed size
+	* @param  s9e\TextFormatter\Parser\Logger $logger
+	* @return mixed             Original value if valid, FALSE otherwise
+	*/
+	static public function filter_font_size($size, $max_size, Logger $logger)
+	{
+		if ($max_size && $size > $max_size)
+		{
+			$logger->err('MAX_FONT_SIZE_EXCEEDED', array('max_size' => $max_size));
+
+			return false;
+		}
+
+		if ($size < 1)
+		{
+			return false;
+		}
+
+		return $size;
+	}
+
+	/**
+	* Filter an image's URL to enforce restrictions on its dimensions
+	*
+	* @see bbcode_firstpass::bbcode_img()
+	*
+	* @param  string  $url        Original URL
+	* @param  array   $url_config Config used by the URL filter
+	* @param  s9e\TextFormatter\Parser\Logger $logger
+	* @param  integer $max_height Maximum height allowed
+	* @param  integer $max_width  Maximum width allowed
+	* @return string|bool         Original value if valid, FALSE otherwise
+	*/
+	static public function filter_img_url($url, array $url_config, Logger $logger, $max_height, $max_width)
+	{
+		// Validate the URL
+		$url = BuiltInFilters::filterUrl($url, $url_config, $logger);
+
+		if ($url === false)
+		{
+			return false;
+		}
+
+		if ($max_height || $max_width)
+		{
+			$stats = @getimagesize($url);
+
+			if ($stats === false)
+			{
+				$logger->err('UNABLE_GET_IMAGE_SIZE');
+
+				return false;
+			}
+
+			if ($max_height && $max_height < $stats[1])
+			{
+				$logger->err('MAX_IMG_HEIGHT_EXCEEDED', array('max_height' => $max_height));
+
+				return false;
+			}
+
+			if ($max_width && $max_width < $stats[0])
+			{
+				$logger->err('MAX_IMG_WIDTH_EXCEEDED', array('max_width' => $max_width));
+
+				return false;
+			}
+		}
+
+		return $url;
+	}
+}
-- 
cgit v1.2.1


From cf39b02891d5ab021e4abc0932e1bb964cbd680c Mon Sep 17 00:00:00 2001
From: s9e <s9e.dev@gmail.com>
Date: Thu, 8 Jan 2015 11:28:23 +0100
Subject: [ticket/11768] Updated annotations to pass sniff

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 10e33f47e6..58cef8fa9e 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -39,7 +39,7 @@ class parser extends \phpbb\textformatter\parser
 	* @param  phpbb\cache\driver_interface $cache
 	* @param  string $key Cache key
 	* @param  phpbb\user $user
-	* @param  Symfony\Component\DependencyInjection\ContainerInterface $container
+	* @param  ContainerInterface $container
 	* @return null
 	*/
 	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, \phpbb\user $user, ContainerInterface $container)
@@ -218,7 +218,7 @@ class parser extends \phpbb\textformatter\parser
 	*
 	* @param  string  $height
 	* @param  integer $max_height
-	* @param  s9e\TextFormatter\Parser\Logger $logger
+	* @param  Logger  $logger
 	* @return mixed              Original value if valid, FALSE otherwise
 	*/
 	static public function filter_flash_height($height, $max_height, Logger $logger)
@@ -240,7 +240,7 @@ class parser extends \phpbb\textformatter\parser
 	*
 	* @param  string  $width
 	* @param  integer $max_width
-	* @param  s9e\TextFormatter\Parser\Logger $logger
+	* @param  Logger  $logger
 	* @return mixed              Original value if valid, FALSE otherwise
 	*/
 	static public function filter_flash_width($width, $max_width, Logger $logger)
@@ -262,7 +262,7 @@ class parser extends \phpbb\textformatter\parser
 	*
 	* @param  string  $size     Original size
 	* @param  integer $max_size Maximum allowed size
-	* @param  s9e\TextFormatter\Parser\Logger $logger
+	* @param  Logger  $logger
 	* @return mixed             Original value if valid, FALSE otherwise
 	*/
 	static public function filter_font_size($size, $max_size, Logger $logger)
@@ -289,7 +289,7 @@ class parser extends \phpbb\textformatter\parser
 	*
 	* @param  string  $url        Original URL
 	* @param  array   $url_config Config used by the URL filter
-	* @param  s9e\TextFormatter\Parser\Logger $logger
+	* @param  Logger  $logger
 	* @param  integer $max_height Maximum height allowed
 	* @param  integer $max_width  Maximum width allowed
 	* @return string|bool         Original value if valid, FALSE otherwise
-- 
cgit v1.2.1


From 72fb380c9fbb0d6fa51236bdc179ba7ef6126a5a Mon Sep 17 00:00:00 2001
From: s9e <s9e.dev@gmail.com>
Date: Wed, 4 Feb 2015 23:07:58 +0100
Subject: [ticket/11768] Updated constructors with explicit dependencies

The trade-off is that an instance of phpbb\textformatter\s9e\factory and
phpbb\textformatter\data_access is created on any page that uses the
parser or the renderer, even when neither need to be regenerated. It has
no measureable impact on performance and costs ~20KB of RAM.

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 58cef8fa9e..d9f693ba18 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -39,17 +39,17 @@ class parser extends \phpbb\textformatter\parser
 	* @param  phpbb\cache\driver_interface $cache
 	* @param  string $key Cache key
 	* @param  phpbb\user $user
-	* @param  ContainerInterface $container
+	* @param  factory $factory
 	* @return null
 	*/
-	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, \phpbb\user $user, ContainerInterface $container)
+	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, \phpbb\user $user, factory $factory)
 	{
 		$this->user = $user;
 
 		$parser = $cache->get($key);
 		if (!$parser)
 		{
-			list($parser) = $container->get('text_formatter.s9e.factory')->regenerate();
+			list($parser) = $factory->regenerate();
 		}
 
 		$this->parser = $parser;
-- 
cgit v1.2.1


From 3b115a903a5651f05ac388dea774d1b4022e2ed8 Mon Sep 17 00:00:00 2001
From: s9e <s9e.dev@gmail.com>
Date: Thu, 5 Feb 2015 00:59:29 +0100
Subject: [ticket/11768] Removed unused use statements

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index d9f693ba18..3b490131f2 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -13,7 +13,6 @@
 
 namespace phpbb\textformatter\s9e;
 
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use s9e\TextFormatter\Parser\BuiltInFilters;
 use s9e\TextFormatter\Parser\Logger;
 
-- 
cgit v1.2.1


From 6bd86a8e8a7c8e2ccf90d02343132c085978cd44 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sun, 15 Feb 2015 03:08:36 +0100
Subject: [ticket/11768] Updated phpbb\textformatter\s9e\factory::regenerate()

Returns an associative array rather than a numerically-indexed array. Feels
cleaner and more extensible.

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 3b490131f2..8e78a18d40 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -48,7 +48,7 @@ class parser extends \phpbb\textformatter\parser
 		$parser = $cache->get($key);
 		if (!$parser)
 		{
-			list($parser) = $factory->regenerate();
+			extract($factory->regenerate());
 		}
 
 		$this->parser = $parser;
-- 
cgit v1.2.1


From c1ba3a678d5a565b74d893c57eb5133623702350 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Mon, 23 Feb 2015 19:03:41 +0100
Subject: [ticket/11768] Added methods to access the library's parser/renderer

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 8e78a18d40..b717dea962 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -191,6 +191,16 @@ class parser extends \phpbb\textformatter\parser
 		return array_unique($errors);
 	}
 
+	/**
+	* Return the instance of s9e\TextFormatter\Parser used by this object
+	*
+	* @return s9e\TextFormatter\Parser
+	*/
+	public function get_parser()
+	{
+		return $this->parser;
+	}
+
 	/**
 	* {@inheritdoc}
 	*/
-- 
cgit v1.2.1


From baadc2a6e52437d9d5912c828a337a3c2866c9eb Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Tue, 3 Mar 2015 00:38:35 +0100
Subject: [ticket/11768] Removed unused annotations

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index b717dea962..977097462b 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -18,7 +18,6 @@ use s9e\TextFormatter\Parser\Logger;
 
 /**
 * s9e\TextFormatter\Parser adapter
-* @package phpBB3
 */
 class parser extends \phpbb\textformatter\parser
 {
-- 
cgit v1.2.1


From 694e515f7c812a470a9a1890aa49ba6ad59385fb Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Tue, 3 Mar 2015 00:52:31 +0100
Subject: [ticket/11768] Replaced \phpbb\textformatter\parser with an interface

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 977097462b..de51929994 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -19,7 +19,7 @@ use s9e\TextFormatter\Parser\Logger;
 /**
 * s9e\TextFormatter\Parser adapter
 */
-class parser extends \phpbb\textformatter\parser
+class parser implements \phpbb\textformatter\parser
 {
 	/**
 	* @var s9e\TextFormatter\Parser
@@ -219,6 +219,17 @@ class parser extends \phpbb\textformatter\parser
 		}
 	}
 
+	/**
+	* {@inheritdoc}
+	*/
+	public function set_vars(array $vars)
+	{
+		foreach ($vars as $name => $value)
+		{
+			$this->set_var($name, $value);
+		}
+	}
+
 	/**
 	* Filter a flash object's height
 	*
-- 
cgit v1.2.1


From 458cf95b1e0614b8dbecaca36c57f21e8a3a7bb7 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Tue, 3 Mar 2015 00:58:38 +0100
Subject: [ticket/11768] Replaced class names in annotations with their FQN

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index de51929994..4362a7870e 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -34,9 +34,9 @@ class parser implements \phpbb\textformatter\parser
 	/**
 	* Constructor
 	*
-	* @param  phpbb\cache\driver_interface $cache
+	* @param  \phpbb\cache\driver_interface $cache
 	* @param  string $key Cache key
-	* @param  phpbb\user $user
+	* @param  \phpbb\user $user
 	* @param  factory $factory
 	* @return null
 	*/
-- 
cgit v1.2.1


From 6cb3fb614022fe4e56a6651ffad4f476056ae520 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Tue, 3 Mar 2015 01:44:48 +0100
Subject: [ticket/11768] Replaced FQNs in annotations

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 4362a7870e..bf0e715ada 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -22,12 +22,12 @@ use s9e\TextFormatter\Parser\Logger;
 class parser implements \phpbb\textformatter\parser
 {
 	/**
-	* @var s9e\TextFormatter\Parser
+	* @var \s9e\TextFormatter\Parser
 	*/
 	protected $parser;
 
 	/**
-	* @var phpbb\user User object, used for translating errors
+	* @var \phpbb\user User object, used for translating errors
 	*/
 	protected $user;
 
-- 
cgit v1.2.1


From dc9a28d346370b38c10def92358170a5cef23b36 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Tue, 3 Mar 2015 03:07:23 +0100
Subject: [ticket/11768] Replaced extract() calls

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index bf0e715ada..be717bb1c9 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -47,7 +47,8 @@ class parser implements \phpbb\textformatter\parser
 		$parser = $cache->get($key);
 		if (!$parser)
 		{
-			extract($factory->regenerate());
+			$objects = $factory->regenerate();
+			$parser  = $objects['parser'];
 		}
 
 		$this->parser = $parser;
-- 
cgit v1.2.1


From 8411db62576a73beb921d58953bb5b767d4ee079 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 6 Mar 2015 10:21:15 +0100
Subject: [ticket/11768] Renamed interfaces

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index be717bb1c9..4775175f73 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -19,7 +19,7 @@ use s9e\TextFormatter\Parser\Logger;
 /**
 * s9e\TextFormatter\Parser adapter
 */
-class parser implements \phpbb\textformatter\parser
+class parser implements \phpbb\textformatter\parser_interface
 {
 	/**
 	* @var \s9e\TextFormatter\Parser
-- 
cgit v1.2.1


From 89d87a99db403d7045406b869a92258e61122f67 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 6 Mar 2015 11:11:07 +0100
Subject: [ticket/11768] Replaced array access with call to $user->lang()

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 4775175f73..f3e437b163 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -184,7 +184,7 @@ class parser implements \phpbb\textformatter\parser_interface
 			}
 			else if ($msg === 'UNABLE_GET_IMAGE_SIZE')
 			{
-				$errors[] = $this->user->lang[$msg];
+				$errors[] = $this->user->lang($msg);
 			}
 		}
 
-- 
cgit v1.2.1


From 40c54898ccd80744ba159784d631328e0338bad2 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 6 Mar 2015 13:08:18 +0100
Subject: [ticket/11768] Updated various annotations

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index f3e437b163..2f4a03d4c2 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -34,11 +34,10 @@ class parser implements \phpbb\textformatter\parser_interface
 	/**
 	* Constructor
 	*
-	* @param  \phpbb\cache\driver_interface $cache
-	* @param  string $key Cache key
-	* @param  \phpbb\user $user
-	* @param  factory $factory
-	* @return null
+	* @param \phpbb\cache\driver_interface $cache
+	* @param string $key Cache key
+	* @param \phpbb\user $user
+	* @param factory $factory
 	*/
 	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, \phpbb\user $user, factory $factory)
 	{
@@ -194,7 +193,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	/**
 	* Return the instance of s9e\TextFormatter\Parser used by this object
 	*
-	* @return s9e\TextFormatter\Parser
+	* @return \s9e\TextFormatter\Parser
 	*/
 	public function get_parser()
 	{
-- 
cgit v1.2.1


From 2a462bb7e43b848d0277bd27e14ca4d645230eeb Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Wed, 25 Mar 2015 01:13:31 +0100
Subject: [ticket/11768] Removed get_parser() / get_renderer() accessors

There's no need to access the s9e\TextFormatter objects outside of events.

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 2f4a03d4c2..6fda94d7ba 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -190,16 +190,6 @@ class parser implements \phpbb\textformatter\parser_interface
 		return array_unique($errors);
 	}
 
-	/**
-	* Return the instance of s9e\TextFormatter\Parser used by this object
-	*
-	* @return \s9e\TextFormatter\Parser
-	*/
-	public function get_parser()
-	{
-		return $this->parser;
-	}
-
 	/**
 	* {@inheritdoc}
 	*/
-- 
cgit v1.2.1


From a7a53d5a30d4736f8114721c0d7019d64d24cda2 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Wed, 25 Mar 2015 01:39:19 +0100
Subject: [ticket/11768] Added core.text_formatter_s9e_parser_setup event

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 33 ++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 6fda94d7ba..37900d3d7c 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -21,6 +21,11 @@ use s9e\TextFormatter\Parser\Logger;
 */
 class parser implements \phpbb\textformatter\parser_interface
 {
+	/**
+	* @var \phpbb\event\dispatcher_interface
+	*/
+	protected $dispatcher;
+
 	/**
 	* @var \s9e\TextFormatter\Parser
 	*/
@@ -38,19 +43,39 @@ class parser implements \phpbb\textformatter\parser_interface
 	* @param string $key Cache key
 	* @param \phpbb\user $user
 	* @param factory $factory
+	* @param \phpbb\event\dispatcher_interface $dispatcher
 	*/
-	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, \phpbb\user $user, factory $factory)
+	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, \phpbb\user $user, factory $factory, \phpbb\event\dispatcher_interface $dispatcher)
 	{
-		$this->user = $user;
-
 		$parser = $cache->get($key);
 		if (!$parser)
 		{
 			$objects = $factory->regenerate();
 			$parser  = $objects['parser'];
 		}
-
+		$self = $this;
+
+		/**
+		* Configure the parser service
+		*
+		* Can be used to:
+		*  - toggle features according to the user's preferences,
+		*  - toggle BBCodes according to the user's permissions,
+		*  - register variables or custom parsers in the s9e\TextFormatter
+		*  - configure the s9e\TextFormatter parser
+		*
+		* @event core.text_formatter_s9e_parser_setup
+		* @var \s9e\TextFormatter\Parser parser s9e\TextFormatter parser instance
+		* @var \phpbb\textformatter\s9e\parser self This parser service
+		* @var \phpbb\user user Current user
+		* @since 3.2.0-a1
+		*/
+		$vars = array('parser', 'self', 'user');
+		extract($dispatcher->trigger_event('core.text_formatter_s9e_parser_setup', compact($vars)));
+
+		$this->dispatcher = $dispatcher;
 		$this->parser = $parser;
+		$this->user = $user;
 	}
 
 	/**
-- 
cgit v1.2.1


From f75f63b264b2005faedb699dd867bd1d9c429a09 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Thu, 26 Mar 2015 05:20:23 +0100
Subject: [ticket/11768] Added parser events

Added core.text_formatter_s9e_parse_before and
core.text_formatter_s9e_parse_after

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 37900d3d7c..f220dd3e64 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -83,7 +83,33 @@ class parser implements \phpbb\textformatter\parser_interface
 	*/
 	public function parse($text)
 	{
-		return $this->parser->parse($text);
+		$self = $this;
+
+		/**
+		* Modify a text before it is parsed
+		*
+		* @event core.text_formatter_s9e_parse_before
+		* @var \phpbb\textformatter\s9e\parser self This parser service
+		* @var string text The original text
+		* @since 3.2.0-a1
+		*/
+		$vars = array('self', 'text');
+		extract($this->dispatcher->trigger_event('core.text_formatter_s9e_parse_before', compact($vars)));
+
+		$xml = $this->parser->parse($text);
+
+		/**
+		* Modify a parsed text in its XML form
+		*
+		* @event core.text_formatter_s9e_parse_after
+		* @var \phpbb\textformatter\s9e\parser self This parser service
+		* @var string xml The parsed text, in XML
+		* @since 3.2.0-a1
+		*/
+		$vars = array('self', 'xml');
+		extract($this->dispatcher->trigger_event('core.text_formatter_s9e_parse_after', compact($vars)));
+
+		return $xml;
 	}
 
 	/**
-- 
cgit v1.2.1


From 0f30301a0cf01c609cdcd5e4d777a47872a4dcba Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Thu, 26 Mar 2015 18:32:13 +0100
Subject: [ticket/11768] Moved parser/renderer setup events

Moved down the setup events to make them happen after the service is
configured and ready to be used

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index f220dd3e64..ab81a0ab4f 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -53,6 +53,10 @@ class parser implements \phpbb\textformatter\parser_interface
 			$objects = $factory->regenerate();
 			$parser  = $objects['parser'];
 		}
+
+		$this->dispatcher = $dispatcher;
+		$this->parser = $parser;
+		$this->user = $user;
 		$self = $this;
 
 		/**
@@ -72,10 +76,6 @@ class parser implements \phpbb\textformatter\parser_interface
 		*/
 		$vars = array('parser', 'self', 'user');
 		extract($dispatcher->trigger_event('core.text_formatter_s9e_parser_setup', compact($vars)));
-
-		$this->dispatcher = $dispatcher;
-		$this->parser = $parser;
-		$this->user = $user;
 	}
 
 	/**
-- 
cgit v1.2.1


From 3e04e643df4ca5463450df5d94f3caca3e5596c0 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 27 Mar 2015 01:12:57 +0100
Subject: [ticket/11768] Restored get_parser() / get_renderer()

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index ab81a0ab4f..fb6ef03c1c 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -241,6 +241,16 @@ class parser implements \phpbb\textformatter\parser_interface
 		return array_unique($errors);
 	}
 
+	/**
+	* Return the instance of s9e\TextFormatter\Parser used by this object
+	*
+	* @return \s9e\TextFormatter\Parser
+	*/
+	public function get_parser()
+	{
+		return $this->parser;
+	}
+
 	/**
 	* {@inheritdoc}
 	*/
-- 
cgit v1.2.1


From d8e7e11ee3a5c49e80a4ec3e0bdf2011ba5e9ce7 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 27 Mar 2015 01:29:09 +0100
Subject: [ticket/11768] Renamed service vars

The name of the variable that holds the service instance is now consistent
across events.

PHPBB3-11768
---
 phpBB/phpbb/textformatter/s9e/parser.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index fb6ef03c1c..77328ee4d9 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -57,7 +57,7 @@ class parser implements \phpbb\textformatter\parser_interface
 		$this->dispatcher = $dispatcher;
 		$this->parser = $parser;
 		$this->user = $user;
-		$self = $this;
+		$parser = $this;
 
 		/**
 		* Configure the parser service
@@ -69,12 +69,11 @@ class parser implements \phpbb\textformatter\parser_interface
 		*  - configure the s9e\TextFormatter parser
 		*
 		* @event core.text_formatter_s9e_parser_setup
-		* @var \s9e\TextFormatter\Parser parser s9e\TextFormatter parser instance
-		* @var \phpbb\textformatter\s9e\parser self This parser service
+		* @var \phpbb\textformatter\s9e\parser parser This parser service
 		* @var \phpbb\user user Current user
 		* @since 3.2.0-a1
 		*/
-		$vars = array('parser', 'self', 'user');
+		$vars = array('parser', 'user');
 		extract($dispatcher->trigger_event('core.text_formatter_s9e_parser_setup', compact($vars)));
 	}
 
@@ -83,17 +82,17 @@ class parser implements \phpbb\textformatter\parser_interface
 	*/
 	public function parse($text)
 	{
-		$self = $this;
+		$parser = $this;
 
 		/**
 		* Modify a text before it is parsed
 		*
 		* @event core.text_formatter_s9e_parse_before
-		* @var \phpbb\textformatter\s9e\parser self This parser service
+		* @var \phpbb\textformatter\s9e\parser parser This parser service
 		* @var string text The original text
 		* @since 3.2.0-a1
 		*/
-		$vars = array('self', 'text');
+		$vars = array('parser', 'text');
 		extract($this->dispatcher->trigger_event('core.text_formatter_s9e_parse_before', compact($vars)));
 
 		$xml = $this->parser->parse($text);
@@ -102,11 +101,11 @@ class parser implements \phpbb\textformatter\parser_interface
 		* Modify a parsed text in its XML form
 		*
 		* @event core.text_formatter_s9e_parse_after
-		* @var \phpbb\textformatter\s9e\parser self This parser service
+		* @var \phpbb\textformatter\s9e\parser parser This parser service
 		* @var string xml The parsed text, in XML
 		* @since 3.2.0-a1
 		*/
-		$vars = array('self', 'xml');
+		$vars = array('parser', 'xml');
 		extract($this->dispatcher->trigger_event('core.text_formatter_s9e_parse_after', compact($vars)));
 
 		return $xml;
-- 
cgit v1.2.1


From 245d042e43374e6467f447507783a68fae186ef1 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Mon, 6 Apr 2015 21:32:22 +0200
Subject: [ticket/8672] Updated the text_formatter.s9e service

PHPBB3-8672
---
 phpBB/phpbb/textformatter/s9e/parser.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 77328ee4d9..0582f235e0 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -367,7 +367,6 @@ class parser implements \phpbb\textformatter\parser_interface
 	{
 		// Validate the URL
 		$url = BuiltInFilters::filterUrl($url, $url_config, $logger);
-
 		if ($url === false)
 		{
 			return false;
@@ -375,26 +374,23 @@ class parser implements \phpbb\textformatter\parser_interface
 
 		if ($max_height || $max_width)
 		{
-			$stats = @getimagesize($url);
-
-			if ($stats === false)
+			$imagesize = new \phpbb\upload\imagesize();
+			$size_info = $imagesize->get_imagesize($url);
+			if ($size_info === false)
 			{
 				$logger->err('UNABLE_GET_IMAGE_SIZE');
-
 				return false;
 			}
 
-			if ($max_height && $max_height < $stats[1])
+			if ($max_height && $max_height < $size_info['height'])
 			{
 				$logger->err('MAX_IMG_HEIGHT_EXCEEDED', array('max_height' => $max_height));
-
 				return false;
 			}
 
-			if ($max_width && $max_width < $stats[0])
+			if ($max_width && $max_width < $size_info['width'])
 			{
 				$logger->err('MAX_IMG_WIDTH_EXCEEDED', array('max_width' => $max_width));
-
 				return false;
 			}
 		}
-- 
cgit v1.2.1


From 39d6180c6814996dde84cfcd8c0150bba37354ac Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 7 Apr 2015 16:19:36 +0200
Subject: [ticket/8672] Use fastImageSize in classes

PHPBB3-8672
---
 phpBB/phpbb/textformatter/s9e/parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 0582f235e0..e46a0578d2 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -374,8 +374,8 @@ class parser implements \phpbb\textformatter\parser_interface
 
 		if ($max_height || $max_width)
 		{
-			$imagesize = new \phpbb\upload\imagesize();
-			$size_info = $imagesize->get_imagesize($url);
+			$imagesize = new \fastImageSize\fastImageSize();
+			$size_info = $imagesize->getImageSize($url);
 			if ($size_info === false)
 			{
 				$logger->err('UNABLE_GET_IMAGE_SIZE');
-- 
cgit v1.2.1


From deadc0665298f18a937fc959da449e9098873c0b Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Thu, 30 Apr 2015 23:01:28 +0200
Subject: [ticket/13801] Removed user dependency from text_formatter.s9e.parser

PHPBB3-13801
---
 phpBB/phpbb/textformatter/s9e/parser.php | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index e46a0578d2..178669d84f 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -31,21 +31,15 @@ class parser implements \phpbb\textformatter\parser_interface
 	*/
 	protected $parser;
 
-	/**
-	* @var \phpbb\user User object, used for translating errors
-	*/
-	protected $user;
-
 	/**
 	* Constructor
 	*
 	* @param \phpbb\cache\driver_interface $cache
 	* @param string $key Cache key
-	* @param \phpbb\user $user
 	* @param factory $factory
 	* @param \phpbb\event\dispatcher_interface $dispatcher
 	*/
-	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, \phpbb\user $user, factory $factory, \phpbb\event\dispatcher_interface $dispatcher)
+	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, factory $factory, \phpbb\event\dispatcher_interface $dispatcher)
 	{
 		$parser = $cache->get($key);
 		if (!$parser)
@@ -56,24 +50,20 @@ class parser implements \phpbb\textformatter\parser_interface
 
 		$this->dispatcher = $dispatcher;
 		$this->parser = $parser;
-		$this->user = $user;
 		$parser = $this;
 
 		/**
 		* Configure the parser service
 		*
 		* Can be used to:
-		*  - toggle features according to the user's preferences,
-		*  - toggle BBCodes according to the user's permissions,
 		*  - register variables or custom parsers in the s9e\TextFormatter
 		*  - configure the s9e\TextFormatter parser
 		*
 		* @event core.text_formatter_s9e_parser_setup
 		* @var \phpbb\textformatter\s9e\parser parser This parser service
-		* @var \phpbb\user user Current user
 		* @since 3.2.0-a1
 		*/
-		$vars = array('parser', 'user');
+		$vars = array('parser');
 		extract($dispatcher->trigger_event('core.text_formatter_s9e_parser_setup', compact($vars)));
 	}
 
@@ -202,7 +192,6 @@ class parser implements \phpbb\textformatter\parser_interface
 	public function get_errors()
 	{
 		$errors = array();
-
 		foreach ($this->parser->getLogger()->get() as $entry)
 		{
 			list($type, $msg, $context) = $entry;
@@ -211,29 +200,29 @@ class parser implements \phpbb\textformatter\parser_interface
 			{
 				if ($context['tagName'] === 'E')
 				{
-					$errors[] = $this->user->lang('TOO_MANY_SMILIES', $context['tagLimit']);
+					$errors[] = array('TOO_MANY_SMILIES', $context['tagLimit']);
 				}
 				else if ($context['tagName'] === 'URL')
 				{
-					$errors[] = $this->user->lang('TOO_MANY_URLS', $context['tagLimit']);
+					$errors[] = array('TOO_MANY_URLS', $context['tagLimit']);
 				}
 			}
 			else if ($msg === 'MAX_FONT_SIZE_EXCEEDED')
 			{
-				$errors[] = $this->user->lang($msg, $context['max_size']);
+				$errors[] = array($msg, $context['max_size']);
 			}
 			else if (preg_match('/^MAX_(?:FLASH|IMG)_(HEIGHT|WIDTH)_EXCEEDED$/D', $msg, $m))
 			{
-				$errors[] = $this->user->lang($msg, $context['max_' . strtolower($m[1])]);
+				$errors[] = array($msg, $context['max_' . strtolower($m[1])]);
 			}
 			else if ($msg === 'Tag is disabled')
 			{
 				$name = strtolower($context['tag']->getName());
-				$errors[] = $this->user->lang('UNAUTHORISED_BBCODE', '[' . $name . ']');
+				$errors[] = array('UNAUTHORISED_BBCODE', '[' . $name . ']');
 			}
 			else if ($msg === 'UNABLE_GET_IMAGE_SIZE')
 			{
-				$errors[] = $this->user->lang($msg);
+				$errors[] = array($msg);
 			}
 		}
 
-- 
cgit v1.2.1


From 7b552152b416d9f0c2e873f6f70c4d3cec575ea6 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 8 May 2015 14:51:46 +0200
Subject: [ticket/13801] Updated comments for clarity

PHPBB3-13801
---
 phpBB/phpbb/textformatter/s9e/parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 178669d84f..ee033f6d21 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -186,7 +186,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	/**
 	* {@inheritdoc}
 	*
-	* This will translate the log entries found in s9e\TextFormatter's logger into phpBB error
+	* This will convert the log entries found in s9e\TextFormatter's logger into phpBB error
 	* messages
 	*/
 	public function get_errors()
-- 
cgit v1.2.1


From 5772e06b1aace1d5fbef263217e71ad10347364d Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sun, 17 May 2015 14:09:02 +0200
Subject: [ticket/13801] Updated event description [ci skip]

PHPBB3-13801
---
 phpBB/phpbb/textformatter/s9e/parser.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index ee033f6d21..b7d0b2b90b 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -56,8 +56,9 @@ class parser implements \phpbb\textformatter\parser_interface
 		* Configure the parser service
 		*
 		* Can be used to:
-		*  - register variables or custom parsers in the s9e\TextFormatter
-		*  - configure the s9e\TextFormatter parser
+		*  - toggle features or BBCodes
+		*  - register variables or custom parsers in the s9e\TextFormatter parser
+		*  - configure the s9e\TextFormatter parser's runtime settings
 		*
 		* @event core.text_formatter_s9e_parser_setup
 		* @var \phpbb\textformatter\s9e\parser parser This parser service
-- 
cgit v1.2.1


From e0f7c225bc8f6cf8e62dcfc146bdd630e15b6e22 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Thu, 28 May 2015 12:23:45 +0200
Subject: [ticket/13860] Fixed array-to-string conversion

PHPBB3-13860
---
 phpBB/phpbb/textformatter/s9e/parser.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index b7d0b2b90b..838c211e56 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -227,7 +227,13 @@ class parser implements \phpbb\textformatter\parser_interface
 			}
 		}
 
-		return array_unique($errors);
+		// Deduplicate error messages. array_unique() only works on strings so we have to serialize
+		if (!empty($errors))
+		{
+			$errors = array_map('unserialize', array_unique(array_map('serialize', $errors)));
+		}
+
+		return $errors;
 	}
 
 	/**
-- 
cgit v1.2.1


From 58286171f1035495c8c2a6fdffce9f3842601e66 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 8 Sep 2015 12:59:55 +0200
Subject: [ticket/14150] Update fast-image-size to newest version

PHPBB3-14150
---
 phpBB/phpbb/textformatter/s9e/parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 838c211e56..ffaffbc63c 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -370,7 +370,7 @@ class parser implements \phpbb\textformatter\parser_interface
 
 		if ($max_height || $max_width)
 		{
-			$imagesize = new \fastImageSize\fastImageSize();
+			$imagesize = new \FastImageSize\FastImageSize();
 			$size_info = $imagesize->getImageSize($url);
 			if ($size_info === false)
 			{
-- 
cgit v1.2.1


From 73e6e5b77faadbb7676961bf38122d669de111db Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 3 Dec 2015 17:50:29 +0100
Subject: [ticket/13454] Remove unused variables

This is the first part of the changes. More to come.

PHPBB3-13454
---
 phpBB/phpbb/textformatter/s9e/parser.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index ffaffbc63c..6470bb8245 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -50,7 +50,6 @@ class parser implements \phpbb\textformatter\parser_interface
 
 		$this->dispatcher = $dispatcher;
 		$this->parser = $parser;
-		$parser = $this;
 
 		/**
 		* Configure the parser service
@@ -73,8 +72,6 @@ class parser implements \phpbb\textformatter\parser_interface
 	*/
 	public function parse($text)
 	{
-		$parser = $this;
-
 		/**
 		* Modify a text before it is parsed
 		*
-- 
cgit v1.2.1


From 38f36882177d25e58d5de41060d51f869a20f8d5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Dec 2015 14:03:43 +0100
Subject: [ticket/13454] Fix a few issues introduced by overdeleting stuff

PHPBB3-13454
---
 phpBB/phpbb/textformatter/s9e/parser.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 6470bb8245..39e91f037e 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -51,6 +51,8 @@ class parser implements \phpbb\textformatter\parser_interface
 		$this->dispatcher = $dispatcher;
 		$this->parser = $parser;
 
+		$parser = $this;
+
 		/**
 		* Configure the parser service
 		*
@@ -72,6 +74,8 @@ class parser implements \phpbb\textformatter\parser_interface
 	*/
 	public function parse($text)
 	{
+		$parser = $this;
+
 		/**
 		* Modify a text before it is parsed
 		*
-- 
cgit v1.2.1


From 73900d1857a9a59eff82b224537a79110466ce7e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 5 Dec 2015 16:07:14 +0100
Subject: [ticket/13454] Remove more unused variables

This should be the last part. Off to checking if the changes were correct.

PHPBB3-13454
---
 phpBB/phpbb/textformatter/s9e/parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 39e91f037e..e2653d60f0 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -196,7 +196,7 @@ class parser implements \phpbb\textformatter\parser_interface
 		$errors = array();
 		foreach ($this->parser->getLogger()->get() as $entry)
 		{
-			list($type, $msg, $context) = $entry;
+			list(, $msg, $context) = $entry;
 
 			if ($msg === 'Tag limit exceeded')
 			{
-- 
cgit v1.2.1


From 15315ac87a68834e2d560acf62756f628a26da45 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sat, 14 Jan 2017 14:27:38 +0100
Subject: [ticket/15008] Disable emoji when smilies are disabled

Will effectively disable emoji shortname and won't replace emoji
with images but will not prevent a browser or OS from displaying
emoji as images.

PHPBB3-15008
---
 phpBB/phpbb/textformatter/s9e/parser.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index e2653d60f0..05ddfffa11 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -142,6 +142,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	public function disable_smilies()
 	{
 		$this->parser->disablePlugin('Emoticons');
+		$this->parser->disablePlugin('Emoji');
 	}
 
 	/**
@@ -183,6 +184,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	public function enable_smilies()
 	{
 		$this->parser->enablePlugin('Emoticons');
+		$this->parser->enablePlugin('Emoji');
 	}
 
 	/**
-- 
cgit v1.2.1


From b9dce3fa65a508baa02bc66e86e68b931e0ba670 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sun, 10 Dec 2017 02:54:38 +0100
Subject: [ticket/15457] Updated s9e/text-formatter dependency

PHPBB3-15457
---
 phpBB/phpbb/textformatter/s9e/parser.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 05ddfffa11..3698dca224 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -13,7 +13,7 @@
 
 namespace phpbb\textformatter\s9e;
 
-use s9e\TextFormatter\Parser\BuiltInFilters;
+use s9e\TextFormatter\Parser\AttributeFilters\UrlFilter;
 use s9e\TextFormatter\Parser\Logger;
 
 /**
@@ -196,7 +196,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	public function get_errors()
 	{
 		$errors = array();
-		foreach ($this->parser->getLogger()->get() as $entry)
+		foreach ($this->parser->getLogger()->getLogs() as $entry)
 		{
 			list(, $msg, $context) = $entry;
 
@@ -365,7 +365,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	static public function filter_img_url($url, array $url_config, Logger $logger, $max_height, $max_width)
 	{
 		// Validate the URL
-		$url = BuiltInFilters::filterUrl($url, $url_config, $logger);
+		$url = UrlFilter::filter($url, $url_config, $logger);
 		if ($url === false)
 		{
 			return false;
-- 
cgit v1.2.1


From b5a997ce183fa655af4c03b5f92a58a1a3e7c2f1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 16 Jul 2019 20:44:12 +0200
Subject: [ticket/security/243] Limit size values to supported values

SECURITY-243
---
 phpBB/phpbb/textformatter/s9e/parser.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 3698dca224..e30bc2b0d9 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -228,6 +228,10 @@ class parser implements \phpbb\textformatter\parser_interface
 			{
 				$errors[] = array($msg);
 			}
+			else if ($msg === 'INVALID_FONT_SIZE')
+			{
+				$errors[] = [$msg, $context['invalid_size']];
+			}
 		}
 
 		// Deduplicate error messages. array_unique() only works on strings so we have to serialize
@@ -335,6 +339,13 @@ class parser implements \phpbb\textformatter\parser_interface
 	*/
 	static public function filter_font_size($size, $max_size, Logger $logger)
 	{
+		if (!is_int($size))
+		{
+			$logger->err('INVALID_FONT_SIZE', ['invalid_size' => htmlspecialchars($size)]);
+
+			return false;
+		}
+
 		if ($max_size && $size > $max_size)
 		{
 			$logger->err('MAX_FONT_SIZE_EXCEEDED', array('max_size' => $max_size));
-- 
cgit v1.2.1


From c934d3fcfdaaa1e8c2161577690fef9dcb41b1e1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 17 Jul 2019 22:02:32 +0200
Subject: [ticket/security/243] Limit size BBCode to 4 numeric characters

SECURITY-243
---
 phpBB/phpbb/textformatter/s9e/parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index e30bc2b0d9..1bc56a8cb4 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -339,7 +339,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	*/
 	static public function filter_font_size($size, $max_size, Logger $logger)
 	{
-		if (!is_int($size))
+		if (!is_numeric($size))
 		{
 			$logger->err('INVALID_FONT_SIZE', ['invalid_size' => htmlspecialchars($size)]);
 
-- 
cgit v1.2.1


From cc8d6a5a014c994fec8d8bdd61cd1fbc5506de6e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 31 Aug 2019 18:13:24 +0200
Subject: [ticket/security/243] Fail silently on unsupported values for font
 size

SECURITY-243
---
 phpBB/phpbb/textformatter/s9e/parser.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 1bc56a8cb4..a36fc63141 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -228,10 +228,6 @@ class parser implements \phpbb\textformatter\parser_interface
 			{
 				$errors[] = array($msg);
 			}
-			else if ($msg === 'INVALID_FONT_SIZE')
-			{
-				$errors[] = [$msg, $context['invalid_size']];
-			}
 		}
 
 		// Deduplicate error messages. array_unique() only works on strings so we have to serialize
@@ -339,13 +335,6 @@ class parser implements \phpbb\textformatter\parser_interface
 	*/
 	static public function filter_font_size($size, $max_size, Logger $logger)
 	{
-		if (!is_numeric($size))
-		{
-			$logger->err('INVALID_FONT_SIZE', ['invalid_size' => htmlspecialchars($size)]);
-
-			return false;
-		}
-
 		if ($max_size && $size > $max_size)
 		{
 			$logger->err('MAX_FONT_SIZE_EXCEEDED', array('max_size' => $max_size));
@@ -353,7 +342,7 @@ class parser implements \phpbb\textformatter\parser_interface
 			return false;
 		}
 
-		if ($size < 1)
+		if ($size < 1 || !is_numeric($size))
 		{
 			return false;
 		}
-- 
cgit v1.2.1


From 5813b5fbee2ac332f14dee2da7df9c3dfd6c2719 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Mon, 9 Dec 2019 18:06:30 +0100
Subject: [ticket/16252] Ignore non-BBCodes when looking for unauthorized
 markup

PHPBB3-16252
---
 phpBB/phpbb/textformatter/s9e/parser.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/parser.php')

diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index a36fc63141..f7e4668980 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -15,6 +15,7 @@ namespace phpbb\textformatter\s9e;
 
 use s9e\TextFormatter\Parser\AttributeFilters\UrlFilter;
 use s9e\TextFormatter\Parser\Logger;
+use s9e\TextFormatter\Parser\Tag;
 
 /**
 * s9e\TextFormatter\Parser adapter
@@ -219,7 +220,7 @@ class parser implements \phpbb\textformatter\parser_interface
 			{
 				$errors[] = array($msg, $context['max_' . strtolower($m[1])]);
 			}
-			else if ($msg === 'Tag is disabled')
+			else if ($msg === 'Tag is disabled' && $this->is_a_bbcode($context['tag']))
 			{
 				$name = strtolower($context['tag']->getName());
 				$errors[] = array('UNAUTHORISED_BBCODE', '[' . $name . ']');
@@ -396,4 +397,21 @@ class parser implements \phpbb\textformatter\parser_interface
 
 		return $url;
 	}
+
+	/**
+	* Test whether given tag consumes text that looks like BBCode-styled markup
+	*
+	* @param  Tag  $tag Original tag
+	* @return bool
+	*/
+	protected function is_a_bbcode(Tag $tag)
+	{
+		if ($tag->getLen() < 3)
+		{
+			return false;
+		}
+		$markup = substr($this->parser->getText(), $tag->getPos(), $tag->getLen());
+
+		return (bool) preg_match('(^\\[\\w++.*?\\]$)s', $markup);
+	}
 }
-- 
cgit v1.2.1