From b745d5224f44e447fc5ed06d1804e10b58e7afd2 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 15 Feb 2004 14:03:19 +0000
Subject: removed message type from message parser assign message if specified
 parse/decode html if enabled validate url

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

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

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 2ac76064fe..9a0aa1bd48 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -533,6 +533,7 @@ function decode_text(&$message, $bbcode_uid)
 		":o:$bbcode_uid",
 		":$bbcode_uid"
 	);
+
 	$replace = array(
 		"\n",
 		'',
@@ -543,6 +544,19 @@ function decode_text(&$message, $bbcode_uid)
 
 	$message = ($bbcode_uid) ? str_replace($search, $replace, $message) : str_replace('<br />', "\n", $message);
 
+	// HTML
+	if ($config['allow_html_tags'])
+	{
+		// If $html is true then "allowed_tags" are converted back from entity
+		// form, others remain
+		$allowed_tags = split(',', $config['allow_html_tags']);
+			
+		if (sizeof($allowed_tags))
+		{
+			$message = preg_replace('#\<(\/?)(' . str_replace('*', '.*?', implode('|', $allowed_tags)) . ')\>#is', '&lt;$1$2&gt;', $message);
+		}
+	}
+
 	$match = array(
 		'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
 		'#<!\-\- m \-\-><a href="(.*?)" target="_blank">.*?</a><!\-\- m \-\->#',
@@ -551,6 +565,7 @@ function decode_text(&$message, $bbcode_uid)
 		'#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
 		'#<.*?>#s'
 	);
+	
 	$replace = array(
 		'\1',
 		'\1',
@@ -559,6 +574,7 @@ function decode_text(&$message, $bbcode_uid)
 		'\1',
 		''
 	);
+	
 	$message = preg_replace($match, $replace, $message);
 
 	return;
-- 
cgit v1.2.1