Vergleich inc/class_parser.php - 1.6.1 - 1.6.7

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 6Zeile 6
 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * $Id: class_parser.php 5141 2010-07-29 23:32:11Z RyanGordon $

 * $Id: class_parser.php 5710 2011-12-08 14:51:56Z Tomm $

 */

/*

 */

/*

Zeile 118Zeile 118
			{
$message = preg_replace("#<script(.*)>(.*)</script(.*)>#is", "&lt;script$1&gt;$2&lt;/script$3&gt;", $message);
}

			{
$message = preg_replace("#<script(.*)>(.*)</script(.*)>#is", "&lt;script$1&gt;$2&lt;/script$3&gt;", $message);
}

			// Remove these completely
$message = preg_replace("#\s*<base[^>]*>\s*#is", "", $message);
$message = preg_replace("#\s*<meta[^>]*>\s*#is", "", $message);





			$message = str_replace(array('<?php', '<!--', '-->', '?>', "<br />\n", "<br>\n"), array('&lt;?php', '&lt;!--', '--&gt;', '?&gt;', "\n", "\n"), $message);
}

// If MyCode needs to be replaced, first filter out [code] and [php] tags.
if($this->options['allow_mycode'])
{

			$message = str_replace(array('<?php', '<!--', '-->', '?>', "<br />\n", "<br>\n"), array('&lt;?php', '&lt;!--', '--&gt;', '?&gt;', "\n", "\n"), $message);
}

// If MyCode needs to be replaced, first filter out [code] and [php] tags.
if($this->options['allow_mycode'])
{

			// First we split up the contents of code and php tags to ensure they're not parsed.

 
			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);
$message = preg_replace("#\[(code|php)\](.*?)\[/\\1\](\r\n?|\n?)#si", "<mybb-code>\n", $message);

		}

		}


// Always fix bad Javascript in the message.
$message = $this->fix_javascript($message);


// Always fix bad Javascript in the message.
$message = $this->fix_javascript($message);

Zeile 146Zeile 143
		
// If we can, parse smilies
if($this->options['allow_smilies'])

		
// If we can, parse smilies
if($this->options['allow_smilies'])

		{

		{

			$message = $this->parse_smilies($message, $this->options['allow_html']);
}


			$message = $this->parse_smilies($message, $this->options['allow_html']);
}


Zeile 154Zeile 151
		if($this->options['allow_mycode'])
{
$message = $this->parse_mycode($message, $this->options);

		if($this->options['allow_mycode'])
{
$message = $this->parse_mycode($message, $this->options);

		}

		}

		
// Parse Highlights
if($this->options['highlight'])

		
// Parse Highlights
if($this->options['highlight'])

Zeile 177Zeile 174
					{
$text[2] = $this->parse_html($text[2]);
}

					{
$text[2] = $this->parse_html($text[2]);
}

					



					if(my_strtolower($text[1]) == "code")
{
$code = $this->mycode_parse_code($text[2]);

					if(my_strtolower($text[1]) == "code")
{
$code = $this->mycode_parse_code($text[2]);

Zeile 189Zeile 186
					$message = preg_replace("#\<mybb-code>\n?#", $code, $message, 1);
}
}

					$message = preg_replace("#\<mybb-code>\n?#", $code, $message, 1);
}
}

 
		}

// Replace meta and base tags in our post - these are > dangerous <
if($this->options['allow_html'])
{
$message = preg_replace_callback("#<((m[^a])|(b[^diloru>])|(s[^aemptu>]))(\s*[^>]*)>#si", create_function(
'$matches',
'return htmlspecialchars($matches[0]);'
), $message);

		}

if($options['nl2br'] !== 0)

		}

if($options['nl2br'] !== 0)

Zeile 391Zeile 397
	 */
