mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 05:25:01 +02:00
Code Issues Releases Wiki Activity

Code added to get around double htmlspecialchar stuff + some of my stuff looks to allow HTML even when off, removed

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@829 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-08-10 00:23:39 +00:00
parent 88570ae919
commit 89dddd9049
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/post.php
View File

@ -35,7 +35,11 @@ function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid
//
$message = trim($message);
if($html_on)
if( !$html_on )
{
$message = htmlspecialchars($message);
}
/* else if($html_on)
{
$start = -1;
$end = 0;
@ -73,7 +77,7 @@ function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid
}
}
}
*/
if($bbcode_on)
{
$message = bbencode_first_pass($message, $bbcode_uid);

15
phpBB/viewtopic.php
View File

@ -480,31 +480,26 @@ for($i = 0; $i < $total_posts; $i++)
$user_sig = htmlspecialchars($user_sig);
}
$message = htmlspecialchars($message);
// $message = str_replace('&amp;', '&', $message);
}
if($board_config['allow_bbcode'])
if($board_config['allow_bbcode'] && $bbcode_uid != "")
{
if($user_sig != "")
{
//
// Move this to profile? Well, first pass
//
$sig_uid = make_bbcode_uid();
$user_sig = bbencode_first_pass($user_sig, $sig_uid);
$user_sig = bbencode_second_pass($user_sig, $sig_uid);
$user_sig = str_replace("\n", "<br />", $user_sig);
}
if($postrow[$i]['allow_bbcode'])
{
$message = bbencode_second_pass($message, $bbcode_uid);
}
$message = bbencode_second_pass($message, $bbcode_uid);
}
$message = make_clickable($message);
$message = str_replace("\n", "<br />", $message);
$message = ($user_sig != "") ? ereg_replace("\[addsig]$", "<br /><br />_________________<br />" . $user_sig, $message) : ereg_replace("\[addsig]$", "", $message);
$message = str_replace("\n", "<br />", $message);
if($board_config['allow_smilies'] && $postrow[$i]['enable_smilies'])
{