From 8ef02e5ec7a0862e49d7eac623b071b14da3cec0 Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@automattic.com>
Date: Thu, 18 May 2017 17:34:42 +0000
Subject: [PATCH] Dashboard: Combine methods to retreive IP

They're only used in one place, no reason to be so verbose about it.

See #40702.

Built from https://develop.svn.wordpress.org/trunk@40781


git-svn-id: http://core.svn.wordpress.org/trunk@40639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../includes/class-wp-community-events.php    | 51 +++++++------------
 wp-includes/version.php                       |  2 +-
 2 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/wp-admin/includes/class-wp-community-events.php b/wp-admin/includes/class-wp-community-events.php
index 24a9860bd0..e27e731fff 100644
--- a/wp-admin/includes/class-wp-community-events.php
+++ b/wp-admin/includes/class-wp-community-events.php
@@ -156,7 +156,7 @@ class WP_Community_Events {
 		$api_url = 'https://api.wordpress.org/events/1.0/';
 		$args    = array(
 			'number' => 5, // Get more than three in case some get trimmed out.
-			'ip'     => $this->maybe_anonymize_ip_address( $this->get_unsafe_client_ip() ),
+			'ip'     => $this->get_client_ip(),
 		);
 
 		/*
@@ -182,7 +182,11 @@ class WP_Community_Events {
 	}
 
 	/**
-	 * Determines the user's actual IP address, if possible.
+	 * Determines the user's actual IP address and attempts to partially
+	 * anonymize an IP address by converting it to a network ID.
+	 *
+	 * Geolocating the network ID usually returns a similar location as the
+	 * actual IP, but provides some privacy for the user.
 	 *
 	 * $_SERVER['REMOTE_ADDR'] cannot be used in all cases, such as when the user
 	 * is making their request through a proxy, or when the web server is behind
@@ -190,6 +194,7 @@ class WP_Community_Events {
 	 * than the user's actual address.
 	 *
 	 * Modified from http://stackoverflow.com/a/2031935/450127, MIT license.
+	 * Modified from https://github.com/geertw/php-ip-anonymizer, MIT license.
 	 *
 	 * SECURITY WARNING: This function is _NOT_ intended to be used in
 	 * circumstances where the authenticity of the IP address matters. This does
@@ -199,9 +204,10 @@ class WP_Community_Events {
 	 * @access protected
 	 * @since 4.8.0
 	 *
-	 * @return false|string false on failure, the string address on success.
+	 * @return false|string The anonymized address on success; the given address
+	 *                      or false on failure.
 	 */
-	protected function get_unsafe_client_ip() {
+	protected function get_client_ip() {
 		$client_ip = false;
 
 		// In order of preference, with the best ones for this purpose first.
@@ -229,37 +235,18 @@ class WP_Community_Events {
 			}
 		}
 
-		return $client_ip;
-	}
-
-	/**
-	 * Attempts to partially anonymize an IP address by converting it to a network ID.
-	 *
-	 * Geolocating the network ID usually returns a similar location as the
-	 * actual IP, but provides some privacy for the user.
-	 *
-	 * Modified from https://github.com/geertw/php-ip-anonymizer, MIT license.
-	 *
-	 * @access protected
-	 * @since 4.8.0
-	 *
-	 * @param  string $address The IP address that should be anonymized.
-	 * @return bool|string The anonymized address on success; the given address
-	 *                     or false on failure.
-	 */
-	protected function maybe_anonymize_ip_address( $address ) {
 		// These functions are not available on Windows until PHP 5.3.
-		if ( ! function_exists( 'inet_pton' ) || ! function_exists( 'inet_ntop' ) ) {
-			return $address;
+		if ( function_exists( 'inet_pton' ) && function_exists( 'inet_ntop' ) ) {
+			if ( 4 === strlen( inet_pton( $client_ip ) ) ) {
+				$netmask = '255.255.255.0'; // ipv4.
+			} else {
+				$netmask = 'ffff:ffff:ffff:ffff:0000:0000:0000:0000'; // ipv6.
+			}
+
+			$client_ip = inet_ntop( inet_pton( $client_ip ) & inet_pton( $netmask ) );
 		}
 
-		if ( 4 === strlen( inet_pton( $address ) ) ) {
-			$netmask = '255.255.255.0'; // ipv4.
-		} else {
-			$netmask = 'ffff:ffff:ffff:ffff:0000:0000:0000:0000'; // ipv6.
-		}
-
-		return inet_ntop( inet_pton( $address ) & inet_pton( $netmask ) );
+		return $client_ip;
 	}
 
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 11a38e4384..96d9d2575d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.8-beta1-40780';
+$wp_version = '4.8-beta1-40781';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.