Changeset 10687 for trunk/wp-includes/class-feed.php

Timestamp:

03/03/2009 05:41:01 PM (16 years ago)

Author:

ryan

Message:

Use WordPress HTTP class for SimplePie requests. Props DD32. fixes #9247

File:

• trunk/wp-includes/class-feed.php (modified) (7 diffs)

trunk/wp-includes/class-feed.php

@@ -3 +3 @@
 require_once (ABSPATH . WPINC . '/simplepie.inc');
 
-class WP_Feed_Cache extends SimplePie_Cache
-{
+class WP_Feed_Cache extends SimplePie_Cache {
     /**
      * Don't call the constructor. Please.
@@ -10 +9 @@
      * @access private
      */
-    function WP_Feed_Cache()
-    {
+    function WP_Feed_Cache() {
         trigger_error('Please call SimplePie_Cache::create() instead of the constructor', E_USER_ERROR);
     }
@@ -21 +19 @@
      * @access public
      */
-    function create($location, $filename, $extension)
-    {
+    function create($location, $filename, $extension) {
         return new WP_Feed_Cache_Transient($location, $filename, $extension);
     }
 }
 
-class WP_Feed_Cache_Transient
-{
+class WP_Feed_Cache_Transient {
     var $location;
     var $filename;
@@ -34 +30 @@
     var $name;
 
-    function WP_Feed_Cache_Transient($location, $filename, $extension)
-    {
+    function WP_Feed_Cache_Transient($location, $filename, $extension) {
         //$this->location = $location;
         //$this->filename = rawurlencode($filename);
@@ -44 +39 @@
     }
 
-    function save($data)
-    {
-        if (is_a($data, 'SimplePie'))
-        {
+    function save($data) {
+        if ( is_a($data, 'SimplePie') )
             $data = $data->data;
-        }
 
         set_transient($this->name, $data, 43200);
@@ -56 +48 @@
     }
 
-    function load()
-    {
+    function load() {
         return get_transient($this->name);
     }
 
-    function mtime()
-    {
+    function mtime() {
         return get_transient($this->mod_name);
     }
 
-    function touch()
-    {
+    function touch() {
         return set_transient($this->mod_name, time(), 43200);
     }
 
-    function unlink()
-    {
+    function unlink() {
         delete_transient($this->name);
         delete_transient($this->mod_name);
@@ -78 +66 @@
     }
 }
+
+class WP_SimplePie_File extends SimplePie_File {
+
+    function WP_SimplePie_File($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
+        $this->url = $url;
+        $this->timeout = $timeout;
+        $this->redirects = $redirects;
+        $this->headers = $headers;
+        $this->useragent = $useragent;
+
+        $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
+
+        if ( preg_match('/^http(s)?:\/\//i', $url) ) {
+            $args = array( 'timeout' => $this->timeout, 'redirection' => $this->redirects);
+
+            if ( !empty($this->headers) )
+                $args['headers'] = $this->headers;
+
+            if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
+                $args['user-agent'] = $this->useragent;
+
+            $res = wp_remote_request($url, $args);
+
+            if ( is_wp_error($res) ) {
+                $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'];
+            }
+        } else {
+            if ( ! $this->body = file_get_contents($url) ) {
+                $this->error = 'file_get_contents could not read the file';
+                $this->success = false;
+            }
+        }
+    }
+}