enmi-conf.org: comparison wp/wp-includes/SimplePie/Misc.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 * SimplePie
 *
 * A PHP-Based RSS and Atom Feed Framework.
 * Takes the hard work out of managing a complete RSS/Atom solution.
 *
-* Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+* Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification, are
 * permitted provided that the following conditions are met:
 *
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
 * @package SimplePie
-* @version 1.3.1
+* @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
-* @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
 * @author Ryan Parman
-* @author Geoffrey Sneddon
+* @author Sam Sneddon
 * @author Ryan McCue
 * @link http://simplepie.org/ SimplePie
 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
 */
 	{
 		$full = "<$element[tag]";
 		foreach ($element['attribs'] as $key => $value)
 		{
 			$key = strtolower($key);
-			$full .= " $key=\"" . htmlspecialchars($value['data']) . '"';
+			$full .= " $key=\"" . htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8') . '"';
 		}
 		if ($element['self_closing'])
 		{
 			$full .= ' />';
 		}
 		}
 		elseif ($http === 4 && strtolower($parsed['scheme']) === 'http')
 		{
 			return substr_replace($url, 'itpc', 0, 4);
 		}
-		else
-		{
+		return $url;
-			return $url;
+	}
-		}
+	public static function array_merge_recursive($array1, $array2)
+	{
+		foreach ($array2 as $key => $value)
+		{
+			if (is_array($value))
+			{
+				$array1[$key] = SimplePie_Misc::array_merge_recursive($array1[$key], $value);
+			}
+			else
+			{
+				$array1[$key] = $value;
+			}
+		}
+		return $array1;
 	}
 	public static function parse_url($url)
 	{
 		$iri = new SimplePie_IRI($url);
 		$integer = hexdec($match[1]);
 		if ($integer >= 0x41 && $integer <= 0x5A || $integer >= 0x61 && $integer <= 0x7A || $integer >= 0x30 && $integer <= 0x39 || $integer === 0x2D || $integer === 0x2E || $integer === 0x5F || $integer === 0x7E)
 		{
 			return chr($integer);
 		}
-		else
-		{
+		return strtoupper($match[0]);
-			return strtoupper($match[0]);
-		}
 	}
 	/**
 	 * Converts a Windows-1252 encoded string to a UTF-8 encoded string
 	 *
 		// This is second, as behaviour of this varies only with PHP version (the middle part of this expression checks the encoding is supported).
 		elseif (function_exists('mb_convert_encoding') && ($return = SimplePie_Misc::change_encoding_mbstring($data, $input, $output)))
 		{
 			return $return;
 		}
+		// This is third, as behaviour of this varies with OS userland and PHP version
+		elseif (function_exists('iconv') && ($return = SimplePie_Misc::change_encoding_iconv($data, $input, $output)))
+		{
+			return $return;
+		}
 		// This is last, as behaviour of this varies with OS userland and PHP version
-		elseif (function_exists('iconv') && ($return = SimplePie_Misc::change_encoding_iconv($data, $input, $output)))
+		elseif (class_exists('\UConverter') && ($return = SimplePie_Misc::change_encoding_uconverter($data, $input, $output)))
 		{
 			return $return;
 		}
 		// If we can't do anything, just fail
-		else
+		return false;
-		{
-			return false;
-		}
 	}
 	protected static function change_encoding_mbstring($data, $input, $output)
 	{
 		if ($input === 'windows-949')
 	}
 	protected static function change_encoding_iconv($data, $input, $output)
 	{
 		return @iconv($input, $output, $data);
+	}
+	/**
+	 * @param string $data
+	 * @param string $input
+	 * @param string $output
+	 * @return string|false
+	 */
+	protected static function change_encoding_uconverter($data, $input, $output)
+	{
+		return @\UConverter::transcode($data, $output, $input);
 	}
 	/**
 	 * Normalize an encoding name
 	 *
 	{
 		if (($pos = strpos($mime, ';')) === false)
 		{
 			return trim($mime);
 		}
-		else
-		{
+		return trim(substr($mime, 0, $pos));
-			return trim(substr($mime, 0, $pos));
-		}
 	}
 	public static function atom_03_construct_type($attribs)
 	{
 		if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode']) === 'base64'))
 				default:
 					return SIMPLEPIE_CONSTRUCT_NONE | $mode;
 			}
 		}
-		else
-		{
+		return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
-			return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
-		}
 	}
 	public static function atom_10_construct_type($attribs)
 	{
 		if (isset($attribs['']['type']))
 			else
 			{
 				return SIMPLEPIE_CONSTRUCT_BASE64;
 			}
 		}
-		else
-		{
+		return SIMPLEPIE_CONSTRUCT_TEXT;
-			return SIMPLEPIE_CONSTRUCT_TEXT;
-		}
 	}
 	public static function is_isegment_nz_nc($string)
 	{
 		return (bool) preg_match('/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u', $string);
 	}
-	public static function space_seperated_tokens($string)
+	public static function space_separated_tokens($string)
 	{
 		$space_characters = "\x20\x09\x0A\x0B\x0C\x0D";
 		$string_length = strlen($string);
 		$position = strspn($string, $space_characters);
 		}
 		else if ($codepoint <= 0x10ffff)
 		{
 			return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
 		}
-		else
-		{
+		// U+FFFD REPLACEMENT CHARACTER
-			// U+FFFD REPLACEMENT CHARACTER
+		return "\xEF\xBF\xBD";
-			return "\xEF\xBF\xBD";
-		}
 	}
 	/**
 	 * Similar to parse_str()
 	 *
 		}
 		elseif (file_exists(dirname(__FILE__) . '/Core.php'))
 		{
 			return filemtime(dirname(__FILE__) . '/Core.php');
 		}
-		else
-		{
+		return filemtime(__FILE__);
-			return filemtime(__FILE__);
-		}
 	}
 	/**
 	 * Format debugging information
 	 */
 	public static function silence_errors($num, $str)
 	{
 		// No-op
 	}
 }

changeset 16	a86126ab1dd4
parent 0	d970ebf37754
child 18	be944660c56a