Changeset 33062 for trunk/src/wp-admin/includes/class-wp-press-this.php

Timestamp:

07/03/2015 12:00:10 PM (9 years ago)

Author:

dd32

Message:

Press This: Rewrite WP_Press_This::fetch_source_html() to utilise the HTTP API better without the need for a local temporary file.
This reverts [33061] but keeps it's custom UA string.

See #32864

File:

• trunk/src/wp-admin/includes/class-wp-press-this.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-wp-press-this.php

@@ -257 +257 @@
      */
     public function fetch_source_html( $url ) {
-        // Download source page to tmp file.
-        $source_tmp_file = ( ! empty( $url ) ) ? download_url( $url, 30 ) : '';
-        $source_content  = '';
-
-        if ( ! is_wp_error( $source_tmp_file ) && file_exists( $source_tmp_file ) ) {
-
-            // Get the content of the source page from the tmp file..
-            $source_content = wp_kses(
-                @file_get_contents( $source_tmp_file ),
-                array(
-                    'img' => array(
-                        'src'      => array(),
-                        'width'    => array(),
-                        'height'   => array(),
-                    ),
-                    'iframe' => array(
-                        'src'      => array(),
-                    ),
-                    'link' => array(
-                        'rel'      => array(),
-                        'itemprop' => array(),
-                        'href'     => array(),
-                    ),
-                    'meta' => array(
-                        'property' => array(),
-                        'name'     => array(),
-                        'content'  => array(),
-                    )
-                )
-            );
-
-            // All done with backward compatibility. Let's do some cleanup, for good measure :)
-            unlink( $source_tmp_file );
-
-        } else if ( is_wp_error( $source_tmp_file ) ) {
-            $source_content = new WP_Error( 'upload-error',  sprintf( __( 'ERROR: %s' ), sprintf( __( 'Could not download the source URL (native error: %s).' ), $source_tmp_file->get_error_message() ) ) );
-        } else if ( ! file_exists( $source_tmp_file ) ) {
-            $source_content = new WP_Error( 'no-local-file',  sprintf( __( 'ERROR: %s' ), __( 'Could not save or locate the temporary download file for the source URL.' ) ) );
-        }
+        global $wp_version;
+
+        if ( empty( $url ) ) {
+            return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
+        }
+
+        $remote_url = wp_safe_remote_get( $url, array(
+            'timeout' => 30,
+            // Use an explicit user-agent for Press This
+            'user-agent' => 'Press This (WordPress/' . $wp_version . '); ' . get_bloginfo( 'url' )
+        ) );
+
+        if ( is_wp_error( $remote_url ) ) {
+            return $remote_url;
+        }
+
+        $useful_html_elements = array(
+            'img' => array(
+                'src'      => true,
+                'width'    => true,
+                'height'   => true,
+            ),
+            'iframe' => array(
+                'src'      => true,
+            ),
+            'link' => array(
+                'rel'      => true,
+                'itemprop' => true,
+                'href'     => true,
+            ),
+            'meta' => array(
+                'property' => true,
+                'name'     => true,
+                'content'  => true,
+            )
+        );
+
+        $source_content = wp_remote_retrieve_body( $remote_url );
+        $source_content = wp_kses( $source_content, $useful_html_elements );
 
         return $source_content;
@@ -1169 +1169 @@
 
     /**
-     * Sets the user agent used for Press This HTTP requests.
-     *
-     * @since 4.3.0
-     * @access public
-     *
-     * @global string $wp_version
-     *
-     * @return string User agent.
-     */
-    public function ua_string() {
-        global $wp_version;
-
-        $user_agent = 'Press This (WordPress/' . $wp_version . '); ' . get_bloginfo( 'url' );
-
-        return $user_agent;
-    }
-
-    /**
      * Serves the app's base HTML, which in turns calls the load script.
      *
@@ -1198 +1180 @@
     public function html() {
         global $wp_locale, $wp_version;
-
-        // Set explicit user-agent for the $data outbound HTTP requests.
-        add_filter( 'http_headers_useragent', array( $this, 'ua_string' ) );
 
         // Get data, new (POST) and old (GET).