private function cache_smilies()
{

	 */
private function cache_smilies()
{

		global $cache;

		global $cache, $mybb;

		$this->smilies_cache = array();

$smilies = $cache->read("smilies");
if(is_array($smilies))

		$this->smilies_cache = array();

$smilies = $cache->read("smilies");
if(is_array($smilies))

		{

		{

			foreach($smilies as $sid => $smilie)
{

			foreach($smilies as $sid => $smilie)
{

 
				if(defined("IN_ARCHIVE") && substr($smilie['image'], 0, 4) != "http")
{
// We're in the archive and not using an outside image, add in our address
$smilie['image'] = $mybb->settings['bburl']."/".$smilie['image'];
}


				$this->smilies_cache[$smilie['find']] = "<img src=\"{$smilie['image']}\" style=\"vertical-align: middle;\" border=\"0\" alt=\"{$smilie['name']}\" title=\"{$smilie['name']}\" />";
}

				$this->smilies_cache[$smilie['find']] = "<img src=\"{$smilie['image']}\" style=\"vertical-align: middle;\" border=\"0\" alt=\"{$smilie['name']}\" title=\"{$smilie['name']}\" />";
}

		}

		}

	}

/**

	}

/**

Zeile 422Zeile 434
		$message = ' ' . $message . ' ';

// First we take out any of the tags we don't want parsed between (url= etc)

		$message = ' ' . $message . ' ';

// First we take out any of the tags we don't want parsed between (url= etc)

		preg_match_all("#\[(url(=[^\]]*])?\](.*?)\[\/url\]|quote=([^\]]*)?\])#i", $message, $bad_matches, PREG_PATTERN_ORDER);
$message = preg_replace("#\[(url(=[^\]]*])?\](.*?)\[\/url\]|quote=([^\]]*)?\])#si", "<mybb-bad-sm>", $message);

		preg_match_all("#\[(url(=[^\]]*)?\]|quote=([^\]]*)?\])#i", $message, $bad_matches, PREG_PATTERN_ORDER);
$message = preg_replace("#\[(url(=[^\]]*)?\]|quote=([^\]]*)?\])#si", "<mybb-bad-sm>", $message);

		
// Impose a hard limit of 500 smilies per message as to not overload the parser
$remaining = 500;

		
// Impose a hard limit of 500 smilies per message as to not overload the parser
$remaining = 500;

Zeile 435Zeile 447
				$orig_message = $message;
$find = $this->parse_html($find);
$find = preg_quote($find, "#");

				$orig_message = $message;
$find = $this->parse_html($find);
$find = preg_quote($find, "#");

 

$replace = strip_tags($replace, "<img>");

				
// Fix issues for smileys starting with a ";"
$orig_find = $find;

				
// Fix issues for smileys starting with a ";"
$orig_find = $find;

Zeile 535Zeile 549
	function fix_javascript($message)
{
$js_array = array(

	function fix_javascript($message)
{
$js_array = array(

			"#(&\#(0*)106;|&\#(0*)74;|j)((&\#(0*)97;|&\#(0*)65;|a)(&\#(0*)118;|&\#(0*)86;|v)(&\#(0*)97;|&\#(0*)65;|a)(\s)?(&\#(0*)115;|&\#(0*)83;|s)(&\#(0*)99;|&\#(0*)67;|c)(&\#(0*)114;|&\#(0*)82;|r)(&\#(0*)105;|&\#(0*)73;|i)(&\#112;|&\#(0*)80;|p)(&\#(0*)116;|&\#(0*)84;|t)(&\#(0*)58;|\:))#i",

			"#(&\#(0*)106;?|&\#(0*)74;?|&\#x(0*)4a;?|&\#x(0*)6a;?|j)((&\#(0*)97;?|&\#(0*)65;?|a)(&\#(0*)118;?|&\#(0*)86;?|v)(&\#(0*)97;?|&\#(0*)65;?|a)(\s)?(&\#(0*)115;?|&\#(0*)83;?|s)(&\#(0*)99;?|&\#(0*)67;?|c)(&\#(0*)114;?|&\#(0*)82;?|r)(&\#(0*)105;?|&\#(0*)73;?|i)(&\#112;?|&\#(0*)80;?|p)(&\#(0*)116;?|&\#(0*)84;?|t)(&\#(0*)58;?|\:))#i",

			"#(o)(nmouseover\s?=)#i",
"#(o)(nmouseout\s?=)#i",
"#(o)(nmousedown\s?=)#i",

			"#(o)(nmouseover\s?=)#i",
"#(o)(nmouseout\s?=)#i",
"#(o)(nmousedown\s?=)#i",

Zeile 592Zeile 606

// Assign pattern and replace values.
$pattern = array(


// Assign pattern and replace values.
$pattern = array(

			"#\[quote=(?:&quot;|\"|')?(.*?)[\"']?(?:&quot;|\"|')?\](.*?)\[\/quote\](\r\n?|\n?)#esi",

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

			"#\[quote\](.*?)\[\/quote\](\r\n?|\n?)#si"
);

if($text_only == false)
{
$replace = array(

			"#\[quote\](.*?)\[\/quote\](\r\n?|\n?)#si"
);

if($text_only == false)
{
$replace = array(

				"\$this->mycode_parse_post_quotes('$2','$1')",

				"\$this->mycode_parse_post_quotes('$4','$2$3')",

				"<blockquote><cite>$lang->quote</cite>$1</blockquote>\n"
);
}
else
{
$replace = array(

				"<blockquote><cite>$lang->quote</cite>$1</blockquote>\n"
);
}
else
{
$replace = array(

				"\$this->mycode_parse_post_quotes('$2', '$1', true)",

				"\$this->mycode_parse_post_quotes('$4','$2$3', true)",

				"\n{$lang->quote}\n--\n$1\n--\n"
);
}


				"\n{$lang->quote}\n--\n$1\n--\n"
);
}


		while(preg_match($pattern[0], $message) || preg_match($pattern[1], $message))

		do

		{

		{

			$message = preg_replace($pattern, $replace, $message);







			$previous_message = $message;
$message = preg_replace($pattern, $replace, $message, -1, $count);
} while($count);

if(!$message)
{
$message = $previous_message;

		}

if($text_only == false)

		}

if($text_only == false)

Zeile 637Zeile 657
	*
* @param string The message to be parsed
* @param string The username to be parsed

	*
* @param string The message to be parsed
* @param string The username to be parsed

	* @param boolean Are we formatting as text?

	* @param boolean Are we formatting as text?

	* @return string The parsed message.
*/
function mycode_parse_post_quotes($message, $username, $text_only=false)

	* @return string The parsed message.
*/
function mycode_parse_post_quotes($message, $username, $text_only=false)

Zeile 860Zeile 880
				$name = my_substr($url, 0, 40)."...".my_substr($url, -10);
}
}

				$name = my_substr($url, 0, 40)."...".my_substr($url, -10);
}
}

		








