Vergleich inc/class_parser.php - 1.8.8 - 1.8.16

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 146	Zeile 146
// This code is reserved and could break codes $message = str_replace("<mybb-code>\n", "<mybb_code>\n", $message);	// This code is reserved and could break codes $message = str_replace("<mybb-code>\n", "<mybb_code>\n", $message);
preg_match_all("#\[(code\|php)\](.?)\[/\\1\](\r\n?\|\n?)#si", $message, $code_matches, PREG_SET_ORDER); $message = preg_replace("#\[(code\|php)\](.?)\[/\\1\](\r\n?\|\n?)#si", "<mybb-code>\n", $message);	preg_match_all("#\[(code\|php)\](.?)(\[/\\1\])+(\r\n?\|\n?)#si", $message, $code_matches, PREG_SET_ORDER); foreach($code_matches as $point => $part) { if(isset($part[3])) { $part[1] = "[".$part[1]."]"; $code_matches[$point][2] = substr_replace($part[0], "", strrpos($part[0], $part[3]), strlen($part[3])); $code_matches[$point][2] = substr_replace($code_matches[$point][2], "", strpos($code_matches[$point][2], $part[1]), strlen($part[1])); } } $message = preg_replace("#\[(code\|php)\](.?)(\[/\\1\])+(\r\n?\|\n?)#si", "<mybb-code>\n", $message);
} if(empty($this->options['allow_html'])) { $message = $this->parse_html($message); $message = str_replace("<mybb-code>\n", "<mybb-code>\n", $message);	} if(empty($this->options['allow_html'])) { $message = $this->parse_html($message); $message = str_replace("<mybb-code>\n", "<mybb-code>\n", $message);
}	}
else { // Replace base, meta,script and style tags in our post - these are > dangerous < $message = preg_replace('#<(/?)(base\|meta\|script\|style)([^>]*)>#i', '<$1$2$3>', $message); $message = $this->fix_javascript($message);	else { // Replace base, meta,script and style tags in our post - these are > dangerous < $message = preg_replace('#<(/?)(base\|meta\|script\|style)([^>]*)>#i', '<$1$2$3>', $message); $message = $this->fix_javascript($message);

$find = array("<br />\n", "<br>\n"); $replace = array("\n", "\n"); $message = str_replace($find, $replace, $message); }	$find = array("<br />\n", "<br>\n"); $replace = array("\n", "\n"); $message = str_replace($find, $replace, $message); }
	$message = $plugins->run_hooks("parse_message_htmlsanitized", $message);
// Replace "me" code and slaps if we have a username if(!empty($this->options['me_username']) && $mybb->settings['allowmemycode'] == 1)	// Replace "me" code and slaps if we have a username if(!empty($this->options['me_username']) && $mybb->settings['allowmemycode'] == 1)
Zeile 174	Zeile 185
$message = preg_replace('#(>\|^\|\r\|\n)/me ([^\r\n<])#i', "\\1<span style=\"color: red;\" class=\"mycode_me\"> {$this->options['me_username']} \\2</span>", $message); $message = preg_replace('#(>\|^\|\r\|\n)/slap ([^\r\n<])#i', "\\1<span style=\"color: red;\" class=\"mycode_slap\"> {$this->options['me_username']} {$lang->slaps} \\2 {$lang->with_trout}</span>", $message); }	$message = preg_replace('#(>\|^\|\r\|\n)/me ([^\r\n<])#i', "\\1<span style=\"color: red;\" class=\"mycode_me\"> {$this->options['me_username']} \\2</span>", $message); $message = preg_replace('#(>\|^\|\r\|\n)/slap ([^\r\n<])#i', "\\1<span style=\"color: red;\" class=\"mycode_slap\"> {$this->options['me_username']} {$lang->slaps} \\2 {$lang->with_trout}</span>", $message); }
	$message = $plugins->run_hooks("parse_message_me_mycode", $message);
