Upgrade SimplePie to 1.2.1. Props nacin. fixes #18309
git-svn-id: http://svn.automattic.com/wordpress/trunk@19890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
parent
3975e5e0d2
commit
b447ad26e6
|
|
@ -1,12 +1,12 @@
|
|||
<?php
|
||||
if ( !class_exists( 'SimplePie' ) ) :
|
||||
if ( ! class_exists( 'SimplePie' ) ) :
|
||||
/**
|
||||
* SimplePie
|
||||
*
|
||||
* A PHP-Based RSS and Atom Feed Framework.
|
||||
* Takes the hard work out of managing a complete RSS/Atom solution.
|
||||
*
|
||||
* Copyright (c) 2004-2009, Ryan Parman and Geoffrey Sneddon
|
||||
* Copyright (c) 2004-2011, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification, are
|
||||
|
|
@ -34,10 +34,11 @@ if ( !class_exists( 'SimplePie' ) ) :
|
|||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* @package SimplePie
|
||||
* @version 1.2
|
||||
* @copyright 2004-2009 Ryan Parman, Geoffrey Sneddon
|
||||
* @version 1.2.1
|
||||
* @copyright 2004-2011 Ryan Parman, Geoffrey Sneddon, Ryan McCue
|
||||
* @author Ryan Parman
|
||||
* @author Geoffrey Sneddon
|
||||
* @author Ryan McCue
|
||||
* @link http://simplepie.org/ SimplePie
|
||||
* @link http://simplepie.org/support/ Please submit all bug reports and feature requests to the SimplePie forums
|
||||
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
|
||||
|
|
@ -52,12 +53,12 @@ define('SIMPLEPIE_NAME', 'SimplePie');
|
|||
/**
|
||||
* SimplePie Version
|
||||
*/
|
||||
define('SIMPLEPIE_VERSION', '1.2');
|
||||
define('SIMPLEPIE_VERSION', '1.2.1');
|
||||
|
||||
/**
|
||||
* SimplePie Build
|
||||
*/
|
||||
define('SIMPLEPIE_BUILD', '20090627192103');
|
||||
define('SIMPLEPIE_BUILD', '20111015034325');
|
||||
|
||||
/**
|
||||
* SimplePie Website URL
|
||||
|
|
@ -1672,7 +1673,7 @@ class SimplePie
|
|||
$this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD);
|
||||
if (!$cache->save($this))
|
||||
{
|
||||
trigger_error("$this->cache_location is not writeable", E_USER_WARNING);
|
||||
trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
|
||||
}
|
||||
$cache = call_user_func(array($this->cache_class, 'create'), $this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc');
|
||||
}
|
||||
|
|
@ -1680,7 +1681,7 @@ class SimplePie
|
|||
}
|
||||
else
|
||||
{
|
||||
$this->error = "A feed could not be found at $this->feed_url";
|
||||
$this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
|
||||
SimplePie_Misc::error($this->error, E_USER_NOTICE, __FILE__, __LINE__);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1777,27 +1778,27 @@ class SimplePie
|
|||
// Cache the file if caching is enabled
|
||||
if ($cache && !$cache->save($this))
|
||||
{
|
||||
trigger_error("$cache->name is not writeable", E_USER_WARNING);
|
||||
trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->error = "A feed could not be found at $this->feed_url";
|
||||
$this->error = "A feed could not be found at $this->feed_url. This does not appear to be a valid RSS or Atom feed.";
|
||||
SimplePie_Misc::error($this->error, E_USER_NOTICE, __FILE__, __LINE__);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(isset($parser))
|
||||
if (isset($parser))
|
||||
{
|
||||
// We have an error, just set SimplePie_Misc::error to it and quit
|
||||
$this->error = sprintf('XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
|
||||
$this->error = sprintf('This XML document is invalid, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->error = 'The data could not be converted to UTF-8';
|
||||
$this->error = 'The data could not be converted to UTF-8. You MUST have either the iconv or mbstring extension installed. Upgrading to PHP 5.x (which includes iconv) is highly recommended.';
|
||||
}
|
||||
SimplePie_Misc::error($this->error, E_USER_NOTICE, __FILE__, __LINE__);
|
||||
return false;
|
||||
|
|
@ -1831,7 +1832,7 @@ class SimplePie
|
|||
}
|
||||
|
||||
/**
|
||||
* Return the error message for the occurred error
|
||||
* Return the error message for the occured error
|
||||
*
|
||||
* @access public
|
||||
* @return string Error message
|
||||
|
|
@ -1984,7 +1985,7 @@ class SimplePie
|
|||
}
|
||||
else
|
||||
{
|
||||
trigger_error("$cache->name is not writeable", E_USER_WARNING);
|
||||
trigger_error("$cache->name is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
|
||||
return $this->sanitize($favicon, SIMPLEPIE_CONSTRUCT_IRI);
|
||||
}
|
||||
}
|
||||
|
|
@ -2774,11 +2775,12 @@ class SimplePie
|
|||
|
||||
function get_latitude()
|
||||
{
|
||||
|
||||
if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
|
||||
{
|
||||
return (float) $return[0]['data'];
|
||||
}
|
||||
elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
|
||||
elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
|
||||
{
|
||||
return (float) $match[1];
|
||||
}
|
||||
|
|
@ -2798,7 +2800,7 @@ class SimplePie
|
|||
{
|
||||
return (float) $return[0]['data'];
|
||||
}
|
||||
elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
|
||||
elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
|
||||
{
|
||||
return (float) $match[2];
|
||||
}
|
||||
|
|
@ -3278,6 +3280,11 @@ class SimplePie_Item
|
|||
{
|
||||
return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
|
||||
}
|
||||
elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
|
||||
{
|
||||
return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
|
||||
}
|
||||
|
||||
elseif (!$description_only)
|
||||
{
|
||||
return $this->get_content(true);
|
||||
|
|
@ -3642,7 +3649,7 @@ class SimplePie_Item
|
|||
{
|
||||
return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
|
||||
}
|
||||
elseif (($date = $this->get_date('U')) !== null)
|
||||
elseif (($date = $this->get_date('U')) !== null && $date !== false)
|
||||
{
|
||||
return strftime($date_format, $date);
|
||||
}
|
||||
|
|
@ -4427,6 +4434,8 @@ class SimplePie_Item
|
|||
|
||||
// If we have media:group tags, loop through them.
|
||||
foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
|
||||
{
|
||||
if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
|
||||
{
|
||||
// If we have media:content tags, loop through them.
|
||||
foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
|
||||
|
|
@ -5046,13 +5055,14 @@ class SimplePie_Item
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If we have standalone media:content tags, loop through them.
|
||||
if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
|
||||
{
|
||||
foreach ((array) $this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
|
||||
{
|
||||
if (isset($content['attribs']['']['url']))
|
||||
if (isset($content['attribs']['']['url']) || isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
|
||||
{
|
||||
// Attributes
|
||||
$bitrate = null;
|
||||
|
|
@ -5137,8 +5147,10 @@ class SimplePie_Item
|
|||
{
|
||||
$width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
|
||||
}
|
||||
if (isset($content['attribs']['']['url']))
|
||||
{
|
||||
$url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
|
||||
|
||||
}
|
||||
// Checking the other optional media: elements. Priority: media:content, media:group, item, channel
|
||||
|
||||
// CAPTIONS
|
||||
|
|
@ -5580,7 +5592,7 @@ class SimplePie_Item
|
|||
{
|
||||
return (float) $return[0]['data'];
|
||||
}
|
||||
elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
|
||||
elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
|
||||
{
|
||||
return (float) $match[1];
|
||||
}
|
||||
|
|
@ -5600,7 +5612,7 @@ class SimplePie_Item
|
|||
{
|
||||
return (float) $return[0]['data'];
|
||||
}
|
||||
elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
|
||||
elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
|
||||
{
|
||||
return (float) $match[2];
|
||||
}
|
||||
|
|
@ -6223,7 +6235,7 @@ class SimplePie_Source
|
|||
{
|
||||
return (float) $return[0]['data'];
|
||||
}
|
||||
elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
|
||||
elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
|
||||
{
|
||||
return (float) $match[1];
|
||||
}
|
||||
|
|
@ -6243,7 +6255,7 @@ class SimplePie_Source
|
|||
{
|
||||
return (float) $return[0]['data'];
|
||||
}
|
||||
elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
|
||||
elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
|
||||
{
|
||||
return (float) $match[2];
|
||||
}
|
||||
|
|
@ -7727,16 +7739,17 @@ class SimplePie_File
|
|||
{
|
||||
$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
|
||||
$url_parts = parse_url($url);
|
||||
$socket_host = $url_parts['host'];
|
||||
if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https')
|
||||
{
|
||||
$url_parts['host'] = "ssl://$url_parts[host]";
|
||||
$socket_host = "ssl://$url_parts[host]";
|
||||
$url_parts['port'] = 443;
|
||||
}
|
||||
if (!isset($url_parts['port']))
|
||||
{
|
||||
$url_parts['port'] = 80;
|
||||
}
|
||||
$fp = @fsockopen($url_parts['host'], $url_parts['port'], $errno, $errstr, $timeout);
|
||||
$fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
|
||||
if (!$fp)
|
||||
{
|
||||
$this->error = 'fsockopen error: ' . $errstr;
|
||||
|
|
@ -8482,7 +8495,7 @@ class SimplePie_gzdecode
|
|||
|
||||
// Get the length of the extra field
|
||||
$len = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
|
||||
$position += 2;
|
||||
$this->position += 2;
|
||||
|
||||
// Check the length of the string is still valid
|
||||
$this->min_compressed_size += $len + 4;
|
||||
|
|
@ -9234,8 +9247,25 @@ class SimplePie_Misc
|
|||
$note = 'Unknown Error';
|
||||
break;
|
||||
}
|
||||
error_log("$note: $message in $file on line $line", 0);
|
||||
|
||||
$log_error = true;
|
||||
if (!function_exists('error_log'))
|
||||
{
|
||||
$log_error = false;
|
||||
}
|
||||
|
||||
$log_file = @ini_get('error_log');
|
||||
if (!empty($log_file) && ('syslog' != $log_file) && !@is_writable($log_file))
|
||||
{
|
||||
$log_error = false;
|
||||
}
|
||||
|
||||
if ($log_error)
|
||||
{
|
||||
@error_log("$note: $message in $file on line $line", 0);
|
||||
}
|
||||
}
|
||||
|
||||
return $message;
|
||||
}
|
||||
|
||||
|
|
@ -9432,7 +9462,7 @@ class SimplePie_Misc
|
|||
return SimplePie_Misc::windows_1252_to_utf8($data);
|
||||
}
|
||||
// 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') && @mb_convert_encoding("\x80", 'UTF-16BE', $input) !== "\x00\x80" && ($return = @mb_convert_encoding($data, $output, $input)))
|
||||
elseif (function_exists('mb_convert_encoding') && @mb_convert_encoding("\x80", 'UTF-16BE', $input) !== "\x00\x80" && in_array($input, mb_list_encodings()) && ($return = @mb_convert_encoding($data, $output, $input)))
|
||||
{
|
||||
return $return;
|
||||
}
|
||||
|
|
@ -9448,6 +9478,17 @@ class SimplePie_Misc
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Normalize an encoding name
|
||||
*
|
||||
* This is automatically generated by create.php
|
||||
*
|
||||
* To generate it, run `php create.php` on the command line, and copy the
|
||||
* output to replace this function.
|
||||
*
|
||||
* @param string $charset Character set to standardise
|
||||
* @return string Standardised name
|
||||
*/
|
||||
function encoding($charset)
|
||||
{
|
||||
// Normalization from UTS #22
|
||||
|
|
@ -9481,7 +9522,6 @@ class SimplePie_Misc
|
|||
|
||||
case 'big5':
|
||||
case 'csbig5':
|
||||
case 'xxbig5':
|
||||
return 'Big5';
|
||||
|
||||
case 'big5hkscs':
|
||||
|
|
@ -9637,14 +9677,14 @@ class SimplePie_Misc
|
|||
case 'isoir85':
|
||||
return 'ES2';
|
||||
|
||||
case 'cseucfixwidjapanese':
|
||||
case 'extendedunixcodefixedwidthforjapanese':
|
||||
return 'Extended_UNIX_Code_Fixed_Width_for_Japanese';
|
||||
|
||||
case 'cseucpkdfmtjapanese':
|
||||
case 'eucjp':
|
||||
case 'extendedunixcodepackedformatforjapanese':
|
||||
return 'Extended_UNIX_Code_Packed_Format_for_Japanese';
|
||||
return 'EUC-JP';
|
||||
|
||||
case 'cseucfixwidjapanese':
|
||||
case 'extendedunixcodefixedwidthforjapanese':
|
||||
return 'Extended_UNIX_Code_Fixed_Width_for_Japanese';
|
||||
|
||||
case 'gb18030':
|
||||
return 'GB18030';
|
||||
|
|
@ -9723,80 +9763,6 @@ class SimplePie_Misc
|
|||
case 'ibmthai':
|
||||
return 'IBM-Thai';
|
||||
|
||||
case 'ccsid858':
|
||||
case 'cp858':
|
||||
case 'ibm858':
|
||||
case 'pcmultilingual850euro':
|
||||
return 'IBM00858';
|
||||
|
||||
case 'ccsid924':
|
||||
case 'cp924':
|
||||
case 'ebcdiclatin9euro':
|
||||
case 'ibm924':
|
||||
return 'IBM00924';
|
||||
|
||||
case 'ccsid1140':
|
||||
case 'cp1140':
|
||||
case 'ebcdicus37euro':
|
||||
case 'ibm1140':
|
||||
return 'IBM01140';
|
||||
|
||||
case 'ccsid1141':
|
||||
case 'cp1141':
|
||||
case 'ebcdicde273euro':
|
||||
case 'ibm1141':
|
||||
return 'IBM01141';
|
||||
|
||||
case 'ccsid1142':
|
||||
case 'cp1142':
|
||||
case 'ebcdicdk277euro':
|
||||
case 'ebcdicno277euro':
|
||||
case 'ibm1142':
|
||||
return 'IBM01142';
|
||||
|
||||
case 'ccsid1143':
|
||||
case 'cp1143':
|
||||
case 'ebcdicfi278euro':
|
||||
case 'ebcdicse278euro':
|
||||
case 'ibm1143':
|
||||
return 'IBM01143';
|
||||
|
||||
case 'ccsid1144':
|
||||
case 'cp1144':
|
||||
case 'ebcdicit280euro':
|
||||
case 'ibm1144':
|
||||
return 'IBM01144';
|
||||
|
||||
case 'ccsid1145':
|
||||
case 'cp1145':
|
||||
case 'ebcdices284euro':
|
||||
case 'ibm1145':
|
||||
return 'IBM01145';
|
||||
|
||||
case 'ccsid1146':
|
||||
case 'cp1146':
|
||||
case 'ebcdicgb285euro':
|
||||
case 'ibm1146':
|
||||
return 'IBM01146';
|
||||
|
||||
case 'ccsid1147':
|
||||
case 'cp1147':
|
||||
case 'ebcdicfr297euro':
|
||||
case 'ibm1147':
|
||||
return 'IBM01147';
|
||||
|
||||
case 'ccsid1148':
|
||||
case 'cp1148':
|
||||
case 'ebcdicinternational500euro':
|
||||
case 'ibm1148':
|
||||
return 'IBM01148';
|
||||
|
||||
case 'ccsid1149':
|
||||
case 'cp1149':
|
||||
case 'ebcdicis871euro':
|
||||
case 'ibm1149':
|
||||
return 'IBM01149';
|
||||
|
||||
case 'cp37':
|
||||
case 'csibm37':
|
||||
case 'ebcdiccpca':
|
||||
|
|
@ -9944,6 +9910,12 @@ class SimplePie_Misc
|
|||
case 'ibm857':
|
||||
return 'IBM857';
|
||||
|
||||
case 'ccsid858':
|
||||
case 'cp858':
|
||||
case 'ibm858':
|
||||
case 'pcmultilingual850euro':
|
||||
return 'IBM00858';
|
||||
|
||||
case '860':
|
||||
case 'cp860':
|
||||
case 'csibm860':
|
||||
|
|
@ -10046,6 +10018,12 @@ class SimplePie_Misc
|
|||
case 'ibm918':
|
||||
return 'IBM918';
|
||||
|
||||
case 'ccsid924':
|
||||
case 'cp924':
|
||||
case 'ebcdiclatin9euro':
|
||||
case 'ibm924':
|
||||
return 'IBM00924';
|
||||
|
||||
case 'cp1026':
|
||||
case 'csibm1026':
|
||||
case 'ibm1026':
|
||||
|
|
@ -10054,6 +10032,68 @@ class SimplePie_Misc
|
|||
case 'ibm1047':
|
||||
return 'IBM1047';
|
||||
|
||||
case 'ccsid1140':
|
||||
case 'cp1140':
|
||||
case 'ebcdicus37euro':
|
||||
case 'ibm1140':
|
||||
return 'IBM01140';
|
||||
|
||||
case 'ccsid1141':
|
||||
case 'cp1141':
|
||||
case 'ebcdicde273euro':
|
||||
case 'ibm1141':
|
||||
return 'IBM01141';
|
||||
|
||||
case 'ccsid1142':
|
||||
case 'cp1142':
|
||||
case 'ebcdicdk277euro':
|
||||
case 'ebcdicno277euro':
|
||||
case 'ibm1142':
|
||||
return 'IBM01142';
|
||||
|
||||
case 'ccsid1143':
|
||||
case 'cp1143':
|
||||
case 'ebcdicfi278euro':
|
||||
case 'ebcdicse278euro':
|
||||
case 'ibm1143':
|
||||
return 'IBM01143';
|
||||
|
||||
case 'ccsid1144':
|
||||
case 'cp1144':
|
||||
case 'ebcdicit280euro':
|
||||
case 'ibm1144':
|
||||
return 'IBM01144';
|
||||
|
||||
case 'ccsid1145':
|
||||
case 'cp1145':
|
||||
case 'ebcdices284euro':
|
||||
case 'ibm1145':
|
||||
return 'IBM01145';
|
||||
|
||||
case 'ccsid1146':
|
||||
case 'cp1146':
|
||||
case 'ebcdicgb285euro':
|
||||
case 'ibm1146':
|
||||
return 'IBM01146';
|
||||
|
||||
case 'ccsid1147':
|
||||
case 'cp1147':
|
||||
case 'ebcdicfr297euro':
|
||||
case 'ibm1147':
|
||||
return 'IBM01147';
|
||||
|
||||
case 'ccsid1148':
|
||||
case 'cp1148':
|
||||
case 'ebcdicinternational500euro':
|
||||
case 'ibm1148':
|
||||
return 'IBM01148';
|
||||
|
||||
case 'ccsid1149':
|
||||
case 'cp1149':
|
||||
case 'ebcdicis871euro':
|
||||
case 'ibm1149':
|
||||
return 'IBM01149';
|
||||
|
||||
case 'csiso143iecp271':
|
||||
case 'iecp271':
|
||||
case 'isoir143':
|
||||
|
|
@ -10596,11 +10636,6 @@ class SimplePie_Misc
|
|||
case 'sen850200c':
|
||||
return 'SEN_850200_C';
|
||||
|
||||
case 'csshiftjis':
|
||||
case 'mskanji':
|
||||
case 'shiftjis':
|
||||
return 'Shift_JIS';
|
||||
|
||||
case 'csiso102t617bit':
|
||||
case 'isoir102':
|
||||
case 't617bit':
|
||||
|
|
@ -10699,7 +10734,10 @@ class SimplePie_Misc
|
|||
case 'viscii':
|
||||
return 'VISCII';
|
||||
|
||||
case 'csshiftjis':
|
||||
case 'cswindows31j':
|
||||
case 'mskanji':
|
||||
case 'shiftjis':
|
||||
case 'windows31j':
|
||||
return 'Windows-31J';
|
||||
|
||||
|
|
@ -11360,6 +11398,58 @@ function embed_wmedia(width, height, link) {
|
|||
}
|
||||
<?php
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Format debugging information
|
||||
*/
|
||||
function debug($sp)
|
||||
{
|
||||
$info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n";
|
||||
$info .= 'PHP ' . PHP_VERSION . "\n";
|
||||
if ($sp->error() !== null)
|
||||
{
|
||||
$info .= 'Error occurred: ' . $sp->error() . "\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
$info .= "No error found.\n";
|
||||
}
|
||||
$info .= "Extensions:\n";
|
||||
$extensions = array('pcre', 'curl', 'zlib', 'mbstring', 'iconv', 'xmlreader', 'xml');
|
||||
foreach ($extensions as $ext)
|
||||
{
|
||||
if (extension_loaded($ext))
|
||||
{
|
||||
$info .= " $ext loaded\n";
|
||||
switch ($ext)
|
||||
{
|
||||
case 'pcre':
|
||||
$info .= ' Version ' . PCRE_VERSION . "\n";
|
||||
break;
|
||||
case 'curl':
|
||||
$version = curl_version();
|
||||
$info .= ' Version ' . $version['version'] . "\n";
|
||||
break;
|
||||
case 'mbstring':
|
||||
$info .= ' Overloading: ' . mb_get_info('func_overload') . "\n";
|
||||
break;
|
||||
case 'iconv':
|
||||
$info .= ' Version ' . ICONV_VERSION . "\n";
|
||||
break;
|
||||
case 'xml':
|
||||
$info .= ' Version ' . LIBXML_DOTTED_VERSION . "\n";
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$info .= " $ext not loaded\n";
|
||||
}
|
||||
}
|
||||
return $info;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -11831,14 +11921,135 @@ class SimplePie_IRI
|
|||
/**
|
||||
* Replace invalid character with percent encoding
|
||||
*
|
||||
* @access private
|
||||
* @param string $string Input string
|
||||
* @param string $valid_chars Valid characters
|
||||
* @param int $case Normalise case
|
||||
* @return string
|
||||
*/
|
||||
function replace_invalid_with_pct_encoding($string, $valid_chars, $case = SIMPLEPIE_SAME_CASE)
|
||||
function replace_invalid_with_pct_encoding($string, $valid_chars, $case = SIMPLEPIE_SAME_CASE, $iprivate = false)
|
||||
{
|
||||
// Normalize as many pct-encoded sections as possible
|
||||
$string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array(&$this, 'remove_iunreserved_percent_encoded'), $string);
|
||||
|
||||
// Replace invalid percent characters
|
||||
$string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
|
||||
|
||||
// Add unreserved and % to $valid_chars (the latter is safe because all
|
||||
// pct-encoded sections are now valid).
|
||||
$valid_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%';
|
||||
|
||||
// Now replace any bytes that aren't allowed with their pct-encoded versions
|
||||
$position = 0;
|
||||
$strlen = strlen($string);
|
||||
while (($position += strspn($string, $valid_chars, $position)) < $strlen)
|
||||
{
|
||||
$value = ord($string[$position]);
|
||||
|
||||
// Start position
|
||||
$start = $position;
|
||||
|
||||
// By default we are valid
|
||||
$valid = true;
|
||||
|
||||
// No one byte sequences are valid due to the while.
|
||||
// Two byte sequence:
|
||||
if (($value & 0xE0) === 0xC0)
|
||||
{
|
||||
$character = ($value & 0x1F) << 6;
|
||||
$length = 2;
|
||||
$remaining = 1;
|
||||
}
|
||||
// Three byte sequence:
|
||||
elseif (($value & 0xF0) === 0xE0)
|
||||
{
|
||||
$character = ($value & 0x0F) << 12;
|
||||
$length = 3;
|
||||
$remaining = 2;
|
||||
}
|
||||
// Four byte sequence:
|
||||
elseif (($value & 0xF8) === 0xF0)
|
||||
{
|
||||
$character = ($value & 0x07) << 18;
|
||||
$length = 4;
|
||||
$remaining = 3;
|
||||
}
|
||||
// Invalid byte:
|
||||
else
|
||||
{
|
||||
$valid = false;
|
||||
$length = 1;
|
||||
$remaining = 0;
|
||||
}
|
||||
|
||||
if ($remaining)
|
||||
{
|
||||
if ($position + $length <= $strlen)
|
||||
{
|
||||
for ($position++; $remaining; $position++)
|
||||
{
|
||||
$value = ord($string[$position]);
|
||||
|
||||
// Check that the byte is valid, then add it to the character:
|
||||
if (($value & 0xC0) === 0x80)
|
||||
{
|
||||
$character |= ($value & 0x3F) << (--$remaining * 6);
|
||||
}
|
||||
// If it is invalid, count the sequence as invalid and reprocess the current byte:
|
||||
else
|
||||
{
|
||||
$valid = false;
|
||||
$position--;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$position = $strlen - 1;
|
||||
$valid = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Percent encode anything invalid or not in ucschar
|
||||
if (
|
||||
// Invalid sequences
|
||||
!$valid
|
||||
// Non-shortest form sequences are invalid
|
||||
|| $length > 1 && $character <= 0x7F
|
||||
|| $length > 2 && $character <= 0x7FF
|
||||
|| $length > 3 && $character <= 0xFFFF
|
||||
// Outside of range of ucschar codepoints
|
||||
// Noncharacters
|
||||
|| ($character & 0xFFFE) === 0xFFFE
|
||||
|| $character >= 0xFDD0 && $character <= 0xFDEF
|
||||
|| (
|
||||
// Everything else not in ucschar
|
||||
$character > 0xD7FF && $character < 0xF900
|
||||
|| $character < 0xA0
|
||||
|| $character > 0xEFFFD
|
||||
)
|
||||
&& (
|
||||
// Everything not in iprivate, if it applies
|
||||
!$iprivate
|
||||
|| $character < 0xE000
|
||||
|| $character > 0x10FFFD
|
||||
)
|
||||
)
|
||||
{
|
||||
// If we were a character, pretend we weren't, but rather an error.
|
||||
if ($valid)
|
||||
$position--;
|
||||
|
||||
for ($j = $start; $j <= $position; $j++)
|
||||
{
|
||||
$string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
|
||||
$j += 2;
|
||||
$position += 2;
|
||||
$strlen += 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Normalise case
|
||||
if ($case & SIMPLEPIE_LOWERCASE)
|
||||
{
|
||||
|
|
@ -11849,61 +12060,148 @@ class SimplePie_IRI
|
|||
$string = strtoupper($string);
|
||||
}
|
||||
|
||||
// Store position and string length (to avoid constantly recalculating this)
|
||||
$position = 0;
|
||||
$strlen = strlen($string);
|
||||
|
||||
// Loop as long as we have invalid characters, advancing the position to the next invalid character
|
||||
while (($position += strspn($string, $valid_chars, $position)) < $strlen)
|
||||
{
|
||||
// If we have a % character
|
||||
if ($string[$position] === '%')
|
||||
{
|
||||
// If we have a pct-encoded section
|
||||
if ($position + 2 < $strlen && strspn($string, '0123456789ABCDEFabcdef', $position + 1, 2) === 2)
|
||||
{
|
||||
// Get the the represented character
|
||||
$chr = chr(hexdec(substr($string, $position + 1, 2)));
|
||||
|
||||
// If the character is valid, replace the pct-encoded with the actual character while normalising case
|
||||
if (strpos($valid_chars, $chr) !== false)
|
||||
{
|
||||
if ($case & SIMPLEPIE_LOWERCASE)
|
||||
{
|
||||
$chr = strtolower($chr);
|
||||
}
|
||||
elseif ($case & SIMPLEPIE_UPPERCASE)
|
||||
{
|
||||
$chr = strtoupper($chr);
|
||||
}
|
||||
$string = substr_replace($string, $chr, $position, 3);
|
||||
$strlen -= 2;
|
||||
$position++;
|
||||
return $string;
|
||||
}
|
||||
|
||||
// Otherwise just normalise the pct-encoded to uppercase
|
||||
/**
|
||||
* Callback function for preg_replace_callback.
|
||||
*
|
||||
* Removes sequences of percent encoded bytes that represent UTF-8
|
||||
* encoded characters in iunreserved
|
||||
*
|
||||
* @access private
|
||||
* @param array $match PCRE match
|
||||
* @return string Replacement
|
||||
*/
|
||||
function remove_iunreserved_percent_encoded($match)
|
||||
{
|
||||
// As we just have valid percent encoded sequences we can just explode
|
||||
// and ignore the first member of the returned array (an empty string).
|
||||
$bytes = explode('%', $match[0]);
|
||||
|
||||
// Initialize the new string (this is what will be returned) and that
|
||||
// there are no bytes remaining in the current sequence (unsurprising
|
||||
// at the first byte!).
|
||||
$string = '';
|
||||
$remaining = 0;
|
||||
|
||||
// Loop over each and every byte, and set $value to its value
|
||||
for ($i = 1, $len = count($bytes); $i < $len; $i++)
|
||||
{
|
||||
$value = hexdec($bytes[$i]);
|
||||
|
||||
// If we're the first byte of sequence:
|
||||
if (!$remaining)
|
||||
{
|
||||
// Start position
|
||||
$start = $i;
|
||||
|
||||
// By default we are valid
|
||||
$valid = true;
|
||||
|
||||
// One byte sequence:
|
||||
if ($value <= 0x7F)
|
||||
{
|
||||
$character = $value;
|
||||
$length = 1;
|
||||
}
|
||||
// Two byte sequence:
|
||||
elseif (($value & 0xE0) === 0xC0)
|
||||
{
|
||||
$character = ($value & 0x1F) << 6;
|
||||
$length = 2;
|
||||
$remaining = 1;
|
||||
}
|
||||
// Three byte sequence:
|
||||
elseif (($value & 0xF0) === 0xE0)
|
||||
{
|
||||
$character = ($value & 0x0F) << 12;
|
||||
$length = 3;
|
||||
$remaining = 2;
|
||||
}
|
||||
// Four byte sequence:
|
||||
elseif (($value & 0xF8) === 0xF0)
|
||||
{
|
||||
$character = ($value & 0x07) << 18;
|
||||
$length = 4;
|
||||
$remaining = 3;
|
||||
}
|
||||
// Invalid byte:
|
||||
else
|
||||
{
|
||||
$string = substr_replace($string, strtoupper(substr($string, $position + 1, 2)), $position + 1, 2);
|
||||
$position += 3;
|
||||
$valid = false;
|
||||
$remaining = 0;
|
||||
}
|
||||
}
|
||||
// If we don't have a pct-encoded section, just replace the % with its own esccaped form
|
||||
// Continuation byte:
|
||||
else
|
||||
{
|
||||
$string = substr_replace($string, '%25', $position, 1);
|
||||
$strlen += 2;
|
||||
$position += 3;
|
||||
// Check that the byte is valid, then add it to the character:
|
||||
if (($value & 0xC0) === 0x80)
|
||||
{
|
||||
$remaining--;
|
||||
$character |= ($value & 0x3F) << ($remaining * 6);
|
||||
}
|
||||
}
|
||||
// If we have an invalid character, change into its pct-encoded form
|
||||
// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
|
||||
else
|
||||
{
|
||||
$replacement = sprintf("%%%02X", ord($string[$position]));
|
||||
$string = str_replace($string[$position], $replacement, $string);
|
||||
$strlen = strlen($string);
|
||||
$valid = false;
|
||||
$remaining = 0;
|
||||
$i--;
|
||||
}
|
||||
}
|
||||
|
||||
// If we've reached the end of the current byte sequence, append it to Unicode::$data
|
||||
if (!$remaining)
|
||||
{
|
||||
// Percent encode anything invalid or not in iunreserved
|
||||
if (
|
||||
// Invalid sequences
|
||||
!$valid
|
||||
// Non-shortest form sequences are invalid
|
||||
|| $length > 1 && $character <= 0x7F
|
||||
|| $length > 2 && $character <= 0x7FF
|
||||
|| $length > 3 && $character <= 0xFFFF
|
||||
// Outside of range of iunreserved codepoints
|
||||
|| $character < 0x2D
|
||||
|| $character > 0xEFFFD
|
||||
// Noncharacters
|
||||
|| ($character & 0xFFFE) === 0xFFFE
|
||||
|| $character >= 0xFDD0 && $character <= 0xFDEF
|
||||
// Everything else not in iunreserved (this is all BMP)
|
||||
|| $character === 0x2F
|
||||
|| $character > 0x39 && $character < 0x41
|
||||
|| $character > 0x5A && $character < 0x61
|
||||
|| $character > 0x7A && $character < 0x7E
|
||||
|| $character > 0x7E && $character < 0xA0
|
||||
|| $character > 0xD7FF && $character < 0xF900
|
||||
)
|
||||
{
|
||||
for ($j = $start; $j <= $i; $j++)
|
||||
{
|
||||
$string .= '%' . strtoupper($bytes[$j]);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for ($j = $start; $j <= $i; $j++)
|
||||
{
|
||||
$string .= chr(hexdec($bytes[$j]));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If we have any bytes left over they are invalid (i.e., we are
|
||||
// mid-way through a multi-byte sequence)
|
||||
if ($remaining)
|
||||
{
|
||||
for ($j = $start; $j < $len; $j++)
|
||||
{
|
||||
$string .= '%' . strtoupper($bytes[$j]);
|
||||
}
|
||||
}
|
||||
|
||||
return $string;
|
||||
}
|
||||
|
||||
|
|
@ -12130,7 +12428,7 @@ class SimplePie_IRI
|
|||
}
|
||||
else
|
||||
{
|
||||
$this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$&\'()*+,;=:@/?');
|
||||
$this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$\'()*+,;:@/?&=');
|
||||
}
|
||||
$this->valid[__FUNCTION__] = true;
|
||||
return true;
|
||||
|
|
@ -13933,7 +14231,7 @@ class SimplePie_XML_Declaration_Parser
|
|||
}
|
||||
else
|
||||
{
|
||||
$this->state = 'standalone_name';
|
||||
$this->state = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -13947,7 +14245,7 @@ class SimplePie_XML_Declaration_Parser
|
|||
}
|
||||
else
|
||||
{
|
||||
$this->state = false;
|
||||
$this->state = 'standalone_name';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -14425,7 +14723,7 @@ class SimplePie_Parser
|
|||
case constant('XMLReader::END_ELEMENT'):
|
||||
if ($xml->namespaceURI !== '')
|
||||
{
|
||||
$tagName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
|
||||
$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -14437,7 +14735,7 @@ class SimplePie_Parser
|
|||
$empty = $xml->isEmptyElement;
|
||||
if ($xml->namespaceURI !== '')
|
||||
{
|
||||
$tagName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
|
||||
$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -14448,7 +14746,7 @@ class SimplePie_Parser
|
|||
{
|
||||
if ($xml->namespaceURI !== '')
|
||||
{
|
||||
$attrName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
|
||||
$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -14913,7 +15211,7 @@ class SimplePie_Sanitize
|
|||
}
|
||||
else
|
||||
{
|
||||
trigger_error("$this->cache_location is not writeable", E_USER_WARNING);
|
||||
trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue