Changeset 4884

Timestamp:

02/04/2017 03:26:36 PM (10 years ago)

Author:

dd32

Message:

Events: In the event a location cannot be determined from the inputs, provide an error message and don't return events globally.

File:

• sites/trunk/api.wordpress.org/public_html/events/1.0/index.php (modified) (5 diffs)

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

@@ -40 +40 @@
 $location = get_location( $location_args );
 
-$event_args = array();
-if ( isset( $_REQUEST['number'] ) ) {
-        $event_args['number'] = $_REQUEST['number'];
-}
-if ( !empty( $location['latitude'] ) ) {
-        $event_args['nearby'] = array(
-                'latitude'  => $location['latitude'],
-                'longitude' => $location['longitude'],
-        );
-}
-if ( !empty( $location['country'] ) ) {
-        $event_args['country'] = $location['country'];
-}
-
-$events = get_events( $event_args );
+if ( false === $location ) {
+        // No location was determined for the request. Bail with an error.
+        $events = array();
+        $error = 'no_location_available';
+} else {
+        $event_args = array();
+        if ( isset( $_REQUEST['number'] ) ) {
+                $event_args['number'] = $_REQUEST['number'];
+        }
+        if ( !empty( $location['latitude'] ) ) {
+                $event_args['nearby'] = array(
+                        'latitude'  => $location['latitude'],
+                        'longitude' => $location['longitude'],
+                );
+        }
+        if ( !empty( $location['country'] ) ) {
+                $event_args['country'] = $location['country'];
+        }
+
+        $events = get_events( $event_args );
+}
 
 header( 'Expires: ' . gmdate( 'r', time() + $ttl ) );
 header( 'Access-Control-Allow-Origin: *' );
 header( 'Content-Type: application/json; charset=UTF-8' );
-echo wp_json_encode( compact( 'location', 'events', 'ttl', 'debug' ) );
+echo wp_json_encode( compact( 'error', 'location', 'events', 'ttl' ) );
 
 
@@ -102 +108 @@
         if ( isset( $args['location_name'] ) ) {
                 $guess = guess_location_from_geonames( $args['location_name'], $args['timezone'] ?? '', $country_code );
-                if ( $guess )
+                if ( $guess ) {
                         return array(
                                 'description' => $guess->name,
@@ -109 +115 @@
                                 'country' => $guess->country,
                         );
+                }
         }
 
@@ -120 +127 @@
                                 'longitude' => $guess->ip_longitude,
                                 'country' => $guess->country_short,
-                                );
+                        );
                 }
         }
@@ -136 +143 @@
         }
 
-        return array(
-                'description' => 'Global',
-                'latitude'  => 0,
-                'longitude' => 0,
-        );
+        // If any of these are specified, and no localitity was guessed based on the above checks, bail with no location.
+        if ( isset( $args['location_name'] ) || isset( $args['ip'] ) || ! empty( $args['latitude'] ) || ! empty( $args['longitude'] ) ) {
+                return false;
+        }
+
+        // No specific location details.
+        return array();
 }