// If we can, parse smilies if(!empty($this->options['allow_smilies']))	// If we can, parse smilies if(!empty($this->options['allow_smilies']))
{	{
$message = $this->parse_smilies($message, $this->options['allow_html']);	$message = $this->parse_smilies($message, $this->options['allow_html']);
}	}
// Replace MyCode if requested. if(!empty($this->options['allow_mycode']))	// Replace MyCode if requested. if(!empty($this->options['allow_mycode']))
{	{
$message = $this->parse_mycode($message);	$message = $this->parse_mycode($message);
	} // Filter url codes, if disabled. if($mybb->settings['allowlinkmycode'] != 1) { $message = preg_replace("#\[(\/)?url{1}(.*?)\]#i", "", $message);
} // Parse Highlights	} // Parse Highlights
Zeile 220	Zeile 239
} if(!isset($this->options['nl2br']) \|\| $this->options['nl2br'] != 0)	} if(!isset($this->options['nl2br']) \|\| $this->options['nl2br'] != 0)
{	{
$message = nl2br($message); // Fix up new lines and block level elements $message = preg_replace("#(</?(?:html\|head\|body\|div\|p\|form\|table\|thead\|tbody\|tfoot\|tr\|td\|th\|ul\|ol\|li\|div\|p\|blockquote\|cite\|hr)[^>]>)\s<br />#i", "$1", $message); $message = preg_replace("#( )+(</?(?:html\|head\|body\|div\|p\|form\|table\|thead\|tbody\|tfoot\|tr\|td\|th\|ul\|ol\|li\|div\|p\|blockquote\|cite\|hr)[^>]*>)#i", "$2", $message);	$message = nl2br($message); // Fix up new lines and block level elements $message = preg_replace("#(</?(?:html\|head\|body\|div\|p\|form\|table\|thead\|tbody\|tfoot\|tr\|td\|th\|ul\|ol\|li\|div\|p\|blockquote\|cite\|hr)[^>]>)\s<br />#i", "$1", $message); $message = preg_replace("#( )+(</?(?:html\|head\|body\|div\|p\|form\|table\|thead\|tbody\|tfoot\|tr\|td\|th\|ul\|ol\|li\|div\|p\|blockquote\|cite\|hr)[^>]*>)#i", "$2", $message);
}	}
if($this->clear_needed) { $message .= '<br class="clear" />';	if($this->clear_needed) { $message .= '<br class="clear" />';
Zeile 244	Zeile 263
* @return string The formatted message. */ function parse_html($message)	* @return string The formatted message. */ function parse_html($message)
{	{
$message = preg_replace("#&(?!\#[0-9]+;)#si", "&", $message); // fix & but allow unicode $message = str_replace("<","<",$message); $message = str_replace(">",">",$message);	$message = preg_replace("#&(?!\#[0-9]+;)#si", "&", $message); // fix & but allow unicode $message = str_replace("<","<",$message); $message = str_replace(">",">",$message);
Zeile 300	Zeile 319
if($mybb->settings['allowlinkmycode'] == 1) {	if($mybb->settings['allowlinkmycode'] == 1) {
$callback_mycode['url_simple']['regex'] = "#\[url\]([a-z]+?://)([^\r\n\"<]+?)\[/url\]#si";	$callback_mycode['url_simple']['regex'] = "#\[url\]((?!javascript)[a-z]+?://)([^\r\n\"<]+?)\[/url\]#si";
$callback_mycode['url_simple']['replacement'] = array($this, 'mycode_parse_url_callback1');	$callback_mycode['url_simple']['replacement'] = array($this, 'mycode_parse_url_callback1');
$callback_mycode['url_simple2']['regex'] = "#\[url\]([^\r\n\"<]+?)\[/url\]#i";	$callback_mycode['url_simple2']['regex'] = "#\[url\]((?!javascript:)[^\r\n\"<]+?)\[/url\]#i";
$callback_mycode['url_simple2']['replacement'] = array($this, 'mycode_parse_url_callback2');	$callback_mycode['url_simple2']['replacement'] = array($this, 'mycode_parse_url_callback2');
$callback_mycode['url_complex']['regex'] = "#\[url=([a-z]+?://)([^\r\n\"<]+?)\](.+?)\[/url\]#si";	$callback_mycode['url_complex']['regex'] = "#\[url=((?!javascript)[a-z]+?://)([^\r\n\"<]+?)\](.+?)\[/url\]#si";
$callback_mycode['url_complex']['replacement'] = array($this, 'mycode_parse_url_callback1');	$callback_mycode['url_complex']['replacement'] = array($this, 'mycode_parse_url_callback1');
$callback_mycode['url_complex2']['regex'] = "#\[url=([^\r\n\"<]+?)\](.+?)\[/url\]#si";	$callback_mycode['url_complex2']['regex'] = "#\[url=((?!javascript:)[^\r\n\"<]+?)\](.+?)\[/url\]#si";