$nofollow = '';
if(isset($this->options['nofollow_on']))
{
$nofollow = " rel=\"nofollow\"";
}


		// Fix some entities in URLs
$entities = array('$' => '%24', '&#36;' => '%24', '^' => '%5E', '`' => '%60', '[' => '%5B', ']' => '%5D', '{' => '%7B', '}' => '%7D', '"' => '%22', '<' => '%3C', '>' => '%3E', ' ' => '%20');
$fullurl = str_replace(array_keys($entities), array_values($entities), $fullurl);

$name = preg_replace("#&amp;\#([0-9]+);#si", "&#$1;", $name); // Fix & but allow unicode

		// Fix some entities in URLs
$entities = array('$' => '%24', '&#36;' => '%24', '^' => '%5E', '`' => '%60', '[' => '%5B', ']' => '%5D', '{' => '%7B', '}' => '%7D', '"' => '%22', '<' => '%3C', '>' => '%3E', ' ' => '%20');
$fullurl = str_replace(array_keys($entities), array_values($entities), $fullurl);

$name = preg_replace("#&amp;\#([0-9]+);#si", "&#$1;", $name); // Fix & but allow unicode

		$link = "<a href=\"$fullurl\" target=\"_blank\">$name</a>";

		$link = "<a href=\"$fullurl\" target=\"_blank\"{$nofollow}>$name</a>";

		return $link;
}


		return $link;
}


