Vergleich inc/class_parser.php - 1.8.8 - 1.8.11

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 300Zeile 300

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";

			$callback_mycode['url_complex2']['replacement'] = array($this, 'mycode_parse_url_callback2');

++$callback_count;

			$callback_mycode['url_complex2']['replacement'] = array($this, 'mycode_parse_url_callback2');

++$callback_count;

Zeile 317Zeile 317

if($mybb->settings['allowemailmycode'] == 1)
{


if($mybb->settings['allowemailmycode'] == 1)
{

			$callback_mycode['email_simple']['regex'] = "#\[email\](.*?)\[/email\]#i";

			$callback_mycode['email_simple']['regex'] = "#\[email\]((?:[a-zA-Z0-9-_\+\.]+?)@[a-zA-Z0-9-]+\.[a-zA-Z0-9\.-]+(?:\?.*?)?)\[/email\]#i";

			$callback_mycode['email_simple']['replacement'] = array($this, 'mycode_parse_email_callback');


			$callback_mycode['email_simple']['replacement'] = array($this, 'mycode_parse_email_callback');


			$callback_mycode['email_complex']['regex'] = "#\[email=(.*?)\](.*?)\[/email\]#i";

			$callback_mycode['email_complex']['regex'] = "#\[email=((?:[a-zA-Z0-9-_\+\.]+?)@[a-zA-Z0-9-]+\.[a-zA-Z0-9\.-]+(?:\?.*?)?)\](.*?)\[/email\]#i";

			$callback_mycode['email_complex']['replacement'] = array($this, 'mycode_parse_email_callback');

++$callback_count;

			$callback_mycode['email_complex']['replacement'] = array($this, 'mycode_parse_email_callback');

++$callback_count;

Zeile 632Zeile 632
				}

// Take into account the position offset for our last replacement.

				}

// Take into account the position offset for our last replacement.

				$index = substr_count($badword['badword'], '*')+2;

 
				$badword['badword'] = str_replace('\*', '([a-zA-Z0-9_]{1})', preg_quote($badword['badword'], "#"));

// Ensure we run the replacement enough times but not recursively (i.e. not while(preg_match..))

				$badword['badword'] = str_replace('\*', '([a-zA-Z0-9_]{1})', preg_quote($badword['badword'], "#"));

// Ensure we run the replacement enough times but not recursively (i.e. not while(preg_match..))

				$count = preg_match_all("#(^|\W)".$badword['badword']."(\W|$)#i", $message, $matches);
