Vergleich inc/class_parser.php - 1.8.25 - 1.8.30

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 13	Zeile 13
allow_html allow_smilies allow_mycode	allow_html allow_smilies allow_mycode
	allow_auto_url
nl2br filter_badwords me_username	nl2br filter_badwords me_username
Zeile 95	Zeile 96
* @var boolean */ public $clear_needed = false;	* @var boolean */ public $clear_needed = false;
	/** * Don't validate parser output / const VALIDATION_DISABLE = 0; /* * Validate parser output and log errors / const VALIDATION_REPORT_ONLY = 1; /* * Validate parser output, log errors, and block output on failure / const VALIDATION_REQUIRE = 2; /* * Whether to validate the parser's HTML output when `allow_html` is disabled. * Validation errors will be logged/sent/displayed according to board settings. * * @access public * @var self::VALIDATION_* */ public $output_validation_policy = self::VALIDATION_REQUIRE;
/** * Parses a message with the specified options. * * @param string $message The message to be parsed.	/** * Parses a message with the specified options. * * @param string $message The message to be parsed.
* @param array $options Array of yes/no options - allow_html,filter_badwords,allow_mycode,allow_smilies,nl2br,me_username,filter_cdata.	* @param array $options Array of yes/no options
* @return string The parsed message. */ function parse_message($message, $options=array()) { global $plugins, $mybb;	* @return string The parsed message. */ function parse_message($message, $options=array()) { global $plugins, $mybb;
	$original_message = $message;
$this->clear_needed = false;	$this->clear_needed = false;
Zeile 117	Zeile 144
if(my_substr($this->base_url, my_strlen($this->base_url) -1) != "/") { $this->base_url = $this->base_url."/";	if(my_substr($this->base_url, my_strlen($this->base_url) -1) != "/") { $this->base_url = $this->base_url."/";
}	}
} // Set the options	} // Set the options
Zeile 155	Zeile 182
$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]));	$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); }	$message = preg_replace("#\[(code\|php)\](.*?)(\[/\\1\])+(\r\n?\|\n?)#si", "<mybb-code>\n", $message); }
Zeile 196	Zeile 223
} // Replace MyCode if requested.	} // Replace MyCode if requested.
if(!empty($this->options['allow_mycode']))	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);	// Filter url codes, if disabled. if($mybb->settings['allowlinkmycode'] != 1) { $message = preg_replace("#\[(\/)?url{1}(.*?)\]#i", "", $message);
}	}
// Parse Highlights if(!empty($this->options['highlight'])) {	// Parse Highlights if(!empty($this->options['highlight'])) {
Zeile 215	Zeile 242
// Run plugin hooks $message = $plugins->run_hooks("parse_message", $message);	// Run plugin hooks $message = $plugins->run_hooks("parse_message", $message);

