Wordpress 3.5.2

[autoinstalls/wordpress.git] / wp-includes / class-feed.php

diff --git a/wp-includes/class-feed.php b/wp-includes/class-feed.php
index cff43a17e321310b084b2530952bc0ce1b54cfb5..491d775e144491eaf2e7156e65fd39cc79f83643 100644 (file)
--- a/wp-includes/class-feed.php
+++ b/wp-includes/class-feed.php
@@ -4,15 +4,6 @@ if ( !class_exists('SimplePie') )
        require_once (ABSPATH . WPINC . '/class-simplepie.php');
 
 class WP_Feed_Cache extends SimplePie_Cache {
        require_once (ABSPATH . WPINC . '/class-simplepie.php');
 
 class WP_Feed_Cache extends SimplePie_Cache {

-       /**
-        * Don't call the constructor. Please.
-        *
-        * @access private
-        */
-       function WP_Feed_Cache() {
-               trigger_error('Please call SimplePie_Cache::create() instead of the constructor', E_USER_ERROR);
-       }
-

        /**
         * Create a new SimplePie_Cache object
         *
        /**
         * Create a new SimplePie_Cache object
         *


@@ -29,7 +20,7 @@ class WP_Feed_Cache_Transient {
        var $mod_name;
        var $lifetime = 43200; //Default lifetime in cache of 12 hours
 
        var $mod_name;
        var $lifetime = 43200; //Default lifetime in cache of 12 hours
 

-       function WP_Feed_Cache_Transient($location, $filename, $extension) {
+       function __construct($location, $filename, $extension) {

                $this->name = 'feed_' . $filename;
                $this->mod_name = 'feed_mod_' . $filename;
                $this->lifetime = apply_filters('wp_feed_cache_transient_lifetime', $this->lifetime, $filename);
                $this->name = 'feed_' . $filename;
                $this->mod_name = 'feed_mod_' . $filename;
                $this->lifetime = apply_filters('wp_feed_cache_transient_lifetime', $this->lifetime, $filename);


@@ -65,7 +56,7 @@ class WP_Feed_Cache_Transient {
 
 class WP_SimplePie_File extends SimplePie_File {
 
 
 class WP_SimplePie_File extends SimplePie_File {
 

-       function WP_SimplePie_File($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
+       function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {

                $this->url = $url;
                $this->timeout = $timeout;
                $this->redirects = $redirects;
                $this->url = $url;
                $this->timeout = $timeout;
                $this->redirects = $redirects;


@@ -75,7 +66,11 @@ class WP_SimplePie_File extends SimplePie_File {
                $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
 
                if ( preg_match('/^http(s)?:\/\//i', $url) ) {
                $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
 
                if ( preg_match('/^http(s)?:\/\//i', $url) ) {

-                       $args = array( 'timeout' => $this->timeout, 'redirection' => $this->redirects);
+                       $args = array(
+                               'timeout' => $this->timeout,
+                               'redirection' => $this->redirects,
+                               'reject_unsafe_urls' => true,
+                       );

 
                        if ( !empty($this->headers) )
                                $args['headers'] = $this->headers;
 
                        if ( !empty($this->headers) )
                                $args['headers'] = $this->headers;


@@ -89,15 +84,48 @@ class WP_SimplePie_File extends SimplePie_File {
                                $this->error = 'WP HTTP Error: ' . $res->get_error_message();
                                $this->success = false;
                        } else {
                                $this->error = 'WP HTTP Error: ' . $res->get_error_message();
                                $this->success = false;
                        } else {

-                               $this->headers = $res['headers'];
-                               $this->body = $res['body'];
-                               $this->status_code = $res['response']['code'];
+                               $this->headers = wp_remote_retrieve_headers( $res );
+                               $this->body = wp_remote_retrieve_body( $res );
+                               $this->status_code = wp_remote_retrieve_response_code( $res );

                        }
                } else {
                        }
                } else {

-                       if ( ! $this->body = file_get_contents($url) ) {
-                               $this->error = 'file_get_contents could not read the file';
-                               $this->success = false;
+                       $this->error = '';
+                       $this->success = false;
+               }
+       }
+}
+
+/**
+ * WordPress SimplePie Sanitization Class
+ *
+ * Extension of the SimplePie_Sanitize class to use KSES, because
+ * we cannot universally count on DOMDocument being available
+ *
+ * @package WordPress
+ * @since 3.5.0
+ */
+class WP_SimplePie_Sanitize_KSES extends SimplePie_Sanitize {
+       public function sanitize( $data, $type, $base = '' ) {
+               $data = trim( $data );
+               if ( $type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML ) {
+                       if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data)) {
+                               $type |= SIMPLEPIE_CONSTRUCT_HTML;
+                       }
+                       else {
+                               $type |= SIMPLEPIE_CONSTRUCT_TEXT;
+                       }
+               }
+               if ( $type & SIMPLEPIE_CONSTRUCT_BASE64 ) {
+                       $data = base64_decode( $data );
+               }
+               if ( $type & ( SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML ) ) {
+                       $data = wp_kses_post( $data );
+                       if ( $this->output_encoding !== 'UTF-8' ) {
+                               $data = $this->registry->call( 'Misc', 'change_encoding', array( $data, 'UTF-8', $this->output_encoding ) );

                        }
                        }

+                       return $data;
+               } else {
+                       return parent::sanitize( $data, $type, $base );

                }
        }
                }
        }

-}
\ No newline at end of file
+}