for($i=0; $i < $count; ++$i)
{
$message = preg_replace("#(^|\W)".$badword['badword']."(\W|$)#i", "\\1".$badword['replacement'].'\\'.$index, $message);
}

				$message = preg_replace("#(^|\W)".$badword['badword']."(?=\W|$)#i", '\1'.$badword['replacement'], $message);





			}

			}

		}

		}

		if(!empty($this->options['strip_tags']))
{
$message = strip_tags($message);

		if(!empty($this->options['strip_tags']))
{
$message = strip_tags($message);

Zeile 652Zeile 647

/**
* Resolves nested CDATA tags in the specified message.


/**
* Resolves nested CDATA tags in the specified message.

	 *

	 *

	 * @param string $message The message to be parsed.
* @return string The parsed message.
*/

	 * @param string $message The message to be parsed.
* @return string The parsed message.
*/

Zeile 687Zeile 682
	*
* @param int $size The original size.
* @param string $text The text within a size tag.

	*
* @param int $size The original size.
* @param string $text The text within a size tag.

	* @return string The parsed text.

	* @return string The parsed text.

	*/
function mycode_handle_size($size, $text)
{
global $templates;

	*/
function mycode_handle_size($size, $text)
{
global $templates;





		$size = (int)$size;

if($size < 1)
{
$size = 1;

		$size = (int)$size;

if($size < 1)
{
$size = 1;

		}


		}


		if($size > 50)
{
$size = 50;
}


		if($size > 50)
{
$size = 50;
}


		$text = str_replace("\'", "'", $text);


		$text = str_replace("\'", "'", $text);


		eval("\$mycode_size = \"".$templates->get("mycode_size_int", 1, 0)."\";");
return $mycode_size;

		eval("\$mycode_size = \"".$templates->get("mycode_size_int", 1, 0)."\";");
return $mycode_size;

	}

/**

	}

/**

	* Handles fontsize.
*
* @param array $matches Matches.

	* Handles fontsize.
*
* @param array $matches Matches.

Zeile 735Zeile 730

// Assign pattern and replace values.
$pattern = "#\[quote\](.*?)\[\/quote\](\r\n?|\n?)#si";


// Assign pattern and replace values.
$pattern = "#\[quote\](.*?)\[\/quote\](\r\n?|\n?)#si";

		$pattern_callback = "#\[quote=([\"']|&quot;|)(.*?)(?:\\1)(.*?)(?:[\"']|&quot;)?\](.*?)\[/quote\](\r\n?|\n?)#si";


		$pattern_callback = "#\[quote=([\"']|&quot;|)(.*?)(?:\\1)(.*?)(?:[\"']|&quot;)?\](.*?)\[/quote\](\r\n?|\n?)#si";


		if($text_only == false)
{
$replace = "<blockquote class=\"mycode_quote\"><cite>$lang->quote</cite>$1</blockquote>\n";

		if($text_only == false)
{
$replace = "<blockquote class=\"mycode_quote\"><cite>$lang->quote</cite>$1</blockquote>\n";

Zeile 927Zeile 922
	function mycode_parse_code_callback($matches)
{
return $this->mycode_parse_code($matches[1], true);

	function mycode_parse_code_callback($matches)
{
return $this->mycode_parse_code($matches[1], true);

	}

/**
* Parses PHP code MyCode.
*

	}

/**
* Parses PHP code MyCode.
*

	* @param string $str The message to be parsed
* @param boolean $bare_return Whether or not it should return it as pre-wrapped in a div or not.
* @param boolean $text_only Are we formatting as text?

	* @param string $str The message to be parsed
* @param boolean $bare_return Whether or not it should return it as pre-wrapped in a div or not.
* @param boolean $text_only Are we formatting as text?

Zeile 944Zeile 939
		if($text_only == true)
{
return "\n{$lang->php_code}\n--\n$str\n--\n";

		if($text_only == true)
{
return "\n{$lang->php_code}\n--\n$str\n--\n";

		}


		}


		// Clean the string before parsing except tab spaces.
$str = preg_replace('#^(\t*)(\n|\r|\0|\x0B| )*#', '\\1', $str);
$str = rtrim($str);

		// Clean the string before parsing except tab spaces.
$str = preg_replace('#^(\t*)(\n|\r|\0|\x0B| )*#', '\\1', $str);
$str = rtrim($str);





		$original = preg_replace('#^\t*#', '', $str);

if(empty($original))
{
return;

		$original = preg_replace('#^\t*#', '', $str);

if(empty($original))
{
return;

		}


		}


		// See if open and close tags are provided.
$added_open_tag = false;
if(!preg_match("#^\s*<\?#si", $str))

		// See if open and close tags are provided.
$added_open_tag = false;
if(!preg_match("#^\s*<\?#si", $str))

Zeile 992Zeile 987
			$code = str_replace("?&gt;</span></code>", "</span></code>", $code);
// Wait a minute. It fails highlighting? Stupid highlighter.
$code = str_replace("?&gt;</code>", "</code>", $code);

			$code = str_replace("?&gt;</span></code>", "</span></code>", $code);
// Wait a minute. It fails highlighting? Stupid highlighter.
$code = str_replace("?&gt;</code>", "</code>", $code);

		}

		}


$code = preg_replace("#<span style=\"color: \#([A-Z0-9]{6})\"></span>#", "", $code);
$code = str_replace("<code>", "<div dir=\"ltr\"><code>", $code);


$code = preg_replace("#<span style=\"color: \#([A-Z0-9]{6})\"></span>#", "", $code);
$code = str_replace("<code>", "<div dir=\"ltr\"><code>", $code);

Zeile 1028Zeile 1023
	* @return string The built-up link.
*/
function mycode_parse_url($url, $name="")

	* @return string The built-up link.
*/
function mycode_parse_url($url, $name="")

	{

	{

		global $templates;
if(!preg_match("#^[a-z0-9]+://#i", $url))
{

		global $templates;
if(!preg_match("#^[a-z0-9]+://#i", $url))
{

Zeile 1216Zeile 1211

$image = $lang->sprintf($lang->posted_image, $this->mycode_parse_url($url));
return $image;


$image = $lang->sprintf($lang->posted_image, $this->mycode_parse_url($url));
return $image;

	}

/**
* Parses IMG MyCode disabled.
*
* @param array $matches Matches.
* @return string Image code.
*/

	}

/**
* Parses IMG MyCode disabled.
*
* @param array $matches Matches.
* @return string Image code.
*/

	function mycode_parse_img_disabled_callback1($matches)
{
return $this->mycode_parse_img_disabled($matches[2]);

	function mycode_parse_img_disabled_callback1($matches)
{
return $this->mycode_parse_img_disabled($matches[2]);

Zeile 1419Zeile 1414
				else
{
$id = $path[1]; // http://www.youtu.be/fds123

				else
{
$id = $path[1]; // http://www.youtu.be/fds123

 
				}
break;
case "twitch":
if(isset($path[3]))
{
$id = $path[3]; // https://www.twitch.tv/giantbomb/v/100048090

				}
break;
default:

				}
break;
default:

Zeile 1684Zeile 1685
		$find = array(
"#\[(b|u|i|s|url|email|color|img)\](.*?)\[/\\1\]#is",
"#\[img=([1-9][0-9]*)x([1-9][0-9]*)\](\r\n?|\n?)(https?://([^<>\"']+?))\[/img\]#is",

		$find = array(
"#\[(b|u|i|s|url|email|color|img)\](.*?)\[/\\1\]#is",
"#\[img=([1-9][0-9]*)x([1-9][0-9]*)\](\r\n?|\n?)(https?://([^<>\"']+?))\[/img\]#is",

			"#\[url=([a-z]+?://)([^\r\n\"<]+?)\](.+?)\[/url\]#si",
"#\[url=([^\r\n\"<&\(\)]+?)\](.+?)\[/url\]#si",

			"#\[url=((?!javascript)[a-z]+?://)([^\r\n\"<]+?)\](.+?)\[/url\]#si",
"#\[url=((?!javascript:)[^\r\n\"<&\(\)]+?)\](.+?)\[/url\]#si",

		);

$replace = array(

		);

$replace = array(