From f6e06da4c68917dafb057bf7fe19f884a3e148c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gae=CC=88tan=20Muller?= <m.gaetan89@gmail.com>
Date: Sun, 4 Jan 2015 20:41:04 +0100
Subject: [ticket/13455] Update calls to `request_var()`

PHPBB3-13455
---
 phpBB/includes/message_parser.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 04a2726d22..76c69cfc6a 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1475,7 +1475,7 @@ class parse_message extends bbcode_firstpass
 		$error = array();
 
 		$num_attachments = sizeof($this->attachment_data);
-		$this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true));
+		$this->filename_data['filecomment'] = utf8_normalize_nfc($request->variable('filecomment', '', true));
 		$upload = $request->file($form_name);
 		$upload_file = (!empty($upload) && $upload['name'] !== 'none' && trim($upload['name']));
 
@@ -1483,7 +1483,7 @@ class parse_message extends bbcode_firstpass
 		$delete_file	= (isset($_POST['delete_file'])) ? true : false;
 
 		// First of all adjust comments if changed
-		$actual_comment_list = utf8_normalize_nfc(request_var('comment_list', array(''), true));
+		$actual_comment_list = utf8_normalize_nfc($request->variable('comment_list', array(''), true));
 
 		foreach ($actual_comment_list as $comment_key => $comment)
 		{
@@ -1569,7 +1569,7 @@ class parse_message extends bbcode_firstpass
 			{
 				include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 
-				$index = array_keys(request_var('delete_file', array(0 => 0)));
+				$index = array_keys($request->variable('delete_file', array(0 => 0)));
 				$index = (!empty($index)) ? $index[0] : false;
 
 				if ($index !== false && !empty($this->attachment_data[$index]))
@@ -1695,7 +1695,7 @@ class parse_message extends bbcode_firstpass
 		global $user, $db, $phpbb_root_path, $phpEx, $config;
 		global $request;
 
-		$this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true));
+		$this->filename_data['filecomment'] = utf8_normalize_nfc($request->variable('filecomment', '', true));
 		$attachment_data = $request->variable('attachment_data', array(0 => array('' => '')), true, \phpbb\request\request_interface::POST);
 		$this->attachment_data = array();
 
-- 
cgit v1.2.1


