From a7984e660da4def80d28a4efeacb5ee861c4718c Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 5 Jan 2008 16:10:10 +0000
Subject: Correctly check empty subjects/messages (Bug #17915) Do not check
 usernames against word censor list. Disallowed usernames is already checked
 and word censor belong to posts. (Bug #17745) Additionally include
 non-postable forums for moderators forums shown within the teams list. (Bug
 #17265)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8306 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 11 ++++++++---
 1 file changed, 8 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 6e601e1499..eeaa6d9529 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -913,9 +913,14 @@ class bbcode_firstpass extends bbcode
 
 		$url = ($var1) ? $var1 : $var2;
 
-		if (!$url || ($var1 && !$var2))
+		if ($var1 && !$var2)
 		{
-			return '';
+			$var2 = $var1;
+		}
+
+		if (!$url)
+		{
+			return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]';
 		}
 
 		$valid = false;
@@ -1088,7 +1093,7 @@ class parse_message extends bbcode_firstpass
 		}
 
 		// Check for "empty" message
-		if ($mode !== 'sig' && !utf8_clean_string($this->message))
+		if ($mode !== 'sig' && utf8_clean_string($this->message) === '')
 		{
 			$this->warn_msg[] = $user->lang['TOO_FEW_CHARS'];
 			return $this->warn_msg;
-- 
cgit v1.2.1


From c7821700dd36899a53b8afe9f859d7a40a23e7b4 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 29 Jan 2008 15:49:15 +0000
Subject: #19955

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8348 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 eeaa6d9529..9e4b075818 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -983,7 +983,7 @@ class bbcode_firstpass extends bbcode
 		// Is the user trying to link to a php file in this domain and script path?
 		if (strpos($url, ".{$phpEx}") !== false && strpos($url, $check_path) !== false)
 		{
-			$server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME');
+			$server_name = $user->host;
 
 			// Forcing server vars is the only way to specify/override the protocol
 			if ($config['force_server_vars'] || !$server_name)
@@ -1084,7 +1084,7 @@ class parse_message extends bbcode_firstpass
 		if ($config['max_' . $mode . '_chars'] > 0)
 		{
 			$msg_len = ($mode == 'post') ? utf8_strlen($this->message) : utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#ius', ' ', $this->message));
-	
+
 			if ((!$msg_len && $mode !== 'sig') || $config['max_' . $mode . '_chars'] && $msg_len > $config['max_' . $mode . '_chars'])
 			{
 				$this->warn_msg[] = (!$msg_len) ? $user->lang['TOO_FEW_CHARS'] : sprintf($user->lang['TOO_MANY_CHARS_' . strtoupper($mode)], $msg_len, $config['max_' . $mode . '_chars']);
@@ -1254,7 +1254,7 @@ class parse_message extends bbcode_firstpass
 			$match = $replace = array();
 
 			// NOTE: obtain_* function? chaching the table contents?
-	
+
 			// For now setting the ttl to 10 minutes
 			switch ($db->sql_layer)
 			{
@@ -1264,7 +1264,7 @@ class parse_message extends bbcode_firstpass
 						FROM ' . SMILIES_TABLE . '
 						ORDER BY LEN(code) DESC';
 				break;
-	
+
 				case 'firebird':
 					$sql = 'SELECT *
 						FROM ' . SMILIES_TABLE . '
-- 
cgit v1.2.1


From 2092f07c544b0a44aba085216eeadc84be5cec5d Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 23 Feb 2008 15:03:50 +0000
Subject: Correctly return sole whitespaces if used with BBCodes - #19535

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8392 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 9e4b075818..e78fc271a6 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -198,7 +198,7 @@ class bbcode_firstpass extends bbcode
 
 		if (!$this->check_bbcode('size', $in))
 		{
-			return '';
+			return $in;
 		}
 
 		if ($config['max_' . $this->mode . '_font_size'] && $config['max_' . $this->mode . '_font_size'] < $stx)
@@ -224,7 +224,7 @@ class bbcode_firstpass extends bbcode
 	{
 		if (!$this->check_bbcode('color', $in))
 		{
-			return '';
+			return $in;
 		}
 
 		return '[color=' . $stx . ':' . $this->bbcode_uid . ']' . $in . '[/color:' . $this->bbcode_uid . ']';
@@ -237,7 +237,7 @@ class bbcode_firstpass extends bbcode
 	{
 		if (!$this->check_bbcode('u', $in))
 		{
-			return '';
+			return $in;
 		}
 
 		return '[u:' . $this->bbcode_uid . ']' . $in . '[/u:' . $this->bbcode_uid . ']';
@@ -250,7 +250,7 @@ class bbcode_firstpass extends bbcode
 	{
 		if (!$this->check_bbcode('b', $in))
 		{
-			return '';
+			return $in;
 		}
 
 		return '[b:' . $this->bbcode_uid . ']' . $in . '[/b:' . $this->bbcode_uid . ']';
@@ -263,7 +263,7 @@ class bbcode_firstpass extends bbcode
 	{
 		if (!$this->check_bbcode('i', $in))
 		{
-			return '';
+			return $in;
 		}
 
 		return '[i:' . $this->bbcode_uid . ']' . $in . '[/i:' . $this->bbcode_uid . ']';
@@ -278,7 +278,7 @@ class bbcode_firstpass extends bbcode
 
 		if (!$this->check_bbcode('img', $in))
 		{
-			return '';
+			return $in;
 		}
 
 		$in = trim($in);
@@ -340,7 +340,7 @@ class bbcode_firstpass extends bbcode
 
 		if (!$this->check_bbcode('flash', $in))
 		{
-			return '';
+			return $in;
 		}
 
 		$in = trim($in);
@@ -377,7 +377,7 @@ class bbcode_firstpass extends bbcode
 	{
 		if (!$this->check_bbcode('attachment', $in))
 		{
-			return '';
+			return $in;
 		}
 
 		return '[attachment=' . $stx . ':' . $this->bbcode_uid . ']<!-- ia' . $stx . ' -->' . trim($in) . '<!-- ia' . $stx . ' -->[/attachment:' . $this->bbcode_uid . ']';
@@ -457,7 +457,7 @@ class bbcode_firstpass extends bbcode
 	{
 		if (!$this->check_bbcode('code', $in))
 		{
-			return '';
+			return $in;
 		}
 
 		// We remove the hardcoded elements from the code block here because it is not used in code blocks
@@ -550,7 +550,7 @@ class bbcode_firstpass extends bbcode
 	{
 		if (!$this->check_bbcode('list', $in))
 		{
-			return '';
+			return $in;
 		}
 
 		// $tok holds characters to stop at. Since the string starts with a '[' we'll get everything up to the first ']' which should be the opening [list] tag
-- 
cgit v1.2.1


From 7ea118198e3af9f6ff97c883a75b38bef2fc3881 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 23 Feb 2008 15:29:38 +0000
Subject: - Fix quote bbcode parsing adding too much closing tags on special
 conditions - #20735

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8393 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 5 +++--
 1 file changed, 3 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 e78fc271a6..41e7bc51d7 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -684,7 +684,8 @@ class bbcode_firstpass extends bbcode
 		* #14667 - [quote]test[/quote] test ] and [ test [quote]test[/quote] (correct: parsed)
 		* #14770 - [quote="["]test[/quote] (correct: parsed)
 		* [quote="[i]test[/i]"]test[/quote] (correct: parsed)
-		* [quote="[quote]test[/quote]"]test[/quote] (correct: NOT parsed)
+		* [quote="[quote]test[/quote]"]test[/quote] (correct: parsed - Username displayed as [quote]test[/quote])
+		* #20735 - [quote]test[/[/b]quote] test [/quote][/quote] test - (correct: quoted: "test[/[/b]quote] test" / non-quoted: "[/quote] test" - also failed if layout distorted)
 		*/
 
 		$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
@@ -737,7 +738,7 @@ class bbcode_firstpass extends bbcode
 						$out .= ' ';
 					}*/
 				}
-				else if (preg_match('#^quote(?:=&quot;(.*?)&quot;)?$#is', $buffer, $m))
+				else if (preg_match('#^quote(?:=&quot;(.*?)&quot;)?$#is', $buffer, $m) && substr($out, -1, 1) == '[')
 				{
 					$this->parsed_items['quote']++;
 
-- 
cgit v1.2.1


From 58173191edc5b75434dca66edfe4405296d22572 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 13 Mar 2008 14:39:53 +0000
Subject: #22865

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8428 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 7 +++----
 1 file changed, 3 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 41e7bc51d7..674e13de49 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1089,7 +1089,7 @@ class parse_message extends bbcode_firstpass
 			if ((!$msg_len && $mode !== 'sig') || $config['max_' . $mode . '_chars'] && $msg_len > $config['max_' . $mode . '_chars'])
 			{
 				$this->warn_msg[] = (!$msg_len) ? $user->lang['TOO_FEW_CHARS'] : sprintf($user->lang['TOO_MANY_CHARS_' . strtoupper($mode)], $msg_len, $config['max_' . $mode . '_chars']);
-				return $this->warn_msg;
+				return (!$update_this_message) ? $return_message : $this->warn_msg;
 			}
 		}
 
@@ -1097,7 +1097,7 @@ class parse_message extends bbcode_firstpass
 		if ($mode !== 'sig' && utf8_clean_string($this->message) === '')
 		{
 			$this->warn_msg[] = $user->lang['TOO_FEW_CHARS'];
-			return $this->warn_msg;
+			return (!$update_this_message) ? $return_message : $this->warn_msg;
 		}
 
 		// Prepare BBcode (just prepares some tags for better parsing)
@@ -1146,7 +1146,7 @@ class parse_message extends bbcode_firstpass
 		if ($config['max_' . $mode . '_urls'] && $num_urls > $config['max_' . $mode . '_urls'])
 		{
 			$this->warn_msg[] = sprintf($user->lang['TOO_MANY_URLS'], $config['max_' . $mode . '_urls']);
-			return $this->warn_msg;
+			return (!$update_this_message) ? $return_message : $this->warn_msg;
 		}
 
 		if (!$update_this_message)
@@ -1603,7 +1603,6 @@ class parse_message extends bbcode_firstpass
 		$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);
 
 		$bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield));
-- 
cgit v1.2.1


From cf8eef783b46bd537dce77952f19549c21968d89 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 7 Jun 2008 13:40:37 +0000
Subject: do not allow [flash=0,0]... not implemented for images due to the
 reliance on getimagesize() - as usual both sizes are able to be limited by
 the maximum/minimum image size configuration options

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8613 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 674e13de49..6c12903999 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -346,6 +346,12 @@ class bbcode_firstpass extends bbcode
 		$in = trim($in);
 		$error = false;
 
+		// Do not allow 0-sizes generally being entered
+		if ($width <= 0 || $height <= 0)
+		{
+			return '[flash=' . $width . ',' . $height . ']' . $in . '[/flash]';
+		}
+
 		// Apply the same size checks on flash files as on images
 		if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width'])
 		{
-- 
cgit v1.2.1


From aa2baa7eaa51234e6807905a726c9593c7106679 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 21 Jun 2008 15:09:44 +0000
Subject: #26795

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8665 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 5 ++++-
 1 file changed, 4 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 6c12903999..8e0103af05 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -400,7 +400,10 @@ class bbcode_firstpass extends bbcode
 			case 'php':
 
 				$remove_tags = false;
-				$code = str_replace(array('&lt;', '&gt;'), array('<', '>'), $code);
+
+				$str_from = array('&lt;', '&gt;', '&#91;', '&#93;', '&#46;', '&#58;', '&#058;');
+				$str_to = array('<', '>', '[', ']', '.', ':', ':');
+				$code = str_replace($str_from, $str_to, $code);
 
 				if (!preg_match('/\<\?.*?\?\>/is', $code))
 				{
-- 
cgit v1.2.1


From 4d7b9b76fafece5273c78a69027451ed2d28d705 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 23 Aug 2008 17:23:40 +0000
Subject: some changes for proper code documentation

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8783 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 8e0103af05..c4e39ebab6 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -391,7 +391,7 @@ class bbcode_firstpass extends bbcode
 
 	/**
 	* Parse code text from code tag
-	* @private
+	* @access private
 	*/
 	function bbcode_parse_code($stx, &$code)
 	{
-- 
cgit v1.2.1


From f4f5d9a471b5f5a74895b5e7bf6037235589abfc Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Mon, 13 Oct 2008 02:17:24 +0000
Subject: Parse BBCode lists of type square, circle and disc. #35295

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9007 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 c4e39ebab6..0f0a821c84 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -604,7 +604,7 @@ class bbcode_firstpass extends bbcode
 					$out .= array_pop($list_end_tags) . ']';
 					$tok = '[';
 				}
-				else if (preg_match('#^list(=[0-9a-z])?$#i', $buffer, $m))
+				else if (preg_match('#^list(=[0-9a-z]+)?$#i', $buffer, $m))
 				{
 					// sub-list, add a closing tag
 					if (empty($m[1]) || preg_match('/^(?:disc|square|circle)$/i', $m[1]))
-- 
cgit v1.2.1


From dfb0907779fb8b955676759fae9c2e1e4e5f81eb Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Fri, 24 Oct 2008 00:49:30 +0000
Subject: Complete fix in r9007

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9034 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 0f0a821c84..4e350bce99 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -607,7 +607,7 @@ class bbcode_firstpass extends bbcode
 				else if (preg_match('#^list(=[0-9a-z]+)?$#i', $buffer, $m))
 				{
 					// sub-list, add a closing tag
-					if (empty($m[1]) || preg_match('/^(?:disc|square|circle)$/i', $m[1]))
+					if (empty($m[1]) || preg_match('/^=(?:disc|square|circle)$/i', $m[1]))
 					{
 						array_push($list_end_tags, '/list:u:' . $this->bbcode_uid);
 					}
-- 
cgit v1.2.1


From f78594b59d14a3451feb1af0de90a22cfe2b5b1c Mon Sep 17 00:00:00 2001
From: Jim Wigginton <terrafrost@phpbb.com>
Date: Mon, 26 Jan 2009 22:53:19 +0000
Subject: =?UTF-8?q?Fixed=20bug=20#40565=20=E2=80=93=20Missing=20end=20"=20?=
 =?UTF-8?q?in=20quote=20bb=20tag=20deletes=20text=20Authorised=20by:=20acy?=
 =?UTF-8?q?dburn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9304 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 4e350bce99..b97a055fde 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -695,6 +695,7 @@ class bbcode_firstpass extends bbcode
 		* [quote="[i]test[/i]"]test[/quote] (correct: parsed)
 		* [quote="[quote]test[/quote]"]test[/quote] (correct: parsed - Username displayed as [quote]test[/quote])
 		* #20735 - [quote]test[/[/b]quote] test [/quote][/quote] test - (correct: quoted: "test[/[/b]quote] test" / non-quoted: "[/quote] test" - also failed if layout distorted)
+		* #40565 - [quote="a"]a[/quote][quote="a]a[/quote] (correct: first quote tag parsed, second quote tag unparsed)
 		*/
 
 		$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
@@ -858,6 +859,8 @@ class bbcode_firstpass extends bbcode
 		}
 		while ($in);
 
+		$out .= $buffer;
+
 		if (sizeof($close_tags))
 		{
 			$out .= '[' . implode('][', $close_tags) . ']';
-- 
cgit v1.2.1


From 2e50df9e1a140f322e091d74500e05b6545a54e1 Mon Sep 17 00:00:00 2001
From: Jim Wigginton <terrafrost@phpbb.com>
Date: Thu, 26 Feb 2009 23:46:46 +0000
Subject: Fixed bug #'ers 41295, 41385, 41955, 41705 and 41985

Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9342 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 b97a055fde..bbe7cb5fa8 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -706,7 +706,7 @@ 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('#quote=&quot;(.*?)&quot;\]#ie', "'quote=&quot;' . str_replace(array('[', ']', '\\\"'), array('&#91;', '&#93;', '\"'), '\$1') . '&quot;]'", $in);
 
 		$tok = ']';
 		$out = '[';
-- 
cgit v1.2.1


From 21aeaab002118fd76abf6b352122dfb7cd55f06a Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 16 Mar 2009 14:35:14 +0000
Subject: fix bug #42785

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9370 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index bbe7cb5fa8..ed09cfa6bd 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1105,13 +1105,6 @@ class parse_message extends bbcode_firstpass
 			}
 		}
 
-		// Check for "empty" message
-		if ($mode !== 'sig' && utf8_clean_string($this->message) === '')
-		{
-			$this->warn_msg[] = $user->lang['TOO_FEW_CHARS'];
-			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)
 		{
@@ -1154,6 +1147,14 @@ class parse_message extends bbcode_firstpass
 			}
 		}
 
+		// 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 !== 'sig' && utf8_clean_string($this->message) === '')
+		{
+			$this->warn_msg[] = $user->lang['TOO_FEW_CHARS'];
+			return (!$update_this_message) ? $return_message : $this->warn_msg;
+		}
+
 		// Check number of links
 		if ($config['max_' . $mode . '_urls'] && $num_urls > $config['max_' . $mode . '_urls'])
 		{
-- 
cgit v1.2.1


From b9f426355c80c3cbeedfb149283f4eb31b63ef7b Mon Sep 17 00:00:00 2001
From: Jim Wigginton <terrafrost@phpbb.com>
Date: Wed, 1 Apr 2009 22:37:50 +0000
Subject: Fixed bug # 42885 - "Select all" selects much too much in Opera
 Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9422 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 ed09cfa6bd..2f72ad8fdc 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -453,7 +453,7 @@ class bbcode_firstpass extends bbcode
 			break;
 
 			default:
-				return '[code:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($code) . '[/code:' . $this->bbcode_uid . ']';
+				return '[code:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars(trim($code)) . '[/code:' . $this->bbcode_uid . ']';
 			break;
 		}
 	}
-- 
cgit v1.2.1


From 1e908f078e17c8ae7bf5358da6d76aae4f51712a Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Tue, 7 Apr 2009 12:50:31 +0000
Subject: Revert r9422 while we come up with a better fix

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9425 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 2f72ad8fdc..ed09cfa6bd 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -453,7 +453,7 @@ class bbcode_firstpass extends bbcode
 			break;
 
 			default:
-				return '[code:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars(trim($code)) . '[/code:' . $this->bbcode_uid . ']';
+				return '[code:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($code) . '[/code:' . $this->bbcode_uid . ']';
 			break;
 		}
 	}
-- 
cgit v1.2.1


From 60422b7b78c6c468c9f0553ebf49e16562c3f772 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 17 Apr 2009 13:07:51 +0000
Subject: #40865 - no message parsing for messages evaluating to false

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9453 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index ed09cfa6bd..ab6fc3f4f3 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1052,11 +1052,7 @@ class parse_message extends bbcode_firstpass
 	{
 		// Init BBCode UID
 		$this->bbcode_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN);
-
-		if ($message)
-		{
-			$this->message = $message;
-		}
+		$this->message = $message;
 	}
 
 	/**
-- 
cgit v1.2.1


From c32f49679f635175d43de7264ee09782c56c628e Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 23 Jun 2009 10:48:53 +0000
Subject: - add options for quick reply (forum-based and board-wide) - add
 option for minimum post chars (which is a required setting for quick reply,
 therefore we introduce it here)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9656 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 18 +++++++++++++-----
 1 file changed, 13 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 ab6fc3f4f3..4cdc8b933e 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1089,14 +1089,22 @@ class parse_message extends bbcode_firstpass
 		$replace = array("\\1&#058;");
 		$this->message = preg_replace($match, $replace, trim($this->message));
 
-		// Message length check. 0 disables this check completely.
-		if ($config['max_' . $mode . '_chars'] > 0)
+		// Store message length...
+		$message_length = ($mode == 'post') ? utf8_strlen($this->message) : utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#ius', ' ', $this->message));
+
+		// Maximum message length check. 0 disables this check completely.
+		if ((int) $config['max_' . $mode . '_chars'] > 0 && $message_length > (int) $config['max_' . $mode . '_chars'])
 		{
-			$msg_len = ($mode == 'post') ? utf8_strlen($this->message) : utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#ius', ' ', $this->message));
+			$this->warn_msg[] = sprintf($user->lang['TOO_MANY_CHARS_' . strtoupper($mode)], $message_length, (int) $config['max_' . $mode . '_chars']);
+			return (!$update_this_message) ? $return_message : $this->warn_msg;
+		}
 
-			if ((!$msg_len && $mode !== 'sig') || $config['max_' . $mode . '_chars'] && $msg_len > $config['max_' . $mode . '_chars'])
+		// Minimum message length check for post only
+		if ($mode !== 'sig')
+		{
+			if (!$message_length || $message_length < (int) $config['min_post_chars'])
 			{
-				$this->warn_msg[] = (!$msg_len) ? $user->lang['TOO_FEW_CHARS'] : sprintf($user->lang['TOO_MANY_CHARS_' . strtoupper($mode)], $msg_len, $config['max_' . $mode . '_chars']);
+				$this->warn_msg[] = (!$message_length) ? $user->lang['TOO_FEW_CHARS'] : sprintf($user->lang['TOO_FEW_CHARS_LIMIT'], $message_length, (int) $config['min_post_chars']);
 				return (!$update_this_message) ? $return_message : $this->warn_msg;
 			}
 		}
-- 
cgit v1.2.1


From bd516916b8c627917e9be17cc81e37d56421eb66 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 7 Jul 2009 11:41:07 +0000
Subject: Color bbcode now supports three-digit hex notation. (Bug #39965 -
 Patch by leviatan21)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9722 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 4cdc8b933e..7370c2057c 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -118,7 +118,7 @@ class bbcode_firstpass extends bbcode
 			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
 			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#iUe' => "\$this->bbcode_img('\$1')")),
 			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")),
-			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")),
+			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")),
 			'u'				=> array('bbcode_id' => 7,	'regexp' => array('#\[u\](.*?)\[/u\]#ise' => "\$this->bbcode_underline('\$1')")),
 			'list'			=> array('bbcode_id' => 9,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#ise' => "\$this->bbcode_parse_list('\$0')")),
 			'email'			=> array('bbcode_id' => 10,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#ise' => "\$this->validate_email('\$1', '\$2')")),
-- 
cgit v1.2.1


From 780854818b22ccdf36fe50e4e4bf5e68027c9e2b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 24 Jul 2009 09:01:29 +0000
Subject: Fix bug #48265 - Correctly set attachment flag for topics, posts and
 pms after deleting attachments - Patch by WorldWar and nickvergessen

Authorised by: AcydBurn


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9843 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 15 ++++++++++++---
 1 file changed, 12 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 7370c2057c..7a2d35dbc6 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1334,7 +1334,7 @@ class parse_message extends bbcode_firstpass
 	/**
 	* Parse Attachments
 	*/
-	function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false)
+	function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false, $post_msg_id = 0, $topic_id = 0)
 	{
 		global $config, $auth, $user, $phpbb_root_path, $phpEx, $db;
 
@@ -1487,16 +1487,25 @@ class parse_message extends bbcode_firstpass
 							'filesize'			=> $filedata['filesize'],
 							'filetime'			=> $filedata['filetime'],
 							'thumbnail'			=> $filedata['thumbnail'],
-							'is_orphan'			=> 1,
+							'is_orphan'			=> ($post_msg_id) ? 0 : 1,
 							'in_message'		=> ($is_message) ? 1 : 0,
 							'poster_id'			=> $user->data['user_id'],
 						);
 
+						if ($post_msg_id)
+						{
+							$sql_ary['post_msg_id'] = $post_msg_id;
+							if ($topic_id)
+							{
+								$sql_ary['topic_id'] = $topic_id;
+							}
+						}
+
 						$db->sql_query('INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
 
 						$new_entry = array(
 							'attach_id'		=> $db->sql_nextid(),
-							'is_orphan'		=> 1,
+							'is_orphan'		=> ($post_msg_id) ? 0 : 1,
 							'real_filename'	=> $filedata['real_filename'],
 							'attach_comment'=> $this->filename_data['filecomment'],
 						);
-- 
cgit v1.2.1


From e1db7e08dc560faf176995972d2bc7dbd97627fe Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 30 Jul 2009 13:39:38 +0000
Subject: Fix Bug #47295 - Min/max characters per posts also affects polls
 option

Authorised by: AcydBurn



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9892 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

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

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 7a2d35dbc6..2d7dfb6004 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1062,10 +1062,21 @@ class parse_message extends bbcode_firstpass
 	{
 		global $config, $db, $user;
 
-		$mode = ($mode != 'post') ? 'sig' : 'post';
-
 		$this->mode = $mode;
 
+		if (!isset($config['max_' . $mode . '_chars']))
+		{
+			$config['max_' . $mode . '_chars'] = 0;
+		}
+		if (!isset($config['max_' . $mode . '_smilies']))
+		{
+			$config['max_' . $mode . '_smilies'] = 0;
+		}
+		if (!isset($config['max_' . $mode . '_urls']))
+		{
+			$config['max_' . $mode . '_urls'] = 0;
+		}
+
 		$this->allow_img_bbcode = $allow_img_bbcode;
 		$this->allow_flash_bbcode = $allow_flash_bbcode;
 		$this->allow_quote_bbcode = $allow_quote_bbcode;
@@ -1100,7 +1111,7 @@ class parse_message extends bbcode_firstpass
 		}
 
 		// Minimum message length check for post only
-		if ($mode !== 'sig')
+		if ($mode === 'post')
 		{
 			if (!$message_length || $message_length < (int) $config['min_post_chars'])
 			{
@@ -1153,7 +1164,7 @@ class parse_message extends bbcode_firstpass
 
 		// 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 !== 'sig' && utf8_clean_string($this->message) === '')
+		if ($mode === 'post' && utf8_clean_string($this->message) === '')
 		{
 			$this->warn_msg[] = $user->lang['TOO_FEW_CHARS'];
 			return (!$update_this_message) ? $return_message : $this->warn_msg;
@@ -1629,7 +1640,7 @@ class parse_message extends bbcode_firstpass
 		$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_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');
 
 		$bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield));
 		$this->message = $tmp_message;
@@ -1652,7 +1663,7 @@ class parse_message extends bbcode_firstpass
 			{
 				$this->warn_msg[] = $user->lang['POLL_TITLE_TOO_LONG'];
 			}
-			$poll['poll_title'] = $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_title'] = $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');
 			if (strlen($poll['poll_title']) > 255)
 			{
 				$this->warn_msg[] = $user->lang['POLL_TITLE_COMP_TOO_LONG'];
-- 
cgit v1.2.1


From d78703d73bd40a9d0d553cfb6d39bf5347f84927 Mon Sep 17 00:00:00 2001
From: Ruslan Uzdenov <rxu@mail.ru>
Date: Sat, 1 Aug 2009 16:28:02 +0000
Subject: Fix bug #1309 - Multiline [url] not Converted Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9910 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 2d7dfb6004..6e626eeee8 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -115,7 +115,7 @@ class bbcode_firstpass extends bbcode
 			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#ise' => "\$this->bbcode_attachment('\$1', '\$2')")),
 			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#ise' => "\$this->bbcode_strong('\$1')")),
 			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#ise' => "\$this->bbcode_italic('\$1')")),
-			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
+			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\]((?s).*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
 			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#iUe' => "\$this->bbcode_img('\$1')")),
 			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")),
 			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")),
-- 
cgit v1.2.1


From c748d865b2665147453844980b8db3c98244dbf6 Mon Sep 17 00:00:00 2001
From: "Marek A. R" <aptx@phpbb.com>
Date: Sun, 2 Aug 2009 16:44:45 +0000
Subject: #48965

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9914 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 6e626eeee8..72c101f7a3 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1317,7 +1317,7 @@ class parse_message extends bbcode_firstpass
 				}
 
 				// (assertion)
-				$match[] = '(?<=^|[\n .])' . preg_quote($row['code'], '#') . '(?![^<>]*>)';
+				$match[] = preg_quote($row['code'], '#');
 				$replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILIES_PATH}/' . $row['smiley_url'] . '" alt="' . $row['code'] . '" title="' . $row['emotion'] . '" /><!-- s' . $row['code'] . ' -->';
 			}
 			$db->sql_freeresult($result);
@@ -1327,7 +1327,7 @@ class parse_message extends bbcode_firstpass
 		{
 			if ($max_smilies)
 			{
-				$num_matches = preg_match_all('#' . implode('|', $match) . '#', $this->message, $matches);
+				$num_matches = preg_match_all('#(?<=^|[\n .])(?:' . implode('|', $match) . ')(?![^<>]*>)#', $this->message, $matches);
 				unset($matches);
 
 				if ($num_matches !== false && $num_matches > $max_smilies)
@@ -1338,7 +1338,7 @@ class parse_message extends bbcode_firstpass
 			}
 
 			// Make sure the delimiter # is added in front and at the end of every element within $match
-			$this->message = trim(preg_replace(explode(chr(0), '#' . implode('#' . chr(0) . '#', $match) . '#'), $replace, $this->message));
+			$this->message = trim(preg_replace(explode(chr(0), '#(?<=^|[\n .])' . implode('(?![^<>]*>)#' . chr(0) . '#(?<=^|[\n .])', $match) . '(?![^<>]*>)#'), $replace, $this->message));
 		}
 	}
 
-- 
cgit v1.2.1


From cb88671638b016b4454fef121cbe623ed3490638 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 13 Sep 2009 15:04:21 +0000
Subject: fix #51235 - regression from 9843 for #48265

Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10142 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 72c101f7a3..be753dd5ea 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1510,6 +1510,8 @@ class parse_message extends bbcode_firstpass
 							{
 								$sql_ary['topic_id'] = $topic_id;
 							}
+							set_config_count('upload_dir_size', $filedata['filesize'], true);
+							set_config_count('num_files', 1, true);
 						}
 
 						$db->sql_query('INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
-- 
cgit v1.2.1


From de25ce87243aaa9d9310d36f189fc051975dc494 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 25 Sep 2009 08:41:47 +0000
Subject: Fix Bug #51835 - editing posts with attachments - regression from
 r9843 introduced in #48265

Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10186 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

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

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index be753dd5ea..3df582d640 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1345,7 +1345,7 @@ class parse_message extends bbcode_firstpass
 	/**
 	* Parse Attachments
 	*/
-	function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false, $post_msg_id = 0, $topic_id = 0)
+	function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false)
 	{
 		global $config, $auth, $user, $phpbb_root_path, $phpEx, $db;
 
@@ -1498,27 +1498,16 @@ class parse_message extends bbcode_firstpass
 							'filesize'			=> $filedata['filesize'],
 							'filetime'			=> $filedata['filetime'],
 							'thumbnail'			=> $filedata['thumbnail'],
-							'is_orphan'			=> ($post_msg_id) ? 0 : 1,
+							'is_orphan'			=> 1,
 							'in_message'		=> ($is_message) ? 1 : 0,
 							'poster_id'			=> $user->data['user_id'],
 						);
 