Zeile 940Zeile 966
			return "[video={$video}]{$url}[/video]";
}


			return "[video={$video}]{$url}[/video]";
}


		$parsed_url = @parse_url($url);

		$parsed_url = @parse_url(urldecode($url));

		if($parsed_url == false)
{
return "[video={$video}]{$url}[/video]";;

		if($parsed_url == false)
{
return "[video={$video}]{$url}[/video]";;

Zeile 968Zeile 994
		{
case "dailymotion":
list($id, ) = split("_", $path[2], 1); // http://www.dailymotion.com/video/fds123_title-goes-here

		{
case "dailymotion":
list($id, ) = split("_", $path[2], 1); // http://www.dailymotion.com/video/fds123_title-goes-here

				break;
case "googlevideo":
$id = $input['docid']; // http://video.google.com/videoplay?docid=fds123

 
				break;
case "metacafe":
$id = $path[2]; // http://www.metacafe.com/watch/fds123/title_goes_here/

				break;
case "metacafe":
$id = $path[2]; // http://www.metacafe.com/watch/fds123/title_goes_here/

Zeile 982Zeile 1005
			case "yahoo":
$id = $path[3]; // http://video.yahoo.com/watch/fds123/abc567
$vid = htmlspecialchars_uni($path[2]);

			case "yahoo":
$id = $path[3]; // http://video.yahoo.com/watch/fds123/abc567
$vid = htmlspecialchars_uni($path[2]);

				break;

				break;

			case "vimeo":
$id = $path[1]; // http://vimeo.com/fds123
break;
case "youtube":
if($fragments[0])

			case "vimeo":
$id = $path[1]; // http://vimeo.com/fds123
break;
case "youtube":
if($fragments[0])

				{

				{

					$id = str_replace('!v=', '', $fragments[0]); // http://www.youtube.com/watch#!v=fds123

					$id = str_replace('!v=', '', $fragments[0]); // http://www.youtube.com/watch#!v=fds123

 
				}
elseif($input['v'])
{
$id = $input['v']; // http://www.youtube.com/watch?v=fds123

				}
else
{

				}
else
{

					$id = $input['v']; // http://www.youtube.com/watch?v=fds123

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

				}
break;
default:

				}
break;
default:

Zeile 1096Zeile 1123
	}

/**

	}

/**

	 * Parses message to plain text equivilents of MyCode.

	 * Parses message to plain text equivalents of MyCode.

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

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

Zeile 1116Zeile 1143

$find = array(
"#\[(b|u|i|s|url|email|color|img)\](.*?)\[/\\1\]#is",


$find = array(
"#\[(b|u|i|s|url|email|color|img)\](.*?)\[/\\1\]#is",

			"#\[code\](.*?)\[/code\](\r\n?|\n?)#ise",

 
			"#\[php\](.*?)\[/php\](\r\n?|\n?)#ise",

			"#\[php\](.*?)\[/php\](\r\n?|\n?)#ise",

 
			"#\[code\](.*?)\[/code\](\r\n?|\n?)#ise",

			"#\[img=([0-9]{1,3})x([0-9]{1,3})\](\r\n?|\n?)(https?://([^<>\"']+?))\[/img\]#is",
"#\[url=([a-z]+?://)([^\r\n\"<]+?)\](.+?)\[/url\]#si",
"#\[url=([^\r\n\"<&\(\)]+?)\](.+?)\[/url\]#si",

			"#\[img=([0-9]{1,3})x([0-9]{1,3})\](\r\n?|\n?)(https?://([^<>\"']+?))\[/img\]#is",
"#\[url=([a-z]+?://)([^\r\n\"<]+?)\](.+?)\[/url\]#si",
"#\[url=([^\r\n\"<&\(\)]+?)\](.+?)\[/url\]#si",

Zeile 1140Zeile 1167
			
$message = preg_replace('#(>|^|\r|\n)/me ([^\r\n<]*)#i', "\\1* {$options['me_username']} \\2", $message);
$message = preg_replace('#(>|^|\r|\n)/slap ([^\r\n<]*)#i', "\\1* {$options['me_username']} {$lang->slaps} \\2 {$lang->with_trout}", $message);

			
$message = preg_replace('#(>|^|\r|\n)/me ([^\r\n<]*)#i', "\\1* {$options['me_username']} \\2", $message);
$message = preg_replace('#(>|^|\r|\n)/slap ([^\r\n<]*)#i', "\\1* {$options['me_username']} {$lang->slaps} \\2 {$lang->with_trout}", $message);

		}

		}


// Special code requiring special attention


// Special code requiring special attention

		while(preg_match("#\[list\](.*?)\[/list\]#si", $message))

		while(preg_match("#\[list\](.*?)\[/list\]#esi", $message))

		{

		{

			$message = preg_replace("#\[list\](.*?)\[/list\](\r\n?|\n?)#esi", "\$this->mycode_parse_list('$1', '', true)\n", $message);

			$message = preg_replace("#\s?\[list\](.*?)\[/list\](\r\n?|\n?)#esi", "\$this->mycode_parse_list('$1')\n", $message);

		}

// Replace lists.
while(preg_match("#\[list=(a|A|i|I|1)\](.*?)\[/list\](\r\n?|\n?)#esi", $message))
{

		}

// Replace lists.
while(preg_match("#\[list=(a|A|i|I|1)\](.*?)\[/list\](\r\n?|\n?)#esi", $message))
{

			$message = preg_replace("#\[list=(a|A|i|I|1)\](.*?)\[/list\]#esi", "\$this->mycode_parse_list('$2', '$1', true)\n", $message);

			$message = preg_replace("#\s?\[list=(a|A|i|I|1)\](.*?)\[/list\]#esi", "\$this->mycode_parse_list('$2', '$1')\n", $message);

		}

// Run plugin hooks

		}

// Run plugin hooks