From abcb2680eec86dc8016c489ebc7362e29be9e4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gae=CC=88tan=20Muller?= <m.gaetan89@gmail.com>
Date: Mon, 2 Feb 2015 21:35:46 +0100
Subject: [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`

PHPBB3-13455
---
 phpBB/includes/message_parser.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 76c69cfc6a..ccb953adbe 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1475,7 +1475,7 @@ class parse_message extends bbcode_firstpass
 		$error = array();
 
 		$num_attachments = sizeof($this->attachment_data);
-		$this->filename_data['filecomment'] = utf8_normalize_nfc($request->variable('filecomment', '', true));
+		$this->filename_data['filecomment'] = $request->variable('filecomment', '', true);
 		$upload = $request->file($form_name);
 		$upload_file = (!empty($upload) && $upload['name'] !== 'none' && trim($upload['name']));
 
@@ -1483,7 +1483,7 @@ class parse_message extends bbcode_firstpass
 		$delete_file	= (isset($_POST['delete_file'])) ? true : false;
 
 		// First of all adjust comments if changed
-		$actual_comment_list = utf8_normalize_nfc($request->variable('comment_list', array(''), true));
+		$actual_comment_list = $request->variable('comment_list', array(''), true);
 
 		foreach ($actual_comment_list as $comment_key => $comment)
 		{
@@ -1695,7 +1695,7 @@ class parse_message extends bbcode_firstpass
 		global $user, $db, $phpbb_root_path, $phpEx, $config;
 		global $request;
 
-		$this->filename_data['filecomment'] = utf8_normalize_nfc($request->variable('filecomment', '', true));
+		$this->filename_data['filecomment'] = $request->variable('filecomment', '', true);
 		$attachment_data = $request->variable('attachment_data', array(0 => array('' => '')), true, \phpbb\request\request_interface::POST);
 		$this->attachment_data = array();
 
-- 
cgit v1.2.1


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/includes/message_parser.php | 129 +++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 78 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index ccb953adbe..e4c35f8bca 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1094,7 +1094,7 @@ class parse_message extends bbcode_firstpass
 	function parse_message($message = '')
 	{
 		// Init BBCode UID
-		$this->bbcode_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN);
+		$this->bbcode_uid = '';
 		$this->message = $message;
 	}
 
@@ -1103,7 +1103,7 @@ class parse_message extends bbcode_firstpass
 	*/
 	function parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $update_this_message = true, $mode = 'post')
 	{
-		global $config, $db, $user, $phpbb_dispatcher;
+		global $config, $db, $user, $phpbb_dispatcher, $phpbb_container;
 
 		$this->mode = $mode;
 
@@ -1132,12 +1132,6 @@ class parse_message extends bbcode_firstpass
 			$this->decode_message();
 		}
 
-		// Do some general 'cleanup' first before processing message,
-		// e.g. remove excessive newlines(?), smilies(?)
-		$match = array('#(script|about|applet|activex|chrome):#i');
-		$replace = array("\\1&#058;");
-		$this->message = preg_replace($match, $replace, trim($this->message));
-
 		// Store message length...
 		$message_length = ($mode == 'post') ? utf8_strlen($this->message) : utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#ius', ' ', $this->message));
 
@@ -1210,47 +1204,29 @@ class parse_message extends bbcode_firstpass
 			return (!$update_this_message) ? $return_message : $this->warn_msg;
 		}
 
-		// Prepare BBcode (just prepares some tags for better parsing)
-		if ($allow_bbcode && strpos($this->message, '[') !== false)
-		{
-			$this->bbcode_init();
-			$disallow = array('img', 'flash', 'quote', 'url');
-			foreach ($disallow as $bool)
-			{
-				if (!${'allow_' . $bool . '_bbcode'})
-				{
-					$this->bbcodes[$bool]['disabled'] = true;
-				}
-			}
-
-			$this->prepare_bbcodes();
-		}
-
-		// Parse smilies
-		if ($allow_smilies)
-		{
-			$this->smilies($config['max_' . $mode . '_smilies']);
-		}
-
-		$num_urls = 0;
+		// Get the parser
+		$parser = $phpbb_container->get('text_formatter.parser');
 
-		// Parse BBCode
-		if ($allow_bbcode && strpos($this->message, '[') !== false)
-		{
-			$this->parse_bbcode();
-			$num_urls += $this->parsed_items['url'];
-		}
+		// Set the parser's options
+		($allow_bbcode)       ? $parser->enable_bbcodes()       : $parser->disable_bbcodes();
+		($allow_magic_url)    ? $parser->enable_magic_url()     : $parser->disable_magic_url();
+		($allow_smilies)      ? $parser->enable_smilies()       : $parser->disable_smilies();
+		($allow_img_bbcode)   ? $parser->enable_bbcode('img')   : $parser->disable_bbcode('img');
+		($allow_flash_bbcode) ? $parser->enable_bbcode('flash') : $parser->disable_bbcode('flash');
+		($allow_quote_bbcode) ? $parser->enable_bbcode('quote') : $parser->disable_bbcode('quote');
+		($allow_url_bbcode)   ? $parser->enable_bbcode('url')   : $parser->disable_bbcode('url');
 
-		// Parse URL's
-		if ($allow_magic_url)
-		{
-			$this->magic_url(generate_board_url());
+		// Set some config values
+		$parser->set_vars(array(
+			'max_font_size'  => $config['max_' . $this->mode . '_font_size'],
+			'max_img_height' => $config['max_' . $this->mode . '_img_height'],
+			'max_img_width'  => $config['max_' . $this->mode . '_img_width'],
+			'max_smilies'    => $config['max_' . $this->mode . '_smilies'],
+			'max_urls'       => $config['max_' . $this->mode . '_urls']
+		));
 
-			if ($config['max_' . $mode . '_urls'])
-			{
-				$num_urls += preg_match_all('#\<!-- ([lmwe]) --\>.*?\<!-- \1 --\>#', $this->message, $matches);
-			}
-		}
+		// Parse this message
+		$this->message = $parser->parse(htmlspecialchars_decode($this->message, ENT_QUOTES));
 
 		// Check for out-of-bounds characters that are currently
 		// not supported by utf8_bin in MySQL
@@ -1269,10 +1245,12 @@ class parse_message extends bbcode_firstpass
 			return (!$update_this_message) ? $return_message : $this->warn_msg;
 		}
 
-		// Check number of links
-		if ($config['max_' . $mode . '_urls'] && $num_urls > $config['max_' . $mode . '_urls'])
+		// Check for errors
+		$errors = $parser->get_errors();
+		if ($errors)
 		{
-			$this->warn_msg[] = sprintf($user->lang['TOO_MANY_URLS'], $config['max_' . $mode . '_urls']);
+			$this->warn_msg = array_merge($this->warn_msg, $errors);
+
 			return (!$update_this_message) ? $return_message : $this->warn_msg;
 		}
 
@@ -1292,7 +1270,7 @@ class parse_message extends bbcode_firstpass
 	*/
 	function format_display($allow_bbcode, $allow_magic_url, $allow_smilies, $update_this_message = true)
 	{
-		global $phpbb_dispatcher;
+		global $phpbb_container, $phpbb_dispatcher;
 
 		// If false, then the parsed message get returned but internal message not processed.
 		if (!$update_this_message)
@@ -1301,26 +1279,25 @@ class parse_message extends bbcode_firstpass
 			$return_message = &$this->message;
 		}
 
-		if ($this->message_status == 'plain')
+		// NOTE: message_status is unreliable for detecting unparsed text because some callers
+		//       change $this->message without resetting $this->message_status to 'plain' so we
+		//       inspect the message instead
+		//if ($this->message_status == 'plain')
+		if (!preg_match('/^<[rt][ >]/', $this->message))
 		{
 			// Force updating message - of course.
 			$this->parse($allow_bbcode, $allow_magic_url, $allow_smilies, $this->allow_img_bbcode, $this->allow_flash_bbcode, $this->allow_quote_bbcode, $this->allow_url_bbcode, true);
 		}
 
-		// Replace naughty words such as farty pants
-		$this->message = censor_text($this->message);
-
-		// Parse BBcode
-		if ($allow_bbcode)
+		// There's a bug when previewing a topic with no poll, because the empty title of the poll
+		// gets parsed but $this->message still ends up empty. This fixes it, until a proper fix is
+		// devised
+		if ($this->message === '')
 		{
-			$this->bbcode_cache_init();
-
-			// We are giving those parameters to be able to use the bbcode class on its own
-			$this->bbcode_second_pass($this->message, $this->bbcode_uid);
+			$this->message = $phpbb_container->get('text_formatter.parser')->parse($this->message);
 		}
 
-		$this->message = bbcode_nl2br($this->message);
-		$this->message = smiley_text($this->message, !$allow_smilies);
+		$this->message = $phpbb_container->get('text_formatter.renderer')->render($this->message);
 
 		$text = $this->message;
 		$uid = $this->bbcode_uid;
@@ -1784,24 +1761,22 @@ class parse_message extends bbcode_firstpass
 
 		$poll_max_options = $poll['poll_max_options'];
 
-		// Parse Poll Option text ;)
+		// Parse Poll Option text
 		$tmp_message = $this->message;
-		$this->message = $poll['poll_option_text'];
-		$bbcode_bitfield = $this->bbcode_bitfield;
 
-		$poll['poll_option_text'] = $this->parse($poll['enable_bbcode'], ($config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, $config['allow_post_links'], false, 'poll');
+		$poll['poll_options'] = explode("\n", trim($poll['poll_option_text']));
+		$poll['poll_options_size'] = sizeof($poll['poll_options']);
 
-		$bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield));
-		$this->message = $tmp_message;
+		foreach ($poll['poll_options'] as &$poll_option)
+		{
+			$this->message = $poll_option;
+			$poll_option = $this->parse($poll['enable_bbcode'], ($config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, $config['allow_post_links'], false, 'poll');
+		}
+		unset($poll_option);
+		$poll['poll_option_text'] = implode("\n", $poll['poll_options']);
 
 		// Parse Poll Title
-		$tmp_message = $this->message;
 		$this->message = $poll['poll_title'];
-		$this->bbcode_bitfield = $bbcode_bitfield;
-
-		$poll['poll_options'] = explode("\n", trim($poll['poll_option_text']));
-		$poll['poll_options_size'] = sizeof($poll['poll_options']);
-
 		if (!$poll['poll_title'] && $poll['poll_options_size'])
 		{
 			$this->warn_msg[] = $user->lang['NO_POLL_TITLE'];
@@ -1819,10 +1794,6 @@ class parse_message extends bbcode_firstpass
 			}
 		}
 
-		$this->bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield));
-		$this->message = $tmp_message;
-		unset($tmp_message);
-
 		if (sizeof($poll['poll_options']) == 1)
 		{
 			$this->warn_msg[] = $user->lang['TOO_FEW_POLL_OPTIONS'];
@@ -1837,6 +1808,8 @@ class parse_message extends bbcode_firstpass
 		}
 
 		$poll['poll_max_options'] = ($poll['poll_max_options'] < 1) ? 1 : (($poll['poll_max_options'] > $config['max_poll_options']) ? $config['max_poll_options'] : $poll['poll_max_options']);
+
+		$this->message = $tmp_message;
 	}
 
 	/**
-- 
cgit v1.2.1


From 37106bae7a4e3e67143dde9a86f03b3190ed0f4c Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sat, 14 Mar 2015 03:13:04 +0100
Subject: [ticket/11768] Reverted change to bbcode_uid

On the off-chance some other routine expect bbcode_uid to never be empty.

PHPBB3-11768
---
 phpBB/includes/message_parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index e4c35f8bca..6af1677b58 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1094,7 +1094,7 @@ class parse_message extends bbcode_firstpass
 	function parse_message($message = '')
 	{
 		// Init BBCode UID
-		$this->bbcode_uid = '';
+		$this->bbcode_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN);
 		$this->message = $message;
 	}
 
-- 
cgit v1.2.1


From 2fa99602c6f6431e99468ca13f4a58344a401c24 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 8 Feb 2015 20:46:14 +0100
Subject: [ticket/8672] Add class for retrieving imagesize without download

getimagesize() always downloads the complete file before checking
the actual image dimensions. This class will be able to do the same
without having to download possibly large files.

PHPBB3-8672
---
 phpBB/includes/message_parser.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 8353ae6843..3d263748cb 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -339,22 +339,23 @@ class bbcode_firstpass extends bbcode
 
 		if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width'])
 		{
-			$stats = @getimagesize(htmlspecialchars_decode($in));
+			$imagesize = new \phpbb\upload\imagesize();
+			$size_info = $imagesize->get_imagesize(htmlspecialchars_decode($in));
 
-			if ($stats === false)
+			if ($size_info === false)
 			{
 				$error = true;
 				$this->warn_msg[] = $user->lang['UNABLE_GET_IMAGE_SIZE'];
 			}
 			else
 			{
-				if ($config['max_' . $this->mode . '_img_height'] && $config['max_' . $this->mode . '_img_height'] < $stats[1])
+				if ($config['max_' . $this->mode . '_img_height'] && $config['max_' . $this->mode . '_img_height'] < $size_info['height'])
 				{
 					$error = true;
 					$this->warn_msg[] = $user->lang('MAX_IMG_HEIGHT_EXCEEDED', (int) $config['max_' . $this->mode . '_img_height']);
 				}
 
-				if ($config['max_' . $this->mode . '_img_width'] && $config['max_' . $this->mode . '_img_width'] < $stats[0])
+				if ($config['max_' . $this->mode . '_img_width'] && $config['max_' . $this->mode . '_img_width'] < $size_info['width'])
 				{
 					$error = true;
 					$this->warn_msg[] = $user->lang('MAX_IMG_WIDTH_EXCEEDED', (int) $config['max_' . $this->mode . '_img_width']);
-- 
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/includes/message_parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 3d263748cb..bc53336a3f 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -339,8 +339,8 @@ class bbcode_firstpass extends bbcode
 
 		if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width'])
 		{
-			$imagesize = new \phpbb\upload\imagesize();
-			$size_info = $imagesize->get_imagesize(htmlspecialchars_decode($in));
+			$imagesize = new \fastImageSize\fastImageSize();
+			$size_info = $imagesize->getImageSize(htmlspecialchars_decode($in));
 
 			if ($size_info === false)
 			{
-- 
cgit v1.2.1


From 25acba225961e037ea1f7e04259eee3dc4f589ee Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 24 Apr 2015 00:21:32 +0200
Subject: [ticket/12745] Added support for Unicode characters outside BMP

PHPBB3-12745
---
 phpBB/includes/message_parser.php | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 8353ae6843..3027566f43 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1241,15 +1241,6 @@ class parse_message extends bbcode_firstpass
 		// Parse this message
 		$this->message = $parser->parse(htmlspecialchars_decode($this->message, ENT_QUOTES));
 
-		// Check for out-of-bounds characters that are currently
-		// not supported by utf8_bin in MySQL
-		if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $this->message, $matches))
-		{
-			$character_list = implode('<br />', $matches[0]);
-			$this->warn_msg[] = $user->lang('UNSUPPORTED_CHARACTERS_MESSAGE', $character_list);
-			return $update_this_message ? $this->warn_msg : $return_message;
-		}
-
 		// Check for "empty" message. We do not check here for maximum length, because bbcode, smilies, etc. can add to the length.
 		// The maximum length check happened before any parsings.
 		if ($mode === 'post' && utf8_clean_string($this->message) === '')
-- 
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/includes/message_parser.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 9fe598d7fb..3edc7fe1c6 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1254,6 +1254,10 @@ class parse_message extends bbcode_firstpass
 		$errors = $parser->get_errors();
 		if ($errors)
 		{
+			foreach ($errors as $i => $args)
+			{
+				$errors[$i] = call_user_func_array(array($user, 'lang'), $args);
+			}
 			$this->warn_msg = array_merge($this->warn_msg, $errors);
 
 			return (!$update_this_message) ? $return_message : $this->warn_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/includes/message_parser.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 3edc7fe1c6..496a7885f1 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1256,6 +1256,7 @@ class parse_message extends bbcode_firstpass
 		{
 			foreach ($errors as $i => $args)
 			{
+				// Translate each error with $user->lang()
 				$errors[$i] = call_user_func_array(array($user, 'lang'), $args);
 			}
 			$this->warn_msg = array_merge($this->warn_msg, $errors);
-- 
cgit v1.2.1


From c1777f481101c0a311939f83f2afd38a0c09e394 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Mon, 18 May 2015 03:57:48 +0200
Subject: [ticket/11530] Remove extra quotes when depth limit is exceeded

PHPBB3-11530
---
 phpBB/includes/message_parser.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 9fe598d7fb..f018d735a7 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1250,6 +1250,16 @@ class parse_message extends bbcode_firstpass
 			return (!$update_this_message) ? $return_message : $this->warn_msg;
 		}
 
+		// Remove quotes that are nested too deep
+		if ($config['max_quote_depth'] > 0)
+		{
+			$this->message = $phpbb_container->get('text_formatter.utils')->remove_bbcode(
+				$this->message,
+				'quote',
+				$config['max_quote_depth']
+			);
+		}
+
 		// Check for errors
 		$errors = $parser->get_errors();
 		if ($errors)
-- 
cgit v1.2.1


From 1076b562dde3cd05351baec0cc01e1ff35c7317a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 18 May 2015 17:48:00 +0200
Subject: [ticket/13832] Do not use e modifier in message_parser

PHPBB3-13832
---
 phpBB/includes/message_parser.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 9fe598d7fb..0d6960a197 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -744,7 +744,9 @@ class bbcode_firstpass extends bbcode
 		}
 
 		// To let the parser not catch tokens within quote_username quotes we encode them before we start this...
-		$in = preg_replace('#quote=&quot;(.*?)&quot;\]#ie', "'quote=&quot;' . str_replace(array('[', ']', '\\\"'), array('&#91;', '&#93;', '\"'), '\$1') . '&quot;]'", $in);
+		$in = preg_replace_callback('#quote=&quot;(.*?)&quot;\]#i', function ($match) {
+			return 'quote=&quot;' . str_replace(array('[', ']', '\\\"'), array('&#91;', '&#93;', '\"'), $match[1]) . '&quot;]';
+		}, $in);
 
 		$tok = ']';
 		$out = '[';
@@ -1518,7 +1520,9 @@ class parse_message extends bbcode_firstpass
 					);
 
 					$this->attachment_data = array_merge(array(0 => $new_entry), $this->attachment_data);
-					$this->message = preg_replace('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#e', "'[attachment='.(\\1 + 1).']\\2[/attachment]'", $this->message);
+					$this->message = preg_replace_callback('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#', function ($match) {
+						return '[attachment='.($match[1] + 1).']' . $match[2] . '[/attachment]';
+					}, $this->message);
 
 					$this->filename_data['filecomment'] = '';
 
@@ -1586,7 +1590,9 @@ class parse_message extends bbcode_firstpass
 					}
 
 					unset($this->attachment_data[$index]);
-					$this->message = preg_replace('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#e', "(\\1 == \$index) ? '' : ((\\1 > \$index) ? '[attachment=' . (\\1 - 1) . ']\\2[/attachment]' : '\\0')", $this->message);
+					$this->message = preg_replace_callback('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#', function ($match) use($index) {
+						return ($match[1] == $index) ? '' : (($match[1] > $index) ? '[attachment=' . ($match[1] - 1) . ']' . $match[2] . '[/attachment]' : $match[0]);
+					}, $this->message);
 
 					// Reindex Array
 					$this->attachment_data = array_values($this->attachment_data);
@@ -1630,7 +1636,9 @@ class parse_message extends bbcode_firstpass
 						);
 
 						$this->attachment_data = array_merge(array(0 => $new_entry), $this->attachment_data);
-						$this->message = preg_replace('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#e', "'[attachment='.(\\1 + 1).']\\2[/attachment]'", $this->message);
+						$this->message = preg_replace_callback('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#', function ($match) {
+							return '[attachment=' . ($match[1] + 1) . ']' . $match[2] . '[/attachment]';
+						}, $this->message);
 						$this->filename_data['filecomment'] = '';
 
 						if (isset($this->plupload) && $this->plupload->is_active())
-- 
cgit v1.2.1


From 8a5c0965d34cfd7027983dd74c33f45d737012d3 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 18 May 2015 19:02:49 +0200
Subject: [ticket/13832] Allow callables for matching bbcodes

PHPBB3-13832
---
 phpBB/includes/message_parser.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 0d6960a197..0528d0b413 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -83,7 +83,14 @@ class bbcode_firstpass extends bbcode
 					// it should not demand recompilation
 					if (preg_match($regexp, $this->message))
 					{
-						$this->message = preg_replace($regexp, $replacement, $this->message);
+						if (is_callable($replacement))
+						{
+							$this->message = preg_replace_callback($regexp, $replacement, $this->message);
+						}
+						else
+						{
+							$this->message = preg_replace($regexp, $replacement, $this->message);
+						}
 						$bitfield->set($bbcode_data['bbcode_id']);
 					}
 				}
-- 
cgit v1.2.1


From 2911c0168331a8f23dd8836d092d5e3fe6cac070 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 18 May 2015 19:03:25 +0200
Subject: [ticket/13832] Remove e modifier from bold bbcode

PHPBB3-13832
---
 phpBB/includes/message_parser.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 0528d0b413..e4a89b62ca 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -126,10 +126,12 @@ class bbcode_firstpass extends bbcode
 	*/
 	function bbcode_init($allow_custom_bbcode = true)
 	{
-		global $phpbb_dispatcher;
+		global $phpbb_dispatcher, $bbcode_class;
 
 		static $rowset;
 
+		$bbcode_class = $this;
+
 		// This array holds all bbcode data. BBCodes will be processed in this
 		// order, so it is important to keep [code] in first position and
 		// [quote] in second position.
@@ -139,7 +141,7 @@ class bbcode_firstpass extends bbcode
 			'code'			=> array('bbcode_id' => 8,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uise' => "\$this->bbcode_code('\$1', '\$2')")),
 			'quote'			=> array('bbcode_id' => 0,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uise' => "\$this->bbcode_quote('\$0')")),
 			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uise' => "\$this->bbcode_attachment('\$1', '\$2')")),
-			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#uise' => "\$this->bbcode_strong('\$1')")),
+			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_strong($match[1]); })),
 			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#uise' => "\$this->bbcode_italic('\$1')")),
 			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiUe' => "\$this->validate_url('\$2', ('\$3') ? '\$3' : '\$4')")),
 			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#uiUe' => "\$this->bbcode_img('\$1')")),
-- 
cgit v1.2.1


From 1494c54803b3043ded965e9040bbd9116e4b6a53 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 18 May 2015 21:43:25 +0200
Subject: [ticket/13832] Do not use e modifier for bbcodes in message_parser

PHPBB3-13832
---
 phpBB/includes/message_parser.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index e4a89b62ca..06c3c2c9c2 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -138,19 +138,19 @@ class bbcode_firstpass extends bbcode
 		// To parse multiline URL we enable dotall option setting only for URL text
 		// but not for link itself, thus [url][/url] is not affected.
 		$this->bbcodes = array(
-			'code'			=> array('bbcode_id' => 8,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uise' => "\$this->bbcode_code('\$1', '\$2')")),
-			'quote'			=> array('bbcode_id' => 0,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uise' => "\$this->bbcode_quote('\$0')")),
-			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uise' => "\$this->bbcode_attachment('\$1', '\$2')")),
+			'code'			=> array('bbcode_id' => 8,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_code($match[1], $match[2]); })),
+			'quote'			=> array('bbcode_id' => 0,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_quote($match[0]); })),
+			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_attachment($match[1], $match[2]); })),
 			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_strong($match[1]); })),
-			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#uise' => "\$this->bbcode_italic('\$1')")),
-			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiUe' => "\$this->validate_url('\$2', ('\$3') ? '\$3' : '\$4')")),
-			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#uiUe' => "\$this->bbcode_img('\$1')")),
-			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uise' => "\$this->bbcode_size('\$1', '\$2')")),
-			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uise' => "\$this->bbcode_color('\$1', '\$2')")),
-			'u'				=> array('bbcode_id' => 7,	'regexp' => array('#\[u\](.*?)\[/u\]#uise' => "\$this->bbcode_underline('\$1')")),
-			'list'			=> array('bbcode_id' => 9,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uise' => "\$this->bbcode_parse_list('\$0')")),
-			'email'			=> array('bbcode_id' => 10,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#uise' => "\$this->validate_email('\$1', '\$2')")),
-			'flash'			=> array('bbcode_id' => 11,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#uie' => "\$this->bbcode_flash('\$1', '\$2', '\$3')"))
+			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_italic($match[1]); })),
+			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiU' => function ($match) { global $bbcode_class; return $bbcode_class->validate_url($match[2], ($match[3]) ? $match[3] : $match[4]); })),
+			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#uiU' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_img($match[1]); })),
+			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_size($match[1], $match[2]); })),
+			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_color($match[1], $match[2]); })),
+			'u'				=> array('bbcode_id' => 7,	'regexp' => array('#\[u\](.*?)\[/u\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_underline($match[1]); })),
+			'list'			=> array('bbcode_id' => 9,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_parse_list($match[0]); })),
+			'email'			=> array('bbcode_id' => 10,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->validate_email($match[1], $match[2]); })),
+			'flash'			=> array('bbcode_id' => 11,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ui' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_flash($match[1], $match[2], $match[3]); }))
 		);
 
 		// Zero the parsed items array
-- 
cgit v1.2.1


From 579658461115de68aa05c34b0dfd6744a40d0f10 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 19 May 2015 14:15:37 +0200
Subject: [ticket/13832] Fix code sniffer errors in message_parser.php

PHPBB3-13832
---
 phpBB/includes/message_parser.php | 78 ++++++++++++++++++++++++++++++++-------
 1 file changed, 65 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 06c3c2c9c2..d40c71c2a9 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -138,19 +138,71 @@ class bbcode_firstpass extends bbcode
 		// To parse multiline URL we enable dotall option setting only for URL text
 		// but not for link itself, thus [url][/url] is not affected.
 		$this->bbcodes = array(
-			'code'			=> array('bbcode_id' => 8,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_code($match[1], $match[2]); })),
-			'quote'			=> array('bbcode_id' => 0,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_quote($match[0]); })),
-			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_attachment($match[1], $match[2]); })),
-			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_strong($match[1]); })),
-			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_italic($match[1]); })),
-			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiU' => function ($match) { global $bbcode_class; return $bbcode_class->validate_url($match[2], ($match[3]) ? $match[3] : $match[4]); })),
-			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#uiU' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_img($match[1]); })),
-			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_size($match[1], $match[2]); })),
-			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_color($match[1], $match[2]); })),
-			'u'				=> array('bbcode_id' => 7,	'regexp' => array('#\[u\](.*?)\[/u\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_underline($match[1]); })),
-			'list'			=> array('bbcode_id' => 9,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_parse_list($match[0]); })),
-			'email'			=> array('bbcode_id' => 10,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->validate_email($match[1], $match[2]); })),
-			'flash'			=> array('bbcode_id' => 11,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ui' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_flash($match[1], $match[2], $match[3]); }))
+			'code'			=> array('bbcode_id' => 8,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uis' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->bbcode_code($match[1], $match[2]);
+				}
+			)),
+			'quote'			=> array('bbcode_id' => 0,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uis' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->bbcode_quote($match[0]);
+				}
+			)),
+			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uis' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->bbcode_attachment($match[1], $match[2]);
+				}
+			)),
+			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#uis' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->bbcode_strong($match[1]);
+				}
+			)),
+			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#uis' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->bbcode_italic($match[1]);
+				}
+			)),
+			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiU' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->validate_url($match[2], ($match[3]) ? $match[3] : $match[4]);
+				}
+			)),
+			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#uiU' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->bbcode_img($match[1]);
+				}
+			)),
+			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uis' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->bbcode_size($match[1], $match[2]);
+				}
+			)),
+			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uis' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->bbcode_color($match[1], $match[2]);
+				}
+			)),
+			'u'				=> array('bbcode_id' => 7,	'regexp' => array('#\[u\](.*?)\[/u\]#uis' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->bbcode_underline($match[1]);
+				}
+			)),
+			'list'			=> array('bbcode_id' => 9,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uis' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->bbcode_parse_list($match[0]);
+				}
+			)),
+			'email'			=> array('bbcode_id' => 10,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#uis' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->validate_email($match[1], $match[2]);
+				}
+			)),
+			'flash'			=> array('bbcode_id' => 11,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ui' => function ($match) use($bbcode_class)
+				{
+					return $bbcode_class->bbcode_flash($match[1], $match[2], $match[3]);
+				}
+			))
 		);
 
 		// Zero the parsed items array
-- 
cgit v1.2.1


From 358c634153bd5fc5fe6a80a2c129e70adb107093 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 19 May 2015 17:26:01 +0200
Subject: [ticket/13832] Remove unused global from bbcode_init()

PHPBB3-13832
---
 phpBB/includes/message_parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index d40c71c2a9..208690c146 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -126,7 +126,7 @@ class bbcode_firstpass extends bbcode
 	*/
 	function bbcode_init($allow_custom_bbcode = true)
 	{
-		global $phpbb_dispatcher, $bbcode_class;
+		global $phpbb_dispatcher;
 
 		static $rowset;
 
-- 
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/includes/message_parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index c50212e8ff..31fc1577a2 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -403,7 +403,7 @@ class bbcode_firstpass extends bbcode
 
 		if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width'])
 		{
-			$imagesize = new \fastImageSize\fastImageSize();
+			$imagesize = new \FastImageSize\FastImageSize();
 			$size_info = $imagesize->getImageSize(htmlspecialchars_decode($in));
 
 			if ($size_info === false)
-- 
cgit v1.2.1


From 16d5208d9aec0678b3295b0e14042991094197ba Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 20 Sep 2015 12:36:52 +0200
Subject: [ticket/14168] Use attachment upload class in message_parser

PHPBB3-14168
---
 phpBB/includes/message_parser.php | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 31fc1577a2..e0a0d69fba 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1140,12 +1140,6 @@ class parse_message extends bbcode_firstpass
 	*/
 	protected $plupload;
 
-	/**
-	* The mimetype guesser object used for attachment mimetypes
-	* @var \phpbb\mimetype\guesser
-	*/
-	protected $mimetype_guesser;
-
 	/**
 	* Init - give message here or manually
 	*/
@@ -1541,6 +1535,7 @@ class parse_message extends bbcode_firstpass
 	function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false)
 	{
 		global $config, $auth, $user, $phpbb_root_path, $phpEx, $db, $request;
+		global $phpbb_container;
 
 		$error = array();
 
@@ -1576,7 +1571,9 @@ class parse_message extends bbcode_firstpass
 		{
 			if ($num_attachments < $cfg['max_attachments'] || $auth->acl_get('a_') || $auth->acl_get('m_', $forum_id))
 			{
-				$filedata = upload_attachment($form_name, $forum_id, false, '', $is_message);
+				/** @var \phpbb\attachment\upload $attachment_upload */
+				$attachment_upload = $phpbb_container->get('attachment.upload');
+				$filedata = $attachment_upload->upload($form_name, $forum_id, false, '', $is_message);
 				$error = $filedata['error'];
 
 				if ($filedata['post_attach'] && !sizeof($error))
@@ -1692,7 +1689,9 @@ class parse_message extends bbcode_firstpass
 			{
 				if ($num_attachments < $cfg['max_attachments'] || $auth->acl_gets('m_', 'a_', $forum_id))
 				{
-					$filedata = upload_attachment($form_name, $forum_id, false, '', $is_message, false, $this->mimetype_guesser, $this->plupload);
+					/** @var \phpbb\attachment\upload $attachment_upload */
+					$attachment_upload = $phpbb_container->get('attachment.upload');
+					$filedata = $attachment_upload->upload($form_name, $forum_id, false, '', $is_message);;
 					$error = array_merge($error, $filedata['error']);
 
 					if (!sizeof($error))
@@ -1980,18 +1979,6 @@ class parse_message extends bbcode_firstpass
 		$this->plupload = $plupload;
 	}
 
-	/**
-	* Setter function for passing the mimetype_guesser object
-	*
-	* @param \phpbb\mimetype\guesser $mimetype_guesser The mimetype_guesser object
-	*
-	* @return null
-	*/
-	public function set_mimetype_guesser(\phpbb\mimetype\guesser $mimetype_guesser)
-	{
-		$this->mimetype_guesser = $mimetype_guesser;
-	}
-
 	/**
 	* Function to perform custom bbcode validation by extensions
 	* can be used in bbcode_init() to assign regexp replacement
-- 
cgit v1.2.1


From e158db5daa8b9eedfea9d17b5d678320ac7f8f61 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 21 Sep 2015 11:01:01 +0200
Subject: [ticket/14168] Minor coding style fixes

PHPBB3-14168
---
 phpBB/includes/message_parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index e0a0d69fba..a56ef0d4a9 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1691,7 +1691,7 @@ class parse_message extends bbcode_firstpass
 				{
 					/** @var \phpbb\attachment\upload $attachment_upload */
 					$attachment_upload = $phpbb_container->get('attachment.upload');
-					$filedata = $attachment_upload->upload($form_name, $forum_id, false, '', $is_message);;
+					$filedata = $attachment_upload->upload($form_name, $forum_id, false, '', $is_message);
 					$error = array_merge($error, $filedata['error']);
 
 					if (!sizeof($error))
-- 
cgit v1.2.1


From 98ebbbdca2b7a57136745354b204d9aef181df4a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 23 Sep 2015 10:43:33 +0200
Subject: [ticket/14168] No longer use deprecated functions in core files

PHPBB3-14168
---
 phpBB/includes/message_parser.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index a56ef0d4a9..05ab115141 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1643,6 +1643,9 @@ class parse_message extends bbcode_firstpass
 
 				if ($index !== false && !empty($this->attachment_data[$index]))
 				{
+					/** @var \phpbb\attachment\delete $attachment_delete */
+					$attachment_delete = $phpbb_container->get('attachment.delete');
+
 					// delete selected attachment
 					if ($this->attachment_data[$index]['is_orphan'])
 					{
@@ -1657,11 +1660,11 @@ class parse_message extends bbcode_firstpass
 
 						if ($row)
 						{
-							phpbb_unlink($row['physical_filename'], 'file');
+							$attachment_delete->unlink_attachment($row['physical_filename'], 'file');
 
 							if ($row['thumbnail'])
 							{
-								phpbb_unlink($row['physical_filename'], 'thumbnail');
+								$attachment_delete->unlink_attachment($row['physical_filename'], 'thumbnail');
 							}
 
 							$db->sql_query('DELETE FROM ' . ATTACHMENTS_TABLE . ' WHERE attach_id = ' . (int) $this->attachment_data[$index]['attach_id']);
@@ -1669,7 +1672,7 @@ class parse_message extends bbcode_firstpass
 					}
 					else
 					{
-						delete_attachments('attach', array(intval($this->attachment_data[$index]['attach_id'])));
+						$attachment_delete->delete('attach', $this->attachment_data[$index]['attach_id']);
 					}
 
 					unset($this->attachment_data[$index]);
-- 
cgit v1.2.1


From 49312f05f88ca58346cbb00c2f03f01fd2a3d56d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 12 Oct 2015 11:34:11 +0200
Subject: [ticket/14168] Use attachment manager instead of separate classes

PHPBB3-14168
---
 phpBB/includes/message_parser.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 05ab115141..059037168d 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1571,9 +1571,9 @@ class parse_message extends bbcode_firstpass
 		{
 			if ($num_attachments < $cfg['max_attachments'] || $auth->acl_get('a_') || $auth->acl_get('m_', $forum_id))
 			{
-				/** @var \phpbb\attachment\upload $attachment_upload */
-				$attachment_upload = $phpbb_container->get('attachment.upload');
-				$filedata = $attachment_upload->upload($form_name, $forum_id, false, '', $is_message);
+				/** @var \phpbb\attachment\manager $attachment_manager */
+				$attachment_manager = $phpbb_container->get('attachment.manager');
+				$filedata = $attachment_manager->upload($form_name, $forum_id, false, '', $is_message);
 				$error = $filedata['error'];
 
 				if ($filedata['post_attach'] && !sizeof($error))
@@ -1643,8 +1643,8 @@ class parse_message extends bbcode_firstpass
 
 				if ($index !== false && !empty($this->attachment_data[$index]))
 				{
-					/** @var \phpbb\attachment\delete $attachment_delete */
-					$attachment_delete = $phpbb_container->get('attachment.delete');
+					/** @var \phpbb\attachment\manager $attachment_manager */
+					$attachment_manager = $phpbb_container->get('attachment.manager');
 
 					// delete selected attachment
 					if ($this->attachment_data[$index]['is_orphan'])
@@ -1660,11 +1660,11 @@ class parse_message extends bbcode_firstpass
 
 						if ($row)
 						{
-							$attachment_delete->unlink_attachment($row['physical_filename'], 'file');
+							$attachment_manager->unlink($row['physical_filename'], 'file');
 
 							if ($row['thumbnail'])
 							{
-								$attachment_delete->unlink_attachment($row['physical_filename'], 'thumbnail');
+								$attachment_manager->unlink($row['physical_filename'], 'thumbnail');
 							}
 
 							$db->sql_query('DELETE FROM ' . ATTACHMENTS_TABLE . ' WHERE attach_id = ' . (int) $this->attachment_data[$index]['attach_id']);
@@ -1672,7 +1672,7 @@ class parse_message extends bbcode_firstpass
 					}
 					else
 					{
-						$attachment_delete->delete('attach', $this->attachment_data[$index]['attach_id']);
+						$attachment_manager->delete('attach', $this->attachment_data[$index]['attach_id']);
 					}
 
 					unset($this->attachment_data[$index]);
@@ -1692,9 +1692,9 @@ class parse_message extends bbcode_firstpass
 			{
 				if ($num_attachments < $cfg['max_attachments'] || $auth->acl_gets('m_', 'a_', $forum_id))
 				{
-					/** @var \phpbb\attachment\upload $attachment_upload */
-					$attachment_upload = $phpbb_container->get('attachment.upload');
-					$filedata = $attachment_upload->upload($form_name, $forum_id, false, '', $is_message);
+					/** @var \phpbb\attachment\manager $attachment_manager */
+					$attachment_manager = $phpbb_container->get('attachment.manager');
+					$filedata = $attachment_manager->upload($form_name, $forum_id, false, '', $is_message);
 					$error = array_merge($error, $filedata['error']);
 
 					if (!sizeof($error))
-- 
cgit v1.2.1


From 266576c6a4224f4b803040c678020e825a1510b5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Dec 2015 11:50:39 +0100
Subject: [ticket/13454] Remove unused variables

Part 4

PHPBB3-13454
---
 phpBB/includes/message_parser.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 059037168d..935793a810 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -798,8 +798,6 @@ class bbcode_firstpass extends bbcode
 	*/
 	function bbcode_quote($in)
 	{
-		global $config, $user;
-
 		$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
 
 		if (!$in)
-- 
cgit v1.2.1


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

This is part 5 and there is more to come.

PHPBB3-13454
---
 phpBB/includes/message_parser.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 935793a810..97e0dd9f0d 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1007,8 +1007,6 @@ class bbcode_firstpass extends bbcode
 	*/
 	function validate_url($var1, $var2)
 	{
-		global $config;
-
 		$var1 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var1)));
 		$var2 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var2)));
 
@@ -1153,7 +1151,7 @@ class parse_message extends bbcode_firstpass
 	*/
 	function parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $update_this_message = true, $mode = 'post')
 	{
-		global $config, $db, $user, $phpbb_dispatcher, $phpbb_container;
+		global $config, $user, $phpbb_dispatcher, $phpbb_container;
 
 		$this->mode = $mode;
 
@@ -1768,7 +1766,7 @@ class parse_message extends bbcode_firstpass
 	*/
 	function get_submitted_attachment_data($check_user_id = false)
 	{
-		global $user, $db, $phpbb_root_path, $phpEx, $config;
+		global $user, $db;
 		global $request;
 
 		$this->filename_data['filecomment'] = $request->variable('filecomment', '', true);
@@ -1856,7 +1854,7 @@ class parse_message extends bbcode_firstpass
 	*/
 	function parse_poll(&$poll)
 	{
-		global $auth, $user, $config;
+		global $user, $config;
 
 		$poll_max_options = $poll['poll_max_options'];
 
-- 
cgit v1.2.1


From 46c79bbe901d31e93d321a8de46696d3ac277cd5 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Fri, 18 Mar 2016 10:56:14 +0100
Subject: [ticket/9435] Convert bbcode magic numbers to constants

PHPBB3-9435
---
 phpBB/includes/message_parser.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 97e0dd9f0d..ad277fd90a 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -141,67 +141,67 @@ class bbcode_firstpass extends bbcode
 		// To perform custom validation in extension, use $this->validate_bbcode_by_extension()
 		// method which accepts variable number of parameters
 		$this->bbcodes = array(
-			'code'			=> array('bbcode_id' => 8,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uis' => function ($match) use($bbcode_class)
+			'code'			=> array('bbcode_id' => BBCODE_CODE_ID,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_code($match[1], $match[2]);
 				}
 			)),
-			'quote'			=> array('bbcode_id' => 0,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uis' => function ($match) use($bbcode_class)
+			'quote'			=> array('bbcode_id' => BBCODE_QUOTE_ID,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_quote($match[0]);
 				}
 			)),
-			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uis' => function ($match) use($bbcode_class)
+			'attachment'	=> array('bbcode_id' => BBCODE_ATTACH_ID,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_attachment($match[1], $match[2]);
 				}
 			)),
-			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#uis' => function ($match) use($bbcode_class)
+			'b'				=> array('bbcode_id' => BBCODE_B_ID,	'regexp' => array('#\[b\](.*?)\[/b\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_strong($match[1]);
 				}
 			)),
-			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#uis' => function ($match) use($bbcode_class)
+			'i'				=> array('bbcode_id' => BBCODE_I_ID,	'regexp' => array('#\[i\](.*?)\[/i\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_italic($match[1]);
 				}
 			)),
-			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiU' => function ($match) use($bbcode_class)
+			'url'			=> array('bbcode_id' => BBCODE_URL_ID,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiU' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->validate_url($match[2], ($match[3]) ? $match[3] : $match[4]);
 				}
 			)),
-			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#uiU' => function ($match) use($bbcode_class)
+			'img'			=> array('bbcode_id' => BBCODE_IMG_ID,	'regexp' => array('#\[img\](.*)\[/img\]#uiU' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_img($match[1]);
 				}
 			)),
-			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uis' => function ($match) use($bbcode_class)
+			'size'			=> array('bbcode_id' => BBCODE_SIZE_ID,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_size($match[1], $match[2]);
 				}
 			)),
-			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uis' => function ($match) use($bbcode_class)
+			'color'			=> array('bbcode_id' => BBCODE_COLOR_ID,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_color($match[1], $match[2]);
 				}
 			)),
-			'u'				=> array('bbcode_id' => 7,	'regexp' => array('#\[u\](.*?)\[/u\]#uis' => function ($match) use($bbcode_class)
+			'u'				=> array('bbcode_id' => BBCODE_U_ID,	'regexp' => array('#\[u\](.*?)\[/u\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_underline($match[1]);
 				}
 			)),
-			'list'			=> array('bbcode_id' => 9,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uis' => function ($match) use($bbcode_class)
+			'list'			=> array('bbcode_id' => BBCODE_LIST_ID,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_parse_list($match[0]);
 				}
 			)),
-			'email'			=> array('bbcode_id' => 10,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#uis' => function ($match) use($bbcode_class)
+			'email'			=> array('bbcode_id' => BBCODE_EMAIL_ID,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->validate_email($match[1], $match[2]);
 				}
 			)),
-			'flash'			=> array('bbcode_id' => 11,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ui' => function ($match) use($bbcode_class)
+			'flash'			=> array('bbcode_id' => BBCODE_FLASH_ID,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ui' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_flash($match[1], $match[2], $match[3]);
 				}
-- 
cgit v1.2.1


From 15a00131938fd0d1ae151f562f4fc75569db06cc Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Sat, 19 Mar 2016 17:17:03 +0100
Subject: [ticket/9435] Switch "ID" and BBcode name in constants keys

PHPBB3-9435
---
 phpBB/includes/message_parser.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index ad277fd90a..258837e4e2 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -141,67 +141,67 @@ class bbcode_firstpass extends bbcode
 		// To perform custom validation in extension, use $this->validate_bbcode_by_extension()
 		// method which accepts variable number of parameters
 		$this->bbcodes = array(
-			'code'			=> array('bbcode_id' => BBCODE_CODE_ID,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uis' => function ($match) use($bbcode_class)
+			'code'			=> array('bbcode_id' => BBCODE_ID_CODE,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_code($match[1], $match[2]);
 				}
 			)),
-			'quote'			=> array('bbcode_id' => BBCODE_QUOTE_ID,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uis' => function ($match) use($bbcode_class)
+			'quote'			=> array('bbcode_id' => BBCODE_ID_QUOTE,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_quote($match[0]);
 				}
 			)),
-			'attachment'	=> array('bbcode_id' => BBCODE_ATTACH_ID,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uis' => function ($match) use($bbcode_class)
+			'attachment'	=> array('bbcode_id' => BBCODE_ID_ATTACH,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_attachment($match[1], $match[2]);
 				}
 			)),
-			'b'				=> array('bbcode_id' => BBCODE_B_ID,	'regexp' => array('#\[b\](.*?)\[/b\]#uis' => function ($match) use($bbcode_class)
+			'b'				=> array('bbcode_id' => BBCODE_ID_B,	'regexp' => array('#\[b\](.*?)\[/b\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_strong($match[1]);
 				}
 			)),
-			'i'				=> array('bbcode_id' => BBCODE_I_ID,	'regexp' => array('#\[i\](.*?)\[/i\]#uis' => function ($match) use($bbcode_class)
+			'i'				=> array('bbcode_id' => BBCODE_ID_I,	'regexp' => array('#\[i\](.*?)\[/i\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_italic($match[1]);
 				}
 			)),
-			'url'			=> array('bbcode_id' => BBCODE_URL_ID,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiU' => function ($match) use($bbcode_class)
+			'url'			=> array('bbcode_id' => BBCODE_ID_URL,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiU' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->validate_url($match[2], ($match[3]) ? $match[3] : $match[4]);
 				}
 			)),
-			'img'			=> array('bbcode_id' => BBCODE_IMG_ID,	'regexp' => array('#\[img\](.*)\[/img\]#uiU' => function ($match) use($bbcode_class)
+			'img'			=> array('bbcode_id' => BBCODE_ID_IMG,	'regexp' => array('#\[img\](.*)\[/img\]#uiU' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_img($match[1]);
 				}
 			)),
-			'size'			=> array('bbcode_id' => BBCODE_SIZE_ID,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uis' => function ($match) use($bbcode_class)
+			'size'			=> array('bbcode_id' => BBCODE_ID_SIZE,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_size($match[1], $match[2]);
 				}
 			)),
-			'color'			=> array('bbcode_id' => BBCODE_COLOR_ID,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uis' => function ($match) use($bbcode_class)
+			'color'			=> array('bbcode_id' => BBCODE_ID_COLOR,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_color($match[1], $match[2]);
 				}
 			)),
-			'u'				=> array('bbcode_id' => BBCODE_U_ID,	'regexp' => array('#\[u\](.*?)\[/u\]#uis' => function ($match) use($bbcode_class)
+			'u'				=> array('bbcode_id' => BBCODE_ID_U,	'regexp' => array('#\[u\](.*?)\[/u\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_underline($match[1]);
 				}
 			)),
-			'list'			=> array('bbcode_id' => BBCODE_LIST_ID,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uis' => function ($match) use($bbcode_class)
+			'list'			=> array('bbcode_id' => BBCODE_ID_LIST,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_parse_list($match[0]);
 				}
 			)),
-			'email'			=> array('bbcode_id' => BBCODE_EMAIL_ID,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#uis' => function ($match) use($bbcode_class)
+			'email'			=> array('bbcode_id' => BBCODE_ID_EMAIL,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#uis' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->validate_email($match[1], $match[2]);
 				}
 			)),
-			'flash'			=> array('bbcode_id' => BBCODE_FLASH_ID,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ui' => function ($match) use($bbcode_class)
+			'flash'			=> array('bbcode_id' => BBCODE_ID_FLASH,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ui' => function ($match) use($bbcode_class)
 				{
 					return $bbcode_class->bbcode_flash($match[1], $match[2], $match[3]);
 				}
-- 
cgit v1.2.1


From c64b8102b7c5dc5bd0be9d8085d01a66e90dde73 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Tue, 29 Mar 2016 21:21:35 +0200
Subject: [ticket/10809] Remove MSSQL support

PHPBB3-10809
---
 phpBB/includes/message_parser.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 258837e4e2..5b585d4237 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1470,7 +1470,6 @@ class parse_message extends bbcode_firstpass
 			// For now setting the ttl to 10 minutes
 			switch ($db->get_sql_layer())
 			{
-				case 'mssql':
 				case 'mssql_odbc':
 				case 'mssqlnative':
 					$sql = 'SELECT *
-- 
cgit v1.2.1


From 68c3a0307de19fdefd7ae716247fffea3ee30c0c Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Wed, 16 Aug 2017 21:57:11 +0700
Subject: [ticket/15324] Add more core and template events

PHPBB3-15324
---
 phpBB/includes/message_parser.php | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index d6e36fec39..d397c0084e 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1530,7 +1530,7 @@ class parse_message extends bbcode_firstpass
 	function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false)
 	{
 		global $config, $auth, $user, $phpbb_root_path, $phpEx, $db, $request;
-		global $phpbb_container;
+		global $phpbb_container, $phpbb_dispatcher;
 
 		$error = array();
 
@@ -1598,6 +1598,20 @@ class parse_message extends bbcode_firstpass
 					);
 
 					$this->attachment_data = array_merge(array(0 => $new_entry), $this->attachment_data);
+
+					/**
+					* Modify attachment data on submit
+					*
+					* @event core.modify_attachment_data_on_submit
+					* @var	array	attachment_data		Array containing attachment data
+					* @since 3.2.2-RC1
+					*/
+					$attachment_data = $this->attachment_data;
+					$vars = array('attachment_data');
+					extract($phpbb_dispatcher->trigger_event('core.modify_attachment_data_on_submit', compact($vars)));
+					$this->attachment_data = $attachment_data;
+					unset($attachment_data);
+
 					$this->message = preg_replace_callback('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#', function ($match) {
 						return '[attachment='.($match[1] + 1).']' . $match[2] . '[/attachment]';
 					}, $this->message);
@@ -1719,6 +1733,20 @@ class parse_message extends bbcode_firstpass
 						);
 
 						$this->attachment_data = array_merge(array(0 => $new_entry), $this->attachment_data);
+
+						/**
+						* Modify attachment data on upload
+						*
+						* @event core.modify_attachment_data_on_upload
+						* @var	array	attachment_data		Array containing attachment data
+						* @since 3.2.2-RC1
+						*/
+						$attachment_data = $this->attachment_data;
+						$vars = array('attachment_data');
+						extract($phpbb_dispatcher->trigger_event('core.modify_attachment_data_on_upload', compact($vars)));
+						$this->attachment_data = $attachment_data;
+						unset($attachment_data);
+
 						$this->message = preg_replace_callback('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#', function ($match) {
 							return '[attachment=' . ($match[1] + 1) . ']' . $match[2] . '[/attachment]';
 						}, $this->message);
-- 
cgit v1.2.1


From 654c2370ea1c62cc610138209018b6d4abc62046 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 8 Sep 2017 11:54:42 +0200
Subject: [ticket/7845] Ensure config script path is not empty

PHPBB3-7845
---
 phpBB/includes/message_parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/message_parser.php')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index d397c0084e..45f00c9ee1 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1072,7 +1072,7 @@ class bbcode_firstpass extends bbcode
 
 		if ($config['force_server_vars'])
 		{
-			$check_path = $config['script_path'];
+			$check_path = !empty($config['script_path']) ? $config['script_path'] : '/';
 		}
 		else
 		{
-- 
cgit v1.2.1