From 2fa463cdeb5d8e4f2373aa834154ca27ea21c97a Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 16 Sep 2004 18:33:22 +0000
Subject: - more updates, mostly bugfixes to the bbcode parser - changed
 current_user in sessions (please review) - give more flexibility to style
 authors in regard to the pagination elements - profile fields updates
 (included a sample constuct into viewtopic_body.html - have to be documented
 extensivly) - code optimizations (use of strpos, sizeof, loops not iterating
 functions on every call, memory savings...) - and last but not least ---
 hopefully not introduced more bugs than healthy (*cough*)

git-svn-id: file:///svn/phpbb/trunk@4984 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/bbcode.php | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

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

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index f9b8fcbce3..4e56a2be77 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -257,10 +257,12 @@ class bbcode
 					}
 				break;
 				case 12:
-					$this->bbcode_cache[$bbcode_id] = array('preg' => array(
-						'#\[attachment=([0-9]+):$uid\]#'	=>	$this->bbcode_tpl('inline_attachment_open', $bbcode_id),
-						'#\[\/attachment:$uid\]#'	=>	$this->bbcode_tpl('inline_attachment_close', $bbcode_id)
-					));
+					$this->bbcode_cache[$bbcode_id] = array(
+						'str'	=> array(
+							'[/attachment:$uid]'	=> $this->bbcode_tpl('inline_attachment_close', $bbcode_id)),
+						'preg'	=> array(
+							'#\[attachment=([0-9]+):$uid\]#'	=> $this->bbcode_tpl('inline_attachment_open', $bbcode_id))
+					);
 					break;
 				default:
 					if (isset($rowset[$bbcode_id]))
@@ -461,23 +463,22 @@ class bbcode
 		switch ($type)
 		{
 			case 'php':
+				// Not the english way, but valid because of hardcoded syntax highlighting
+				if (strpos($code, '<span class="syntaxdefault"><br /></span>') === 0)
+				{
+					$code = substr($code, 41);
+				}
+
 			default:
 				$code = str_replace("\t", '&nbsp; &nbsp;', $code);
 				$code = str_replace('  ', '&nbsp; ', $code);
 				$code = str_replace('  ', ' &nbsp;', $code);
 
-				$match = array(
-					'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
-					'#<!\-\- m \-\-><a href="(.*?)" target="_blank">.*?</a><!\-\- m \-\->#',
-					'#<!\-\- w \-\-><a href="http:\/\/(.*?)" target="_blank">.*?</a><!\-\- w \-\->#',
-					'#<!\-\- l \-\-><a href="(.*?)" target="_blank">.*?</a><!\-\- l \-\->#',
-					'#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
-					'#^[\n]#'
-				);
-	
-				$replace = array('\1', '\1', '\1', '\1', '\1', '');
-				
-				$code = preg_replace($match, $replace, $code);
+				// remove newline at the beginning
+				if ($code{0} == "\n")
+				{
+					$code = substr($code, 1);
+				}
 		}
 
 		$code = $this->bbcode_tpl('code_open') . $code . $this->bbcode_tpl('code_close');
-- 
cgit v1.2.1