mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-06 15:45:34 +02:00
try to prevent re-parsing of parsed bbcode content
git-svn-id: file:///svn/phpbb/trunk@6043 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
parent
4613de6f87
commit
c102bec023
@ -352,6 +352,30 @@ if (!function_exists('str_split'))
|
||||
}
|
||||
}
|
||||
|
||||
if (!function_exists('stripos'))
|
||||
{
|
||||
/**
|
||||
* A wrapper for the PHP5 function stripos
|
||||
* Find position of first occurrence of a case-insensitive string
|
||||
*
|
||||
* @param string $haystack is the string to search in
|
||||
* @param string needle is the string to search for
|
||||
*
|
||||
* @return Returns the numeric position of the first occurrence of needle in the haystack string. Unlike strpos(), stripos() is case-insensitive.
|
||||
* Note that the needle may be a string of one or more characters.
|
||||
* If needle is not found, stripos() will return boolean FALSE.
|
||||
*/
|
||||
function stripos($haystack, $needle)
|
||||
{
|
||||
if (preg_match('#' . preg_quote($needle, '#') . '#i', $haystack, $m))
|
||||
{
|
||||
return strpos($haystack, $m[0]);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// functions used for building option fields
|
||||
|
||||
/**
|
||||
|
||||
@ -16,20 +16,6 @@ if (!defined('IN_PHPBB'))
|
||||
exit;
|
||||
}
|
||||
|
||||
// case-insensitive strpos() - needed for some functions
|
||||
if (!function_exists('stripos'))
|
||||
{
|
||||
function stripos($haystack, $needle)
|
||||
{
|
||||
if (preg_match('#' . preg_quote($needle, '#') . '#i', $haystack, $m))
|
||||
{
|
||||
return strpos($haystack, $m[0]);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (!class_exists('bbcode'))
|
||||
{
|
||||
include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
|
||||
@ -46,7 +32,9 @@ class bbcode_firstpass extends bbcode
|
||||
var $warn_msg = array();
|
||||
var $parsed_items = array();
|
||||
|
||||
// Parse BBCode
|
||||
/**
|
||||
* Parse BBCode
|
||||
*/
|
||||
function parse_bbcode()
|
||||
{
|
||||
if (!$this->bbcodes)
|
||||
@ -90,6 +78,9 @@ class bbcode_firstpass extends bbcode
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Init bbcode data for later parsing
|
||||
*/
|
||||
function bbcode_init()
|
||||
{
|
||||
static $rowset;
|
||||
@ -126,7 +117,7 @@ class bbcode_firstpass extends bbcode
|
||||
global $db;
|
||||
$rowset = array();
|
||||
|
||||
$sql = 'SELECT bbcode_id, bbcode_tag, first_pass_match, first_pass_replace
|
||||
$sql = 'SELECT *
|
||||
FROM ' . BBCODES_TABLE;
|
||||
|
||||
$result = $db->sql_query($sql);
|
||||
@ -140,17 +131,20 @@ class bbcode_firstpass extends bbcode
|
||||
foreach ($rowset as $row)
|
||||
{
|
||||
$this->bbcodes[$row['bbcode_tag']] = array(
|
||||
'bbcode_id' => intval($row['bbcode_id']),
|
||||
'bbcode_id' => (int) $row['bbcode_id'],
|
||||
'regexp' => array($row['first_pass_match'] => str_replace('$uid', $this->bbcode_uid, $row['first_pass_replace']))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Making some pre-checks for bbcodes as well as increasing the number of parsed items
|
||||
*/
|
||||
function check_bbcode($bbcode, &$in)
|
||||
{
|
||||
// when using the /e modifier, preg_replace slashes double-quotes but does not
|
||||
// seem to slash anything else
|
||||
$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
|
||||
$in = str_replace("\r\n", "\n", str_replace('\"', '"', $in));
|
||||
|
||||
if (!$in)
|
||||
{
|
||||
@ -162,6 +156,20 @@ class bbcode_firstpass extends bbcode
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Transform some characters in valid bbcodes
|
||||
*/
|
||||
function bbcode_specialchars($text)
|
||||
{
|
||||
$str_from = array('<', '>', '[', ']', '.', ':');
|
||||
$str_to = array('<', '>', '[', ']', '.', ':');
|
||||
|
||||
return str_replace($str_from, $str_to, $text);
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse size bbcode
|
||||
*/
|
||||
function bbcode_size($stx, $in)
|
||||
{
|
||||
global $user, $config;
|
||||
@ -179,6 +187,9 @@ class bbcode_firstpass extends bbcode
|
||||
return '[size=' . $stx . ':' . $this->bbcode_uid . ']' . $in . '[/size:' . $this->bbcode_uid . ']';
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse color bbcode
|
||||
*/
|
||||
function bbcode_color($stx, $in)
|
||||
{
|
||||
if (!$this->check_bbcode('color', $in))
|
||||
@ -189,6 +200,9 @@ class bbcode_firstpass extends bbcode
|
||||
return '[color=' . $stx . ':' . $this->bbcode_uid . ']' . $in . '[/color:' . $this->bbcode_uid . ']';
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse u bbcode
|
||||
*/
|
||||
function bbcode_underline($in)
|
||||
{
|
||||
if (!$this->check_bbcode('u', $in))
|
||||
@ -199,6 +213,9 @@ class bbcode_firstpass extends bbcode
|
||||
return '[u:' . $this->bbcode_uid . ']' . $in . '[/u:' . $this->bbcode_uid . ']';
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse b bbcode
|
||||
*/
|
||||
function bbcode_strong($in)
|
||||
{
|
||||
if (!$this->check_bbcode('b', $in))
|
||||
@ -209,6 +226,9 @@ class bbcode_firstpass extends bbcode
|
||||
return '[b:' . $this->bbcode_uid . ']' . $in . '[/b:' . $this->bbcode_uid . ']';
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse i bbcode
|
||||
*/
|
||||
function bbcode_italic($in)
|
||||
{
|
||||
if (!$this->check_bbcode('i', $in))
|
||||
@ -219,6 +239,9 @@ class bbcode_firstpass extends bbcode
|
||||
return '[i:' . $this->bbcode_uid . ']' . $in . '[/i:' . $this->bbcode_uid . ']';
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse img bbcode
|
||||
*/
|
||||
function bbcode_img($in)
|
||||
{
|
||||
global $user, $config;
|
||||
@ -241,9 +264,12 @@ class bbcode_firstpass extends bbcode
|
||||
}
|
||||
}
|
||||
|
||||
return '[img:' . $this->bbcode_uid . ']' . $in . '[/img:' . $this->bbcode_uid . ']';
|
||||
return '[img:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars(trim($in)) . '[/img:' . $this->bbcode_uid . ']';
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse flash bbcode
|
||||
*/
|
||||
function bbcode_flash($width, $height, $in)
|
||||
{
|
||||
if (!$this->check_bbcode('flash', $in))
|
||||
@ -251,6 +277,8 @@ class bbcode_firstpass extends bbcode
|
||||
return '';
|
||||
}
|
||||
|
||||
global $config;
|
||||
|
||||
// Apply the same size checks on flash files as on images
|
||||
if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width'])
|
||||
{
|
||||
@ -265,10 +293,12 @@ class bbcode_firstpass extends bbcode
|
||||
}
|
||||
}
|
||||
|
||||
return '[flash=' . $width . ',' . $height . ':' . $this->bbcode_uid . ']' . $in . '[/flash:' . $this->bbcode_uid . ']';
|
||||
return '[flash=' . $width . ',' . $height . ':' . $this->bbcode_uid . ']' . $this->bbcode_specialchars(trim($in)) . '[/flash:' . $this->bbcode_uid . ']';
|
||||
}
|
||||
|
||||
// Hardcode inline attachments [ia]
|
||||
/**
|
||||
* Parse inline attachments [ia]
|
||||
*/
|
||||
function bbcode_attachment($stx, $in)
|
||||
{
|
||||
if (!$this->check_bbcode('attachment', $in))
|
||||
@ -276,10 +306,13 @@ class bbcode_firstpass extends bbcode
|
||||
return '';
|
||||
}
|
||||
|
||||
return '[attachment=' . $stx . ':' . $this->bbcode_uid . ']<!-- ia' . $stx . ' -->' . $in . '<!-- ia' . $stx . ' -->[/attachment:' . $this->bbcode_uid . ']';
|
||||
return '[attachment=' . $stx . ':' . $this->bbcode_uid . ']<!-- ia' . $stx . ' -->' . trim($in) . '<!-- ia' . $stx . ' -->[/attachment:' . $this->bbcode_uid . ']';
|
||||
}
|
||||
|
||||
// Expects the argument to start right after the opening [code] tag and to end with [/code]
|
||||
/**
|
||||
* Parse code bbcode
|
||||
* Expects the argument to start right after the opening [code] tag and to end with [/code]
|
||||
*/
|
||||
function bbcode_code($stx, $in)
|
||||
{
|
||||
if (!$this->check_bbcode('code', $in))
|
||||
@ -287,6 +320,8 @@ class bbcode_firstpass extends bbcode
|
||||
return '';
|
||||
}
|
||||
|
||||
// $in = trim($in);
|
||||
|
||||
// We remove the hardcoded elements from the code block here because it is not used in code blocks
|
||||
// Having it here saves us one preg_replace per message containing [code] blocks
|
||||
// Additionally, magic url parsing should go after parsing bbcodes, but for safety those are stripped out too...
|
||||
@ -376,14 +411,15 @@ class bbcode_firstpass extends bbcode
|
||||
$code = preg_replace('#^<span class="[a-z]+"><span class="([a-z]+)">(.*)</span></span>#s', '<span class="$1">$2</span>', $code);
|
||||
$code = preg_replace('#(?:[\n\r\s\t]| )*</span>$#', '</span>', $code);
|
||||
|
||||
$out .= "[code=$stx:" . $this->bbcode_uid . ']' . trim($code) . '[/code:' . $this->bbcode_uid . ']';
|
||||
$out .= "[code=$stx:" . $this->bbcode_uid . ']' . $code . '[/code:' . $this->bbcode_uid . ']';
|
||||
break;
|
||||
|
||||
default:
|
||||
$str_from = array('<', '>', '[', ']', '.', ':');
|
||||
$str_to = array('<', '>', '[', ']', '.', ':');
|
||||
|
||||
$out .= '[code:' . $this->bbcode_uid . ']' . str_replace($str_from, $str_to, $code) . '[/code:' . $this->bbcode_uid . ']';
|
||||
$out .= '[code:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($code) . '[/code:' . $this->bbcode_uid . ']';
|
||||
break;
|
||||
}
|
||||
|
||||
if (preg_match('#(.*?)\[code(?:=([a-z]+))?\](.+)#is', $in, $m))
|
||||
@ -398,7 +434,10 @@ class bbcode_firstpass extends bbcode
|
||||
return $out;
|
||||
}
|
||||
|
||||
// Expects the argument to start with a tag
|
||||
/**
|
||||
* Parse list bbcode
|
||||
* Expects the argument to start with a tag
|
||||
*/
|
||||
function bbcode_parse_list($in)
|
||||
{
|
||||
if (!$this->check_bbcode('list', $in))
|
||||
@ -490,7 +529,10 @@ class bbcode_firstpass extends bbcode
|
||||
return $out;
|
||||
}
|
||||
|
||||
// Expects the argument to start with a tag
|
||||
/**
|
||||
* Parse quote bbcode
|
||||
* Expects the argument to start with a tag
|
||||
*/
|
||||
function bbcode_quote($in)
|
||||
{
|
||||
global $config, $user;
|
||||
@ -586,6 +628,7 @@ class bbcode_firstpass extends bbcode
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($error)
|
||||
{
|
||||
$username = str_replace('[', '[', str_replace(']', ']', $m[1]));
|
||||
@ -635,6 +678,9 @@ class bbcode_firstpass extends bbcode
|
||||
return $out;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate email
|
||||
*/
|
||||
function validate_email($var1, $var2)
|
||||
{
|
||||
$var1 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var1)));
|
||||
@ -659,16 +705,19 @@ class bbcode_firstpass extends bbcode
|
||||
|
||||
if ($var1)
|
||||
{
|
||||
$retval = '[email=' . $email . ':' . $this->bbcode_uid . ']' . $txt . '[/email:' . $this->bbcode_uid . ']';
|
||||
$retval = '[email=' . $this->bbcode_specialchars($email) . ':' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($txt) . '[/email:' . $this->bbcode_uid . ']';
|
||||
}
|
||||
else
|
||||
{
|
||||
$retval = '[email:' . $this->bbcode_uid . ']' . $email . '[/email:' . $this->bbcode_uid . ']';
|
||||
$retval = '[email:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($email) . '[/email:' . $this->bbcode_uid . ']';
|
||||
}
|
||||
|
||||
return $retval;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate url
|
||||
*/
|
||||
function validate_url($var1, $var2)
|
||||
{
|
||||
global $config;
|
||||
@ -701,7 +750,7 @@ class bbcode_firstpass extends bbcode
|
||||
$url = 'http://' . $url;
|
||||
}
|
||||
|
||||
return ($var1) ? '[url=' . str_replace(array(']', '['), array(']', '['), $url) . ':' . $this->bbcode_uid . ']' . $var2 . '[/url:' . $this->bbcode_uid . ']' : '[url:' . $this->bbcode_uid . ']' . $url . '[/url:' . $this->bbcode_uid . ']';
|
||||
return ($var1) ? '[url=' . $this->bbcode_specialchars($url) . ':' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($var2) . '[/url:' . $this->bbcode_uid . ']' : '[url:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($url) . '[/url:' . $this->bbcode_uid . ']';
|
||||
}
|
||||
|
||||
return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]';
|
||||
@ -727,7 +776,9 @@ class parse_message extends bbcode_firstpass
|
||||
|
||||
var $mode;
|
||||
|
||||
// Init - give message here or manually
|
||||
/**
|
||||
* Init - give message here or manually
|
||||
*/
|
||||
function parse_message($message = '')
|
||||
{
|
||||
// Init BBCode UID
|
||||
@ -739,7 +790,9 @@ class parse_message extends bbcode_firstpass
|
||||
}
|
||||
}
|
||||
|
||||
// Parse Message : public
|
||||
/**
|
||||
* Parse Message : public
|
||||
*/
|
||||
function parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $update_this_message = true, $mode = 'post')
|
||||
{
|
||||
global $config, $db, $user;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user