Changeset 5462

Timestamp:

05/02/2017 09:33:55 PM (8 years ago)

Author:

iandunn

Message:

Events: Attempts all name-based lookups before resorting to IP lookup

Otherwise, someone searching for a city that requires a fallback lookup would have their request short-circuited by the IP lookup, which could produce unexpected results.

Location:

sites/trunk/api.wordpress.org/public_html/events/1.0

Files:

• index.php (modified) (2 diffs)
• tests/test-index.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

@@ -442 +442 @@
     }
 
-    // IP:
-    if ( ! $location && isset( $args['ip'] ) ) {
-        $guess = guess_location_from_ip( $args['ip'] );
-
-        if ( $guess ) {
-            $location = array(
-                'description' => $guess->ip_city,
-                'latitude' => $guess->ip_latitude,
-                'longitude' => $guess->ip_longitude,
-                'country' => $guess->country_short,
-            );
-        }
-    }
-
     /*
      * If all else fails, cast a wide net and try to find something before giving up, even
@@ -487 +473 @@
             // No specific location details.
             $location = array();
+        }
+    }
+
+    // IP:
+    if ( ! $location && isset( $args['ip'] ) ) {
+        $guess = guess_location_from_ip( $args['ip'] );
+
+        if ( $guess ) {
+            $location = array(
+                'description' => $guess->ip_city,
+                'latitude'    => $guess->ip_latitude,
+                'longitude'   => $guess->ip_longitude,
+                'country'     => $guess->country_short,
+            );
         }
     }

sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php

@@ -166 +166 @@
          * A location couldn't be found
          */
-        'city-invalid' => array(
+        'city-invalid-private-ip' => array(
             'input' => array(
                 'location_name' => 'Rivendell',
-                'ip_address'    => '127.0.0.1'
+                'ip'            => '127.0.0.1'
             ),
             'expected' => false,
@@ -276 +276 @@
                 'locale'        => 'ja',
                 'timezone'      => 'Asia/Tokyo',
+            ),
+            'expected' => array(
+                'description' => 'osaka',
+                'latitude'    => '34.694',
+                'longitude'   => '135.502',
+                'country'     => 'JP',
+            ),
+        ),
+
+        // If a location is provided, the fallback search should be attempted before an IP search
+        'fallback-with-public-ip' => array(
+            'input' => array(
+                'location_name' => 'Osakashi',
+                'locale'        => 'ja',
+                'timezone'      => 'Asia/Tokyo',
+                'ip'            => '153.163.68.148', // Tokyo
             ),
             'expected' => array(