if(!empty($this->options['allow_mycode'])) { // Now that we're done, if we split up any code tags, parse them and glue it all back together	if(!empty($this->options['allow_mycode'])) { // Now that we're done, if we split up any code tags, parse them and glue it all back together
Zeile 254	Zeile 281
$message = $plugins->run_hooks("parse_message_end", $message);	$message = $plugins->run_hooks("parse_message_end", $message);
return $message;	if ($this->output_allowed($original_message, $message) === true) { return $message; } else { return ''; }
} /**	} /**
Zeile 281	Zeile 315
global $cache, $lang, $mybb; $this->mycode_cache = array();	global $cache, $lang, $mybb; $this->mycode_cache = array();
$standard_mycode = $callback_mycode = $nestable_mycode = array(); $standard_count = $callback_count = $nestable_count = 0;	$standard_mycode = $callback_mycode = $nestable_mycode = $nestable_callback_mycode = array(); $standard_count = $callback_count = $nestable_count = $nestable_callback_count = 0;
if($mybb->settings['allowbasicmycode'] == 1) {	if($mybb->settings['allowbasicmycode'] == 1) {
Zeile 364	Zeile 398
++$nestable_count; ++$callback_count;	++$nestable_count; ++$callback_count;
} if($mybb->settings['allowfontmycode'] == 1) { $nestable_mycode['font']['regex'] = "#\[font=(\"?)([a-z0-9 ,\-_']+)\\1\](.*?)\[/font\]#si"; $nestable_mycode['font']['replacement'] = "<span style=\"font-family: $2;\" class=\"mycode_font\">$3</span>"; ++$nestable_count;
} if($mybb->settings['allowalignmycode'] == 1)	} if($mybb->settings['allowalignmycode'] == 1)
Zeile 380	Zeile 406
$nestable_mycode['align']['replacement'] = "<div style=\"text-align: $1;\" class=\"mycode_align\">$2</div>"; ++$nestable_count;	$nestable_mycode['align']['replacement'] = "<div style=\"text-align: $1;\" class=\"mycode_align\">$2</div>"; ++$nestable_count;
	} if($mybb->settings['allowfontmycode'] == 1) { $nestable_callback_mycode['font']['regex'] = "#\[font=\\s(\"?)([a-z0-9 ,\-_'\"]+)\\1\\s\](.*?)\[/font\]#si"; $nestable_callback_mycode['font']['replacement'] = array($this, 'mycode_parse_font_callback'); ++$nestable_callback_count;
} $custom_mycode = $cache->read("mycode");	} $custom_mycode = $cache->read("mycode");
Zeile 406	Zeile 440
{ $this->mycode_cache['standard']['find'][] = $code['regex']; $this->mycode_cache['standard']['replacement'][] = $code['replacement'];	{ $this->mycode_cache['standard']['find'][] = $code['regex']; $this->mycode_cache['standard']['replacement'][] = $code['replacement'];
}	}
// Assign the nestable MyCode to the cache. foreach($nestable_mycode as $code)	// Assign the nestable MyCode to the cache. foreach($nestable_mycode as $code)
Zeile 414	Zeile 448
$this->mycode_cache['nestable'][] = array('find' => $code['regex'], 'replacement' => $code['replacement']); }	$this->mycode_cache['nestable'][] = array('find' => $code['regex'], 'replacement' => $code['replacement']); }
// Assign the nestable MyCode to the cache. foreach($callback_mycode as $code)	// Assign the callback MyCode to the cache. foreach($callback_mycode as $code) { $this->mycode_cache['callback'][] = array('find' => $code['regex'], 'replacement' => $code['replacement']); } // Assign the nestable callback MyCode to the cache. foreach($nestable_callback_mycode as $code)
{	{
$this->mycode_cache['callback'][] = array('find' => $code['regex'], 'replacement' => $code['replacement']);	$this->mycode_cache['nestable_callback'][] = array('find' => $code['regex'], 'replacement' => $code['replacement']);
} $this->mycode_cache['standard_count'] = $standard_count; $this->mycode_cache['callback_count'] = $callback_count; $this->mycode_cache['nestable_count'] = $nestable_count;	} $this->mycode_cache['standard_count'] = $standard_count; $this->mycode_cache['callback_count'] = $callback_count; $this->mycode_cache['nestable_count'] = $nestable_count;
	$this->mycode_cache['nestable_callback_count'] = $nestable_callback_count;
} /**	} /**
Zeile 482	Zeile 523
if($this->mycode_cache['standard_count'] > 0) { $message = preg_replace($this->mycode_cache['standard']['find'], $this->mycode_cache['standard']['replacement'], $message);	if($this->mycode_cache['standard_count'] > 0) { $message = preg_replace($this->mycode_cache['standard']['find'], $this->mycode_cache['standard']['replacement'], $message);
}	}
if($this->mycode_cache['callback_count'] > 0)	if($this->mycode_cache['callback_count'] > 0)
{	{
foreach($this->mycode_cache['callback'] as $replace)	foreach($this->mycode_cache['callback'] as $replace)
{	{
$message = preg_replace_callback($replace['find'], $replace['replacement'], $message); } }	$message = preg_replace_callback($replace['find'], $replace['replacement'], $message); } }
// Replace the nestable mycode's if($this->mycode_cache['nestable_count'] > 0)	// Replace the nestable mycode's if($this->mycode_cache['nestable_count'] > 0) { foreach($this->mycode_cache['nestable'] as $mycode) { while(preg_match($mycode['find'], $message)) { $message = preg_replace($mycode['find'], $mycode['replacement'], $message); } } } // Replace the nestable callback mycodes if($this->mycode_cache['nestable_callback_count'] > 0)
{	{
foreach($this->mycode_cache['nestable'] as $mycode)	foreach($this->mycode_cache['nestable_callback'] as $replace)
{	{
while(preg_match($mycode['find'], $message))	while(preg_match($replace['find'], $message))
{	{
$message = preg_replace($mycode['find'], $mycode['replacement'], $message);	$message_org = $message; $message = preg_replace_callback($replace['find'], $replace['replacement'], $message); if ($message_org == $message) { break; }
}	}
}	}
} // Reset list cache if($mybb->settings['allowlistmycode'] == 1)	} // Reset list cache if($mybb->settings['allowlistmycode'] == 1)
{	{
$this->list_elements = array(); $this->list_count = 0;	$this->list_elements = array(); $this->list_count = 0;

// Find all lists $message = preg_replace_callback("#(\[list(=(a\|A\|i\|I\|1))?\]\|\[/list\])#si", array($this, 'mycode_prepare_list'), $message);	// Find all lists $message = preg_replace_callback("#(\[list(=(a\|A\|i\|I\|1))?\]\|\[/list\])#si", array($this, 'mycode_prepare_list'), $message);
Zeile 521	Zeile 579
} }	} }
$message = $this->mycode_auto_url($message);	if( (!isset($this->options['allow_auto_url']) \|\| $this->options['allow_auto_url'] == 1) && $mybb->settings['allowautourl'] == 1 ) { $message = $this->mycode_auto_url($message); }
return $message; }	return $message; }
Zeile 542	Zeile 606
$extra_class = $onclick = ''; foreach($smilies as $sid => $smilie) {	$extra_class = $onclick = ''; foreach($smilies as $sid => $smilie) {
	if(isset($theme['imgdir'])) { $imgdir = $theme['imgdir']; } else { $imgdir = ''; }
$smilie['find'] = explode("\n", $smilie['find']);	$smilie['find'] = explode("\n", $smilie['find']);
$smilie['image'] = str_replace("{theme}", $theme['imgdir'], $smilie['image']);	$smilie['image'] = str_replace("{theme}", $imgdir, $smilie['image']);
$smilie['image'] = htmlspecialchars_uni($mybb->get_asset_url($smilie['image'])); $smilie['name'] = htmlspecialchars_uni($smilie['name']);	$smilie['image'] = htmlspecialchars_uni($mybb->get_asset_url($smilie['image'])); $smilie['name'] = htmlspecialchars_uni($smilie['name']);
Zeile 621	Zeile 694
global $cache; $this->badwords_cache = array(); $this->badwords_cache = $cache->read("badwords");	global $cache; $this->badwords_cache = array(); $this->badwords_cache = $cache->read("badwords");
} /**	} /**
* Parses a list of filtered/badwords in the specified message. * * @param string $message The message to be parsed.	* Parses a list of filtered/badwords in the specified message. * * @param string $message The message to be parsed.
Zeile 649	Zeile 722
if(!$badword['replacement']) { $badword['replacement'] = "*****";	if(!$badword['replacement']) { $badword['replacement'] = "*****";
}	}
if(!$badword['regex']) { $badword['badword'] = $this->generate_regex($badword['badword']);	if(!$badword['regex']) { $badword['badword'] = $this->generate_regex($badword['badword']);
Zeile 677	Zeile 750
if($bad_word == "") { return;	if($bad_word == "") { return;
}	}
// Neutralize escape character, regex operators, multiple adjacent wildcards and generate pattern $ptrn = array('/\\\\/', '/([\[\^\$\.\\|\?\{\}]{1})/', '/\\++/', '/\++\/', '/\*+/');	// Neutralize escape character, regex operators, multiple adjacent wildcards and generate pattern $ptrn = array('/\\\\/', '/([\[\^\$\.\\|\?\{\}]{1})/', '/\\++/', '/\++\/', '/\*+/');
Zeile 758	Zeile 831
if($size < 1) { $size = 1;	if($size < 1) { $size = 1;
}	}
if($size > 50) {	if($size > 50) {
Zeile 863	Zeile 936
$delete_quote = true; preg_match("#pid=(?:"\|\"\|')?([0-9]+)[\"']?(?:"\|\"\|')?#i", $username, $match);	$delete_quote = true; preg_match("#pid=(?:"\|\"\|')?([0-9]+)[\"']?(?:"\|\"\|')?#i", $username, $match);
if((int)$match[1])	if(isset($match[1]) && (int)$match[1])
{ $pid = (int)$match[1]; $url = $mybb->settings['bburl']."/".get_post_link($pid)."#pid$pid";	{ $pid = (int)$match[1]; $url = $mybb->settings['bburl']."/".get_post_link($pid)."#pid$pid";
Zeile 882	Zeile 955
unset($match); preg_match("#dateline=(?:"\|\"\|')?([0-9]+)(?:"\|\"\|')?#i", $username, $match);	unset($match); preg_match("#dateline=(?:"\|\"\|')?([0-9]+)(?:"\|\"\|')?#i", $username, $match);
if((int)$match[1])	if(isset($match[1]) && (int)$match[1])
{ if($match[1] < TIME_NOW) {	{ if($match[1] < TIME_NOW) {
Zeile 902	Zeile 975
if($delete_quote) {	if($delete_quote) {
$username = my_substr($username, 0, my_strlen($username)-1);	$username = my_substr($username, 0, my_strlen($username)-1, true);
} if(!empty($this->options['allow_html']))	} if(!empty($this->options['allow_html']))
Zeile 1137	Zeile 1210
eval("\$mycode_url = \"".$templates->get("mycode_url", 1, 0)."\";"); return $mycode_url;	eval("\$mycode_url = \"".$templates->get("mycode_url", 1, 0)."\";"); return $mycode_url;
	} /** * Parses font MyCode. * * @param array $matches Matches. * @return string The HTML <span> tag with styled font. */ function mycode_parse_font_callback($matches) { // Replace any occurrence(s) of double quotes in fonts with single quotes. // A back-fix for double-quote-containing MyBB font tags in existing // posts prior to the client-side aspect of this fix for the // browser-independent SCEditor bug of issue #4182. $fonts = str_replace('"', "'", $matches[2]); return "<span style=\"font-family: {$fonts};\" class=\"mycode_font\">{$matches[3]}</span>";
} /**	} /**
Zeile 1152	Zeile 1242
$matches[3] = ''; } return $this->mycode_parse_url($matches[1].$matches[2], $matches[3]);	$matches[3] = ''; } return $this->mycode_parse_url($matches[1].$matches[2], $matches[3]);
} /**	} /**
* Parses URL MyCode. * * @param array $matches Matches. * @return string The built-up link. */ function mycode_parse_url_callback2($matches)	* Parses URL MyCode. * * @param array $matches Matches. * @return string The built-up link. */ function mycode_parse_url_callback2($matches)
{	{
if(!isset($matches[2])) { $matches[2] = ''; } return $this->mycode_parse_url($matches[1], $matches[2]); }	if(!isset($matches[2])) { $matches[2] = ''; } return $this->mycode_parse_url($matches[1], $matches[2]); }

