Changeset 5559 for trunk/src/includes/extend/akismet.php

Timestamp:

11/10/2014 06:09:14 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Update to newer slashing functions, as our minimum requirement is WordPress 3.6.

Also add filters to topic-title & topic-tags form fields. See #2719.

File:

• trunk/src/includes/extend/akismet.php (modified) (3 diffs)

trunk/src/includes/extend/akismet.php

@@ -395 +395 @@
                 // Ready...
                 foreach ( $post_data as $key => $data ) {
-                        $query_string .= $key . '=' . urlencode( stripslashes( $data ) ) . '&';
+                        $query_string .= $key . '=' . urlencode( wp_unslash( $data ) ) . '&';
                 }
 
@@ -626 +626 @@
 
                 // Preload required variables
-                $bbp_version    = bbp_get_version();
-                $content_length = strlen( $request );
-                $http_host      = $host;
-                $blog_charset   = get_option( 'blog_charset' );
-                $response       = '';
-                $errno          = null;
-                $errstr         = null;
+                $bbp_version  = bbp_get_version();
+                $http_host    = $host;
+                $blog_charset = get_option( 'blog_charset' );
+                $response     = '';
 
                 // Untque User Agent
@@ -643 +640 @@
                 }
 
-                // WP HTTP class is available
-                if ( function_exists( 'wp_remote_post' ) ) {
-
-                        // Setup the arguments
-                        $http_args = array(
-                                'body'             => $request,
-                                'headers'          => array(
-                                        'Content-Type' => 'application/x-www-form-urlencoded; charset=' . $blog_charset,
-                                        'Host'         => $host,
-                                        'User-Agent'   => $akismet_ua
-                                ),
-                                'httpversion'      => '1.0',
-                                'timeout'          => 15
-                        );
-
-                        // Where we are sending our request
-                        $akismet_url = 'http://' . $http_host . $path;
-
-                        // Send the request
-                        $response    = wp_remote_post( $akismet_url, $http_args );
-
-                        // Bail if the response is an error
-                        if ( is_wp_error( $response ) ) {
-                                return '';
-                        }
-
-                        // No errors so return response
-                        return array( $response['headers'], $response['body'] );
-
-                // WP HTTP class is not available (Why not?)
-                } else {
-
-                        // Header info to use with our socket
-                        $http_request  = "POST {$path} HTTP/1.0\r\n";
-                        $http_request .= "Host: {$host}\r\n";
-                        $http_request .= "Content-Type: application/x-www-form-urlencoded; charset={$blog_charset}\r\n";
-                        $http_request .= "Content-Length: {$content_length}\r\n";
-                        $http_request .= "User-Agent: {$akismet_ua}\r\n";
-                        $http_request .= "\r\n";
-                        $http_request .= $request;
-
-                        // Open a socket connection
-                        if ( false !== ( $fs = @fsockopen( $http_host, $port, $errno, $errstr, 10 ) ) ) {
-
-                                // Write our request to the pointer
-                                fwrite( $fs, $http_request );
-
-                                // Loop through pointer and compile a response
-                                while ( !feof( $fs ) ) {
-                                        // One TCP-IP packet at a time
-                                        $response .= fgets( $fs, 1160 );
-                                }
-
-                                // Close our socket
-                                fclose( $fs );
-
-                                // Explode the response into usable data
-                                $response = explode( "\r\n\r\n", $response, 2 );
-                        }
-
-                        // Return the response ('' if error/empty)
-                        return $response;
-                }
+                // Setup the arguments
+                $http_args = array(
+                        'body'             => $request,
+                        'headers'          => array(
+                                'Content-Type' => 'application/x-www-form-urlencoded; charset=' . $blog_charset,
+                                'Host'         => $host,
+                                'User-Agent'   => $akismet_ua
+                        ),
+                        'httpversion'      => '1.0',
+                        'timeout'          => 15
+                );
+
+                // Where we are sending our request
+                $akismet_url = 'http://' . $http_host . $path;
+
+                // Send the request
+                $response    = wp_remote_post( $akismet_url, $http_args );
+
+                // Bail if the response is an error
+                if ( is_wp_error( $response ) ) {
+                        return '';
+                }
+
+                // No errors so return response
+                return array( $response['headers'], $response['body'] );
         }