Ticket #4602: get_ip_address.patch

wp-includes/comment.php

@@ -337 +337 @@
        extract($commentdata, EXTR_SKIP);
 
        if ( ! isset($comment_author_IP) )
-               $comment_author_IP = preg_replace( '/[^0-9., ]/', '',$_SERVER['REMOTE_ADDR'] );
+               $comment_author_IP = preg_replace( '/[^0-9., ]/', '', wp_get_ip_address() );
        if ( ! isset($comment_date) )
                $comment_date = current_time('mysql');
        if ( ! isset($comment_date_gmt) )
@@ -392 +392 @@
        $commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
        $commentdata['user_ID']         = (int) $commentdata['user_ID'];
 
-       $commentdata['comment_author_IP'] = preg_replace( '/[^0-9., ]/', '',$_SERVER['REMOTE_ADDR'] );
+       $commentdata['comment_author_IP'] = preg_replace( '/[^0-9., ]/', '', wp_get_ip_address() );
        $commentdata['comment_agent']     = $_SERVER['HTTP_USER_AGENT'];
 
        $commentdata['comment_date']     = current_time('mysql');
@@ -816 +816 @@
                wp_cache_add($comment->comment_ID, $comment, 'comment');
 }
 
-?>
- No newline at end of file
+?>

wp-includes/functions.php

@@ -860 +860 @@
        return false;
 }
 
+/**
+ * Finds the IP address of the client. Works behind proxy servers that use
+ * the X-Forwarded-For header to build a chain of client IP addresses.
+ *
+ * @return string
+ */
+function wp_get_ip_address() {
+    if ($ip_address = $_SERVER["HTTP_X_FORWARDED_FOR"]) {
+        // IP addresses can be chained, separated with commas,
+        // we want the first one.
+        if (strpos($ip_address, ',') !== false) {
+            $ip_address = explode(',', $ip_address);
+            $ip_address = $ip_address[0];
+        }
+    }
+    else {
+        $ip_address = $_SERVER["REMOTE_ADDR"];
+    }
+
+    $ip_address = apply_filters('remote_ip_address', $ip_address);
+
+    return $ip_address;
+}
+
 function wp_mkdir_p($target) {
        // from php.net/mkdir user contributed notes
        if (file_exists($target)) {