/** * Parses IMG MyCode. *	/** * Parses IMG MyCode. *
Zeile 1183	Zeile 1273
$url = trim($url); $url = str_replace("\n", "", $url); $url = str_replace("\r", "", $url);	$url = trim($url); $url = str_replace("\n", "", $url); $url = str_replace("\r", "", $url);

if(!empty($this->options['allow_html'])) { $url = $this->parse_html($url);	if(!empty($this->options['allow_html'])) { $url = $this->parse_html($url);
Zeile 1197	Zeile 1287
else if($align == "left") { $css_align = ' style="float: left;"';	else if($align == "left") { $css_align = ' style="float: left;"';
}	}
if($align) {	if($align) {
Zeile 1211	Zeile 1301
$alt = my_substr($alt, 0, 40).'...'.my_substr($alt, -10); } $alt = $this->encode_url($alt);	$alt = my_substr($alt, 0, 40).'...'.my_substr($alt, -10); } $alt = $this->encode_url($alt);
	$alt = preg_replace("#&(?!\#[0-9]+;)#si", "&", $alt); // fix & but allow unicode
$alt = $lang->sprintf($lang->posted_image, $alt); $width = $height = '';	$alt = $lang->sprintf($lang->posted_image, $alt); $width = $height = '';
Zeile 1584	Zeile 1675
*/ function mycode_auto_url($message) {	*/ function mycode_auto_url($message) {
$message = " ".$message;
// Links should end with slashes, numbers, characters and braces but not with dots, commas or question marks // Don't create links within existing links (handled up-front in the callback function).	// Links should end with slashes, numbers, characters and braces but not with dots, commas or question marks // Don't create links within existing links (handled up-front in the callback function).
$message = preg_replace_callback("#<a\\s[^>]>.?</a>\|([\s\[\>])(http\|https\|ftp\|news\|irc\|ircs\|irc6){1}(://)([^\/\"\s\<\[\.]+\.([^\/\"\s\<\[\.]+\.)[\w]+(:[0-9]+)?(/([^\"\s<\[]\|\[\]))?([\w\/\)]))#ius", array($this, 'mycode_auto_url_callback'), $message); $message = preg_replace_callback("#<a\\s[^>]>.?</a>\|([\s\[\>])(www\|ftp)(\.)(([^\/\"\s\<\[\.]+\.)[\w]+(:[0-9]+)?(/([^\"\s<\[]\|\[\]))?([\w\/\)]))#ius", array($this, 'mycode_auto_url_callback'), $message); $message = my_substr($message, 1);	$message = preg_replace_callback( "~ <a\\s[^>]>.?</a>\| # match and return existing links (?<=^\|[\s\[\>]) # character preceding the link (?P<prefix> (?:http\|https\|ftp\|news\|irc\|ircs\|irc6)://\| # scheme, or (?:www\|ftp)\. # common subdomain ) (?P<link> (?:[^\/\"\s\<\[\.]+\.)[\w]+ # host (?::[0-9]+)? # port (?:/(?:[^\"\s<\[&]\|\[\]\|&(?:amp\|lt\|gt);))? # path, query, fragment; exclude unencoded characters [\w\/\)] ) (?![^<>]*?>) # not followed by unopened > (within HTML tags) ~iusx", array($this, 'mycode_auto_url_callback'), $message );
return $message; }	return $message; }
Zeile 1612	Zeile 1717
$external = ''; // Allow links like http://en.wikipedia.org/wiki/PHP_(disambiguation) but detect mismatching braces	$external = ''; // Allow links like http://en.wikipedia.org/wiki/PHP_(disambiguation) but detect mismatching braces
while(my_substr($matches[4], -1) == ')')	while(my_substr($matches['link'], -1) == ')')
{	{
if(substr_count($matches[4], ')') > substr_count($matches[4], '('))	if(substr_count($matches['link'], ')') > substr_count($matches['link'], '('))
{	{
$matches[4] = my_substr($matches[4], 0, -1);	$matches['link'] = my_substr($matches['link'], 0, -1);
$external = ')'.$external; } else	$external = ')'.$external; } else
Zeile 1625	Zeile 1730
} // Example: ([...] http://en.wikipedia.org/Example_(disambiguation).)	} // Example: ([...] http://en.wikipedia.org/Example_(disambiguation).)
$last_char = my_substr($matches[4], -1);	$last_char = my_substr($matches['link'], -1);
while($last_char == '.' \|\| $last_char == ',' \|\| $last_char == '?' \|\| $last_char == '!') {	while($last_char == '.' \|\| $last_char == ',' \|\| $last_char == '?' \|\| $last_char == '!') {
$matches[4] = my_substr($matches[4], 0, -1);	$matches[4] = my_substr($matches['link'], 0, -1);
$external = $last_char.$external;	$external = $last_char.$external;
$last_char = my_substr($matches[4], -1);	$last_char = my_substr($matches['link'], -1);
} }	} }
$url = "{$matches[2]}{$matches[3]}{$matches[4]}";	$url = $matches['prefix'].$matches['link'];

