Changeset 3990

Timestamp:

07/06/2006 12:04:24 AM (18 years ago)

Author:

matt

Message:

Clean up how we address IP addresses throughout the code

Location:

trunk/wp-includes

Files:

• comment.php (modified) (2 diffs)
• functions.php (modified) (1 diff)
• vars.php (modified) (1 diff)

trunk/wp-includes/comment.php

@@ -322 +322 @@
 
     if ( ! isset($comment_author_IP) )
-        $comment_author_IP = $_SERVER['REMOTE_ADDR'];
+        $comment_author_IP = preg_replace( '/[^0-9., ]/', '',$_SERVER['REMOTE_ADDR'] );
     if ( ! isset($comment_date) )
         $comment_date = current_time('mysql');
@@ -366 +366 @@
     $commentdata['user_ID']         = (int) $commentdata['user_ID'];
 
-    $commentdata['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
+    $commentdata['comment_author_IP'] = preg_replace( '/[^0-9., ]/', '',$_SERVER['REMOTE_ADDR'] );
     $commentdata['comment_agent']     = $_SERVER['HTTP_USER_AGENT'];
 

trunk/wp-includes/functions.php

@@ -1013 +1013 @@
 function wp_proxy_check($ipnum) {
     if ( get_option('open_proxy_check') && isset($ipnum) ) {
+        $ipnum = preg_replace( '/([0-9]{1,3})\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/', '$1', $ipnum );
         $rev_ip = implode( '.', array_reverse( explode( '.', $ipnum ) ) );
         $lookup = $rev_ip . '.sbl-xbl.spamhaus.org.';

trunk/wp-includes/vars.php

@@ -34 +34 @@
 $is_apache = ( strstr($_SERVER['SERVER_SOFTWARE'], 'Apache') || strstr($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') ) ? 1 : 0;
 $is_IIS = strstr($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') ? 1 : 0;
-
-// On OS X Server, $_SERVER['REMOTE_ADDR'] is the server's address. Workaround this 
-// by using $_SERVER['HTTP_PC_REMOTE_ADDR'], which *is* the remote address.
-if ( isset($_SERVER['HTTP_PC_REMOTE_ADDR']) )
-    $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_PC_REMOTE_ADDR'];
 
 // if the config file does not provide the smilies array, let's define it here