From de52580a78bcab47a2311f3993fd9952f963d563 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 1 May 2015 05:15:56 +0200
Subject: [ticket/13803] WIP implementation

PHPBB3-13803
---
 phpBB/phpbb/textreparser/base.php | 97 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 phpBB/phpbb/textreparser/base.php

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
new file mode 100644
index 0000000000..6aa20d0015
--- /dev/null
+++ b/phpBB/phpbb/textreparser/base.php
@@ -0,0 +1,97 @@
+<?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\textreparser;
+
+abstract class base implements reparser_interface
+{
+	/**
+	* @var \phpbb\db\driver\driver_interface
+	*/
+	protected $db;
+
+	/**
+	* Constructor
+	*
+	* @param \phpbb\db\driver\driver_interface $db Database connection
+	*/
+	public function __construct(\phpbb\db\driver\driver_interface $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	abstract public function get_max_id();
+
+	/**
+	* Return all records in given range
+	*
+	* @param  integer $min_id Lower bound
+	* @param  integer $max_id Upper bound
+	* @return array           Array of record
+	*/
+	abstract protected function get_records($min_id, $max_id);
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function reparse_range($min_id, $max_id)
+	{
+		foreach ($this->get_records($min_id, $max_id) as $record)
+		{
+			$this->reparse_record($record);
+		}
+	}
+
+	/**
+	* Reparse given record
+	*
+	* @param  array $record Associative array containing the record's data
+	*/
+	protected function reparse_record(array $record)
+	{
+		$unparsed = array_merge(
+			$record,
+			generate_text_for_edit(
+				$record['text'],
+				$record['bbcode_uid'],
+				OPTION_FLAG_BBCODE | OPTION_FLAG_SMILIES | OPTION_FLAG_LINKS
+			)
+		);
+		$bitfield = $flags = null;
+		$parsed_text = $unparsed['text'];
+		generate_text_for_storage(
+			$parsed_text,
+			$unparsed['bbcode_uid'],
+			$bitfield,
+			$flags,
+			$unparsed['enable_bbcode'],
+			$unparsed['enable_smilies'],
+			$unparsed['enable_magic_url']
+		);
+
+		// Save the new text if it has changed
+		if ($parsed_text !== $record['text'])
+		{
+			$record['text'] = $parsed_text;
+			$this->save_record($record);
+		}
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	abstract protected function save_record(array $record);
+}
-- 
cgit v1.2.1


From 986af43f37342953bff548630aa33904c21234f4 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 1 May 2015 08:47:01 +0200
Subject: [ticket/13803] Added plugins

PHPBB3-13803
---
 phpBB/phpbb/textreparser/base.php | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 6aa20d0015..7d1e12c52d 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -15,21 +15,6 @@ namespace phpbb\textreparser;
 
 abstract class base implements reparser_interface
 {
-	/**
-	* @var \phpbb\db\driver\driver_interface
-	*/
-	protected $db;
-
-	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface $db Database connection
-	*/
-	public function __construct(\phpbb\db\driver\driver_interface $db)
-	{
-		$this->db = $db;
-	}
-
 	/**
 	* {@inheritdoc}
 	*/
-- 
cgit v1.2.1


From b5911281ae175340817345e63ddbfaf43abb3cec Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 1 May 2015 19:21:01 +0200
Subject: [ticket/13803] Added tests, fixed param order in
 generate_text_for_storage()

PHPBB3-13803
---
 phpBB/phpbb/textreparser/base.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 7d1e12c52d..f65745f6ab 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -63,8 +63,8 @@ abstract class base implements reparser_interface
 			$bitfield,
 			$flags,
 			$unparsed['enable_bbcode'],
-			$unparsed['enable_smilies'],
-			$unparsed['enable_magic_url']
+			$unparsed['enable_magic_url'],
+			$unparsed['enable_smilies']
 		);
 
 		// Save the new text if it has changed
-- 
cgit v1.2.1


From ea445ffa4776b7ce0b1d13485f113c7e1ec28af0 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sat, 2 May 2015 01:08:32 +0200
Subject: [ticket/13803] Added methods to detect whether a given feature is in
 use

They test whether a given BBCode was enabled and has been used in a text,
or smilies, or magic URLs.

PHPBB3-13803
---
 phpBB/phpbb/textreparser/base.php | 56 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index f65745f6ab..f3f31ca320 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -29,6 +29,62 @@ abstract class base implements reparser_interface
 	*/
 	abstract protected function get_records($min_id, $max_id);
 
+	/**
+	* Guess whether given BBCode is in use in given record
+	*
+	* @param  array  $record
+	* @param  string $bbcode
+	* @return bool
+	*/
+	protected function guess_bbcode(array $record, $bbcode)
+	{
+		if (!empty($record['bbcode_uid']))
+		{
+			// Look for the closing tag, e.g. [/url]
+			$match = '[/' . $bbcode . ':' . $record['bbcode_uid'];
+			if (stripos($record['text'], $match) !== false)
+			{
+				return true;
+			}
+		}
+
+		if (substr($record['text'], 0, 2) == '<r')
+		{
+			// Look for the closing tag inside of a e element, in an element of the same name, e.g.
+			// <e>[/url]</e></URL>
+			$match = '<e>[/' . $bbcode . ']</e></' . $bbcode . '>';
+			if (stripos($record['text'], $match) !== false)
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	* Guess whether magic URLs are in use in given record
+	*
+	* @param  array $record
+	* @return bool
+	*/
+	protected function guess_magic_url(array $record)
+	{
+		// Look for <!-- m --> or for a URL tag that's not immediately followed by <s>
+		return (strpos($record['text'], '<!-- m -->') !== false || preg_match('(<URL [^>]++>(?!<s>))', strpos($row['text'])));
+	}
+
+	/**
+	* Guess whether smilies are in use in given record
+	*
+	* @param  array $record
+	* @return bool
+	*/
+	protected function guess_smilies(array $record)
+	{
+		return (strpos($row['text'], '<!-- s') !== false || strpos($row['text'], '<E>') !== false);
+	}
+
 	/**
 	* {@inheritdoc}
 	*/
-- 
cgit v1.2.1


From 9bf0f794b5876b10491c91548f1a92bc0dff7400 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sat, 2 May 2015 02:55:45 +0200
Subject: [ticket/13803] Added pm_text tests

PHPBB3-13803
---
 phpBB/phpbb/textreparser/base.php | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index f3f31ca320..2d4a4171af 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -29,6 +29,38 @@ abstract class base implements reparser_interface
 	*/
 	abstract protected function get_records($min_id, $max_id);
 
+	/**
+	* Add fields to given record, if applicable
+	*
+	* The enable_* fields are not always saved to the database. Sometimes we need to guess their
+	* original value based on the text content or possibly other fields
+	*
+	* @param  array $record Original record
+	* @return array         Complete record
+	*/
+	protected function add_missing_fields(array $record)
+	{
+		if (!isset($record['enable_bbcode'], $record['enable_smilies'], $record['enable_magic_url']))
+		{
+			$record += array(
+				'enable_bbcode'    => !empty($record['bbcode_uid']),
+				'enable_smilies'   => $this->guess_smilies($record),
+				'enable_magic_url' => $this->guess_magic_url($record),
+			);
+		}
+
+		// Those BBCodes are disabled based on context and user permissions and that value is never
+		// stored in the database. Here we test whether they were used in the original text.
+		$bbcodes = array('flash', 'img', 'quote', 'url');
+		foreach ($bbcodes as $bbcode)
+		{
+			$field_name = 'enable_' . $bbcode . '_bbcode';
+			$record[$field_name] = $this->guess_bbcode($record, $bbcode);
+		}
+
+		return $record;
+	}
+
 	/**
 	* Guess whether given BBCode is in use in given record
 	*
@@ -120,7 +152,11 @@ abstract class base implements reparser_interface
 			$flags,
 			$unparsed['enable_bbcode'],
 			$unparsed['enable_magic_url'],
-			$unparsed['enable_smilies']
+			$unparsed['enable_smilies'],
+			$unparsed['enable_img_bbcode'],
+			$unparsed['enable_flash_bbcode'],
+			$unparsed['enable_quote_bbcode'],
+			$unparsed['enable_url_bbcode']
 		);
 
 		// Save the new text if it has changed
-- 
cgit v1.2.1


From 70cd911281056ecb4eefc23e678126e1747debc8 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sat, 2 May 2015 08:51:56 +0200
Subject: [ticket/13803] Added tests

PHPBB3-13803
---
 phpBB/phpbb/textreparser/base.php | 50 +++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 7 deletions(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 2d4a4171af..865b0662f9 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -43,7 +43,7 @@ abstract class base implements reparser_interface
 		if (!isset($record['enable_bbcode'], $record['enable_smilies'], $record['enable_magic_url']))
 		{
 			$record += array(
-				'enable_bbcode'    => !empty($record['bbcode_uid']),
+				'enable_bbcode'    => $this->guess_bbcodes($record),
 				'enable_smilies'   => $this->guess_smilies($record),
 				'enable_magic_url' => $this->guess_magic_url($record),
 			);
@@ -58,6 +58,13 @@ abstract class base implements reparser_interface
 			$record[$field_name] = $this->guess_bbcode($record, $bbcode);
 		}
 
+		// Magic URLs are tied to the URL BBCode, that's why if magic URLs are enabled we make sure
+		// that the URL BBCode is also enabled
+		if ($record['enable_magic_url'])
+		{
+			$record['enable_url_bbcode'] = true;
+		}
+
 		return $record;
 	}
 
@@ -74,7 +81,7 @@ abstract class base implements reparser_interface
 		{
 			// Look for the closing tag, e.g. [/url]
 			$match = '[/' . $bbcode . ':' . $record['bbcode_uid'];
-			if (stripos($record['text'], $match) !== false)
+			if (strpos($record['text'], $match) !== false)
 			{
 				return true;
 			}
@@ -84,8 +91,8 @@ abstract class base implements reparser_interface
 		{
 			// Look for the closing tag inside of a e element, in an element of the same name, e.g.
 			// <e>[/url]</e></URL>
-			$match = '<e>[/' . $bbcode . ']</e></' . $bbcode . '>';
-			if (stripos($record['text'], $match) !== false)
+			$match = '<e>[/' . $bbcode . ']</e></' . strtoupper($bbcode) . '>';
+			if (strpos($record['text'], $match) !== false)
 			{
 				return true;
 			}
@@ -94,6 +101,33 @@ abstract class base implements reparser_interface
 		return false;
 	}
 
+	/**
+	* Guess whether any BBCode is in use in given record
+	*
+	* @param  array $record
+	* @return bool
+	*/
+	protected function guess_bbcodes(array $record)
+	{
+		if (!empty($record['bbcode_uid']))
+		{
+			// Test whether the bbcode_uid is in use
+			$match = ':' . $record['bbcode_uid'];
+			if (strpos($record['text'], $match) !== false)
+			{
+				return true;
+			}
+		}
+
+		if (substr($record['text'], 0, 2) == '<r')
+		{
+			// Look for a closing tag inside of an e element
+			return (bool) preg_match('(<e>\\[/\\w+\\]</e>)', $match);
+		}
+
+		return false;
+	}
+
 	/**
 	* Guess whether magic URLs are in use in given record
 	*
@@ -103,7 +137,7 @@ abstract class base implements reparser_interface
 	protected function guess_magic_url(array $record)
 	{
 		// Look for <!-- m --> or for a URL tag that's not immediately followed by <s>
-		return (strpos($record['text'], '<!-- m -->') !== false || preg_match('(<URL [^>]++>(?!<s>))', strpos($row['text'])));
+		return (strpos($record['text'], '<!-- m -->') !== false || preg_match('(<URL [^>]++>(?!<s>))', $record['text']));
 	}
 
 	/**
@@ -114,7 +148,7 @@ abstract class base implements reparser_interface
 	*/
 	protected function guess_smilies(array $record)
 	{
-		return (strpos($row['text'], '<!-- s') !== false || strpos($row['text'], '<E>') !== false);
+		return (strpos($record['text'], '<!-- s') !== false || strpos($record['text'], '<E>') !== false);
 	}
 
 	/**
@@ -143,8 +177,10 @@ abstract class base implements reparser_interface
 				OPTION_FLAG_BBCODE | OPTION_FLAG_SMILIES | OPTION_FLAG_LINKS
 			)
 		);
+		// generate_text_for_edit() and decode_message() actually return the text as HTML. It has to
+		// be decoded to plain text before it can be reparsed
+		$parsed_text = html_entity_decode($unparsed['text'], ENT_QUOTES, 'UTF-8');
 		$bitfield = $flags = null;
-		$parsed_text = $unparsed['text'];
 		generate_text_for_storage(
 			$parsed_text,
 			$unparsed['bbcode_uid'],
-- 
cgit v1.2.1


From 212fc277b481440a99ff0483e5fbc40c790e8dda Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Wed, 6 May 2015 13:01:09 +0200
Subject: [ticket/13803] Reordered methods [ci skip]

PHPBB3-13803
---
 phpBB/phpbb/textreparser/base.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 865b0662f9..85327cdfce 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -29,6 +29,11 @@ abstract class base implements reparser_interface
 	*/
 	abstract protected function get_records($min_id, $max_id);
 
+	/**
+	* {@inheritdoc}
+	*/
+	abstract protected function save_record(array $record);
+
 	/**
 	* Add fields to given record, if applicable
 	*
@@ -202,9 +207,4 @@ abstract class base implements reparser_interface
 			$this->save_record($record);
 		}
 	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	abstract protected function save_record(array $record);
 }
-- 
cgit v1.2.1


From ae6ad754a430309796e1963684b59c01739ba4dd Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sat, 9 May 2015 18:54:57 +0200
Subject: [ticket/13803] Moved the add_missing_fields() call to the base class

PHPBB3-13803
---
 phpBB/phpbb/textreparser/base.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 85327cdfce..47ac177e05 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -174,6 +174,7 @@ abstract class base implements reparser_interface
 	*/
 	protected function reparse_record(array $record)
 	{
+		$record = $this->add_missing_fields($record);
 		$unparsed = array_merge(
 			$record,
 			generate_text_for_edit(
-- 
cgit v1.2.1


From 75eb283f8d7a7afcd3945d0d28bd0f58aa4f0cd6 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Tue, 19 May 2015 09:48:29 +0200
Subject: [ticket/13803] Renamed methods

PHPBB3-13803
---
 phpBB/phpbb/textreparser/base.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 47ac177e05..2b8cacb092 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -25,9 +25,9 @@ abstract class base implements reparser_interface
 	*
 	* @param  integer $min_id Lower bound
 	* @param  integer $max_id Upper bound
-	* @return array           Array of record
+	* @return array           Array of records
 	*/
-	abstract protected function get_records($min_id, $max_id);
+	abstract protected function get_records_by_range($min_id, $max_id);
 
 	/**
 	* {@inheritdoc}
@@ -161,7 +161,7 @@ abstract class base implements reparser_interface
 	*/
 	public function reparse_range($min_id, $max_id)
 	{
-		foreach ($this->get_records($min_id, $max_id) as $record)
+		foreach ($this->get_records_by_range($min_id, $max_id) as $record)
 		{
 			$this->reparse_record($record);
 		}
-- 
cgit v1.2.1


From 1275f77da5e1522d530bee55a5aa493817f58e71 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Wed, 20 May 2015 10:34:49 +0200
Subject: [ticket/13803] Renamed var

PHPBB3-13803
---
 phpBB/phpbb/textreparser/base.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 2b8cacb092..4afcecff6a 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -185,10 +185,10 @@ abstract class base implements reparser_interface
 		);
 		// generate_text_for_edit() and decode_message() actually return the text as HTML. It has to
 		// be decoded to plain text before it can be reparsed
-		$parsed_text = html_entity_decode($unparsed['text'], ENT_QUOTES, 'UTF-8');
+		$text = html_entity_decode($unparsed['text'], ENT_QUOTES, 'UTF-8');
 		$bitfield = $flags = null;
 		generate_text_for_storage(
-			$parsed_text,
+			$text,
 			$unparsed['bbcode_uid'],
 			$bitfield,
 			$flags,
@@ -202,9 +202,9 @@ abstract class base implements reparser_interface
 		);
 
 		// Save the new text if it has changed
-		if ($parsed_text !== $record['text'])
+		if ($text !== $record['text'])
 		{
-			$record['text'] = $parsed_text;
+			$record['text'] = $text;
 			$this->save_record($record);
 		}
 	}
-- 
cgit v1.2.1


From 2a7d26d3debdce7ca82f3044de45b651286c6034 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 29 May 2015 23:38:01 +0200
Subject: [ticket/13803] Use accurate flags for generate_text_for_edit()

PHPBB3-13803
---
 phpBB/phpbb/textreparser/base.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 4afcecff6a..87a4268d0d 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -175,14 +175,14 @@ abstract class base implements reparser_interface
 	protected function reparse_record(array $record)
 	{
 		$record = $this->add_missing_fields($record);
+		$flags = ($record['enable_bbcode']) ? OPTION_FLAG_BBCODE : 0;
+		$flags |= ($record['enable_smilies']) ? OPTION_FLAG_SMILIES : 0;
+		$flags |= ($record['enable_magic_url']) ? OPTION_FLAG_LINKS : 0;
 		$unparsed = array_merge(
 			$record,
-			generate_text_for_edit(
-				$record['text'],
-				$record['bbcode_uid'],
-				OPTION_FLAG_BBCODE | OPTION_FLAG_SMILIES | OPTION_FLAG_LINKS
-			)
+			generate_text_for_edit($record['text'], $record['bbcode_uid'], $flags)
 		);
+
 		// generate_text_for_edit() and decode_message() actually return the text as HTML. It has to
 		// be decoded to plain text before it can be reparsed
 		$text = html_entity_decode($unparsed['text'], ENT_QUOTES, 'UTF-8');
-- 
cgit v1.2.1


From a44711e57478c6f9d1fa38582deae72cad240560 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Mon, 6 Jul 2015 19:17:40 +0200
Subject: [ticket/13990] Reparse markup inside of forum rules/description

PHPBB3-13990
---
 phpBB/phpbb/textreparser/base.php | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 87a4268d0d..ed6c2376c7 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -47,11 +47,22 @@ abstract class base implements reparser_interface
 	{
 		if (!isset($record['enable_bbcode'], $record['enable_smilies'], $record['enable_magic_url']))
 		{
-			$record += array(
-				'enable_bbcode'    => $this->guess_bbcodes($record),
-				'enable_smilies'   => $this->guess_smilies($record),
-				'enable_magic_url' => $this->guess_magic_url($record),
-			);
+			if (isset($record['options']))
+			{
+				$record += array(
+					'enable_bbcode'    => (bool) ($record['options'] & OPTION_FLAG_BBCODE),
+					'enable_smilies'   => (bool) ($record['options'] & OPTION_FLAG_SMILIES),
+					'enable_magic_url' => (bool) ($record['options'] & OPTION_FLAG_LINKS),
+				);
+			}
+			else
+			{
+				$record += array(
+					'enable_bbcode'    => $this->guess_bbcodes($record),
+					'enable_smilies'   => $this->guess_smilies($record),
+					'enable_magic_url' => $this->guess_magic_url($record),
+				);
+			}
 		}
 
 		// Those BBCodes are disabled based on context and user permissions and that value is never
@@ -92,7 +103,7 @@ abstract class base implements reparser_interface
 			}
 		}
 
-		if (substr($record['text'], 0, 2) == '<r')
+		if (substr($record['text'], 0, 2) === '<r')
 		{
 			// Look for the closing tag inside of a e element, in an element of the same name, e.g.
 			// <e>[/url]</e></URL>
@@ -124,7 +135,7 @@ abstract class base implements reparser_interface
 			}
 		}
 
-		if (substr($record['text'], 0, 2) == '<r')
+		if (substr($record['text'], 0, 2) === '<r')
 		{
 			// Look for a closing tag inside of an e element
 			return (bool) preg_match('(<e>\\[/\\w+\\]</e>)', $match);
-- 
cgit v1.2.1


From 7ccb6389124c5e990abaa917a6684fc3f4d072db Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Mon, 6 Jul 2015 01:43:43 +0200
Subject: [ticket/13987] Add --dry-run option to reparser CLI

PHPBB3-13987
---
 phpBB/phpbb/textreparser/base.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index ed6c2376c7..6a366d659b 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -170,20 +170,21 @@ abstract class base implements reparser_interface
 	/**
 	* {@inheritdoc}
 	*/
-	public function reparse_range($min_id, $max_id)
+	public function reparse_range($min_id, $max_id, $dry_run = false)
 	{
 		foreach ($this->get_records_by_range($min_id, $max_id) as $record)
 		{
-			$this->reparse_record($record);
+			$this->reparse_record($record, $dry_run);
 		}
 	}
 
 	/**
 	* Reparse given record
 	*
-	* @param  array $record Associative array containing the record's data
+	* @param array   $record  Associative array containing the record's data
+	* @param integer $dry_run If TRUE, do not save the changes
 	*/
-	protected function reparse_record(array $record)
+	protected function reparse_record(array $record, $dry_run)
 	{
 		$record = $this->add_missing_fields($record);
 		$flags = ($record['enable_bbcode']) ? OPTION_FLAG_BBCODE : 0;
@@ -212,8 +213,8 @@ abstract class base implements reparser_interface
 			$unparsed['enable_url_bbcode']
 		);
 
-		// Save the new text if it has changed
-		if ($text !== $record['text'])
+		// Save the new text if it has changed and it's not a dry run
+		if ($text !== $record['text'] && !$dry_run)
 		{
 			$record['text'] = $text;
 			$this->save_record($record);
-- 
cgit v1.2.1


From cf4cdcda586a2371aa92ae452951f9660737ae09 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Mon, 6 Jul 2015 01:57:54 +0200
Subject: [ticket/13987] Replaced optional parameter with explicit API

Added disable_save() and enable_save() to toggle a dry run

PHPBB3-13987
---
 phpBB/phpbb/textreparser/base.php | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 6a366d659b..3e5ee248a1 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -15,6 +15,11 @@ namespace phpbb\textreparser;
 
 abstract class base implements reparser_interface
 {
+	/**
+	* @var bool Whether to save changes to the database
+	*/
+	protected $save_changes = true;
+
 	/**
 	* {@inheritdoc}
 	*/
@@ -84,6 +89,22 @@ abstract class base implements reparser_interface
 		return $record;
 	}
 
+	/**
+	* Disable saving changes to the database
+	*/
+	public function disable_save()
+	{
+		$this->save_changes = false;
+	}
+
+	/**
+	* Enable saving changes to the database
+	*/
+	public function enable_save()
+	{
+		$this->save_changes = true;
+	}
+
 	/**
 	* Guess whether given BBCode is in use in given record
 	*
@@ -170,21 +191,20 @@ abstract class base implements reparser_interface
 	/**
 	* {@inheritdoc}
 	*/
-	public function reparse_range($min_id, $max_id, $dry_run = false)
+	public function reparse_range($min_id, $max_id)
 	{
 		foreach ($this->get_records_by_range($min_id, $max_id) as $record)
 		{
-			$this->reparse_record($record, $dry_run);
+			$this->reparse_record($record);
 		}
 	}
 
 	/**
 	* Reparse given record
 	*
-	* @param array   $record  Associative array containing the record's data
-	* @param integer $dry_run If TRUE, do not save the changes
+	* @param array $record Associative array containing the record's data
 	*/
-	protected function reparse_record(array $record, $dry_run)
+	protected function reparse_record(array $record)
 	{
 		$record = $this->add_missing_fields($record);
 		$flags = ($record['enable_bbcode']) ? OPTION_FLAG_BBCODE : 0;
@@ -214,7 +234,7 @@ abstract class base implements reparser_interface
 		);
 
 		// Save the new text if it has changed and it's not a dry run
-		if ($text !== $record['text'] && !$dry_run)
+		if ($text !== $record['text'] && $this->save_changes)
 		{
 			$record['text'] = $text;
 			$this->save_record($record);
-- 
cgit v1.2.1


From 0ff4a6b6a4151f25d94d7b4f651b069e21b036b2 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Thu, 24 Mar 2016 19:49:23 +0100
Subject: [ticket/14381] Set the mode in message parser to "reparse"

The default mode is "post". By setting it to something else,
all limits pertaining to posts (min/max length, etc...) should
be disabled.

PHPBB3-14381
---
 phpBB/phpbb/textreparser/base.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 3e5ee248a1..afa5ccacad 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -230,7 +230,8 @@ abstract class base implements reparser_interface
 			$unparsed['enable_img_bbcode'],
 			$unparsed['enable_flash_bbcode'],
 			$unparsed['enable_quote_bbcode'],
-			$unparsed['enable_url_bbcode']
+			$unparsed['enable_url_bbcode'],
+			'reparse'
 		);
 
 		// Save the new text if it has changed and it's not a dry run
-- 
cgit v1.2.1


From b4748a5d1ee31084da7e78f8ffaf5b036f2e5314 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 18 Dec 2016 01:28:51 -0800
Subject: [ticket/14925] Set reparser names in service definitions

PHPBB3-14925
---
 phpBB/phpbb/textreparser/base.php | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index afa5ccacad..ef97bc90d5 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -15,6 +15,11 @@ namespace phpbb\textreparser;
 
 abstract class base implements reparser_interface
 {
+	/**
+	 * @var string The reparser name
+	 */
+	protected $name;
+
 	/**
 	* @var bool Whether to save changes to the database
 	*/
@@ -89,6 +94,26 @@ abstract class base implements reparser_interface
 		return $record;
 	}
 
+	/**
+	 * Returns the name of the reparser
+	 *
+	 * @return string Name of reparser
+	 */
+	public function get_name()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Sets the name of the reparser
+	 *
+	 * @param string $name The reparser name
+	 */
+	public function set_name($name)
+	{
+		$this->name = $name;
+	}
+
 	/**
 	* Disable saving changes to the database
 	*/
@@ -231,7 +256,7 @@ abstract class base implements reparser_interface
 			$unparsed['enable_flash_bbcode'],
 			$unparsed['enable_quote_bbcode'],
 			$unparsed['enable_url_bbcode'],
-			'reparse'
+			$this->get_name()
 		);
 
 		// Save the new text if it has changed and it's not a dry run
-- 
cgit v1.2.1


From 76e9f4dd2d45e8f128e59e1378dfd6778eec9d48 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 18 Dec 2016 09:12:26 -0800
Subject: [ticket/14925] Prefix modes from reparser with text_reparser

PHPBB3-14925
---
 phpBB/phpbb/textreparser/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textreparser/base.php')

diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index ef97bc90d5..27d7bc1f27 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -256,7 +256,7 @@ abstract class base implements reparser_interface
 			$unparsed['enable_flash_bbcode'],
 			$unparsed['enable_quote_bbcode'],
 			$unparsed['enable_url_bbcode'],
-			$this->get_name()
+			'text_reparser.' . $this->get_name()
 		);
 
 		// Save the new text if it has changed and it's not a dry run
-- 
cgit v1.2.1