Context Navigation

Changeset 880770

Timestamp:

03/24/2014 10:49:01 AM (12 years ago)

Author:

eoigal

Message:

add missing define used in activation, and just depend on remote_addr server variable when getting ip address

Location:

akismet/trunk

Files:

r878668	r880770
37	37
38	38	define( 'AKISMET_VERSION', '3.0' );
	39	define( 'AKISMET__MINIMUM_WP_VERSION', '3.0' );
39	40	define( 'AKISMET__PLUGIN_URL', plugin_dir_url( __FILE__ ) );
40	41	define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );

-                      r878796
+                      r880770
     public static function get_ip_address() {
+        foreach( array( 'HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP', 'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR' ) as $key ) {
+            if ( array_key_exists( $key, $_SERVER ) === true ) {
+                foreach ( explode( ',', $_SERVER[$key] ) as $ip ) {
+                    $ip = trim($ip);
+                    if ( filter_var( $ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) !== false ) {
+                        return $ip;
+                    }
+                }
+            }
+        }
+        return null;
+        return isset( $_SERVER['REMOTE_ADDR'] ) ? $_SERVER['REMOTE_ADDR'] : null;
+    }

Note: See TracChangeset for help on using the changeset viewer.