-						if ($post_msg_id)
-						{
-							$sql_ary['post_msg_id'] = $post_msg_id;
-							if ($topic_id)
-							{
-								$sql_ary['topic_id'] = $topic_id;
-							}
-							set_config_count('upload_dir_size', $filedata['filesize'], true);
-							set_config_count('num_files', 1, true);
-						}
-
 						$db->sql_query('INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
 
 						$new_entry = array(
 							'attach_id'		=> $db->sql_nextid(),
-							'is_orphan'		=> ($post_msg_id) ? 0 : 1,
+							'is_orphan'		=> 1,
 							'real_filename'	=> $filedata['real_filename'],
 							'attach_comment'=> $this->filename_data['filecomment'],
 						);
-- 
cgit v1.2.1


From 4e8e766ed654f96799153cce727a650907c66277 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 24 Oct 2009 13:04:26 +0000
Subject: revert r9910 - ticket #1309 Reason for revert:
 http://www.phpbb.com/bugs/phpbb3/ticket.php?ticket_id=1309&start=8#post193395

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10229 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 3df582d640..4961979d73 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -115,7 +115,7 @@ class bbcode_firstpass extends bbcode
 			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#ise' => "\$this->bbcode_attachment('\$1', '\$2')")),
 			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#ise' => "\$this->bbcode_strong('\$1')")),
 			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#ise' => "\$this->bbcode_italic('\$1')")),
-			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\]((?s).*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
+			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
 			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#iUe' => "\$this->bbcode_img('\$1')")),
 			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")),
 			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")),
-- 
cgit v1.2.1


From b5c4dc32848e64842077d1a35d5649a38ef194b6 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 1 Nov 2009 15:33:44 +0000
Subject: check for additional empty config variables...

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10249 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/message_parser.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

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

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 4961979d73..8979511d9a 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1064,17 +1064,12 @@ class parse_message extends bbcode_firstpass
 
 		$this->mode = $mode;
 
-		if (!isset($config['max_' . $mode . '_chars']))
+		foreach (array('chars', 'smilies', 'urls', 'font_size', 'img_height', 'img_width') as $key)
 		{
-			$config['max_' . $mode . '_chars'] = 0;
-		}
-		if (!isset($config['max_' . $mode . '_smilies']))
-		{
-			$config['max_' . $mode . '_smilies'] = 0;
-		}
-		if (!isset($config['max_' . $mode . '_urls']))
-		{
-			$config['max_' . $mode . '_urls'] = 0;
+			if (!isset($config['max_' . $mode . '_' . $key]))
+			{
+				$config['max_' . $mode . '_' . $key] = 0;
+			}
 		}
 
 		$this->allow_img_bbcode = $allow_img_bbcode;
-- 
cgit v1.2.1


From 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 11 Feb 2010 00:02:51 +0000
Subject: Support for Microsoft's Native SQL Server Driver for PHP - Patch by
 Chris Pucci at Microsoft [Bug #57055]

If you are using SQL Server, please try to test this new dbal so we can safely include it in 3.0.8. If you
want to try it on a current phpBB version you can apply the latest version of the patch to your board which
you can find attached to the bug tracker ticket (look in the comments for the latest version, the one in the
ticket itself is outdated): http://www.phpbb.com/bugs/phpbb3/ticket.php?ticket_id=57055



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10489 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 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 8979511d9a..50aad8588a 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1284,6 +1284,7 @@ class parse_message extends bbcode_firstpass
 			{
 				case 'mssql':
 				case 'mssql_odbc':
+				case 'mssqlnative':
 					$sql = 'SELECT *
 						FROM ' . SMILIES_TABLE . '
 						ORDER BY LEN(code) DESC';
-- 
cgit v1.2.1