return $matches[1].$this->mycode_parse_url($url, $url).$external;	return $this->mycode_parse_url($url, $url).$external;
} /**	} /**
Zeile 1864	Zeile 1969
$url = str_replace(array_keys($entities), array_values($entities), $url); return $url;	$url = str_replace(array_keys($entities), array_values($entities), $url); return $url;
	} /** * Determines whether the resulting HTML syntax is acceptable for output, * according to the parser's validation policy and HTML support. * * @param string $source The original MyCode. * @param string $output The output HTML code. * @return bool / function output_allowed($source, $output) { if($this->output_validation_policy === self::VALIDATION_DISABLE \|\| !empty($this->options['allow_html'])) { return true; } else { $output_valid = $this->validate_output($source, $output); if($this->output_validation_policy === self::VALIDATION_REPORT_ONLY) { return true; } else { return $output_valid === true; } } } /* * Validate HTML syntax and pass errors to the error handler. * * @param string $source The original MyCode. * @param string $output The output HTML code. * @return bool / function validate_output($source, $output) { global $error_handler; $ignored_error_codes = array( // entities may be broken through smilie parsing; cache_smilies() method workaround doesn't cover all entities 'XML_ERR_INVALID_DEC_CHARREF' => 7, 'XML_ERR_INVALID_CHAR' => 9, 'XML_ERR_UNDECLARED_ENTITY' => 26, // unrecognized HTML entities 'XML_ERR_ATTRIBUTE_WITHOUT_VALUE' => 41, 'XML_ERR_TAG_NAME_MISMATCH' => 76, // the parser may output tags closed in different levels and siblings ); libxml_use_internal_errors(true); @libxml_disable_entity_loader(true); simplexml_load_string('<root>'.$output.'</root>', 'SimpleXMLElement', 524288 / LIBXML_PARSEHUGE */); $errors = libxml_get_errors(); libxml_use_internal_errors(false); if( $errors && array_diff( array_column($errors, 'code'), $ignored_error_codes ) ) { $data = array( 'sourceHtmlEntities' => htmlspecialchars_uni($source), 'outputHtmlEntities' => htmlspecialchars_uni($output), 'errors' => $errors, ); $error_message = "Parser output validation failed.\n"; $error_message .= var_export($data, true); $error_handler->error(E_USER_WARNING, $error_message, __FILE__, __LINE__, false); return false; } else { return true; }
} }	} }