Changeset 7749 for sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php

Timestamp:

10/19/2018 06:35:44 PM (8 years ago)

Author:

iandunn

Message:

Official WordPress Events: Add required key to Geocoding API requests.

The key is now required, and without it requests will quickly receive an OVER_QUERY_LIMIT error.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php

@@ -476 +476 @@
 
                 $response = $this->remote_get( sprintf(
-                        'https://maps.googleapis.com/maps/api/geocode/json?latlng=%s,%s&sensor=false',
+                        'https://maps.googleapis.com/maps/api/geocode/json?latlng=%s,%s&sensor=false&key=%s',
                         $latitude,
-                        $longitude
+                        $longitude,
+                        OFFICIAL_WP_EVENTS_GOOGLE_MAPS_API_KEY
                 ) );
-
-                if ( ! is_wp_error( $response ) ) {
+                $body = json_decode( wp_remote_retrieve_body( $response ) );
+
+                if ( ! is_wp_error( $response ) && isset( $body->results ) && empty( $body->error_message ) ) {
                         $this->log( 'geocode successful' );
-
-                        $body = json_decode( wp_remote_retrieve_body( $response ) );
 
                         if ( isset( $body->results[0]->address_components ) ) {
@@ -492 +492 @@
                 }
                 else {
-                        $this->log( 'geocode failed' );
+                        $this->log( 'geocode failed: ' . wp_json_encode( $response ) );
                 }