GeoDirectory / geodirectory

geodirectory-functions/location_functions.php

Spacing +43 added lines, -43 removed lines

@@ -124,7 +124,7 @@ 
 {

     global $wpdb;

 

-    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

+    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM ".GEODIR_COUNTRIES_TABLE." ORDER BY Country ASC");

     

     $ISO2 = array();

     $countries = array();

@@ -136,11 +136,11 @@ 
     

     asort($countries);

     

-    $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

+    $out_put = '<option '.selected('', $post_country, false).' value="">'.__('Select Country', 'geodirectory').'</option>';

     foreach ($countries as $country => $name) {

         $ccode = $ISO2[$country];

 

-        $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

+        $out_put .= '<option '.selected($post_country, $country, false).' value="'.esc_attr($country).'" data-country_code="'.$ccode.'">'.$name.'</option>';

     }

 

     echo $out_put;

@@ -182,10 +182,10 @@ 
         if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

 

             foreach ($posttype as $posttypeobj) {

-                $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

+                $post_locations = '['.$default_location->city_slug.'],['.$default_location->region_slug.'],['.$default_location->country_slug.']'; // set all overall post location

 

                 $sql = $wpdb->prepare(

-                    "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

+                    "UPDATE ".$plugin_prefix.$posttypeobj."_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

                     array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

                 );

                 $wpdb->query($sql);

@@ -233,7 +233,7 @@ 
          *

          * @since 1.0.0

          */

-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

+        $geodir_location = (object) apply_filters('geodir_add_new_location', array('location_id' => 0,

             'country' => $location_country,

             'region' => $location_region,

             'city' => $location_city,

@@ -294,18 +294,18 @@ 
  */

 function geodir_get_address_by_lat_lan($lat, $lng)

 {

-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng);// . "&key=" . geodir_get_map_api_key(); // if we add a key here it will not work if limited to a domain as this is done via curl.

+    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng='.trim($lat).','.trim($lng); // . "&key=" . geodir_get_map_api_key(); // if we add a key here it will not work if limited to a domain as this is done via curl.

 

     $response = wp_remote_get($url);

-    if ( is_wp_error( $response ) ) {

+    if (is_wp_error($response)) {

         return false;

     }

 

-    $result = json_decode( wp_remote_retrieve_body( $response ) );

+    $result = json_decode(wp_remote_retrieve_body($response));

 

-    if(isset($result->results[0]->address_components)){

+    if (isset($result->results[0]->address_components)) {

         return $result->results[0]->address_components;

-    }else{

+    } else {

         return false;

     }

 }

@@ -386,7 +386,7 @@ 
 	 * @param string $location_array_from Source type of location terms. Default session.

 	 * @param string $gd_post_type WP post type.

 	 */

-	$location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );

+	$location_array = apply_filters('geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type);

 

     return $location_array;

 

@@ -431,20 +431,20 @@ 
  * @return array|bool Returns address on success.

  */

 function geodir_get_osm_address_by_lat_lan($lat, $lng) {

-    $url = 'https://nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

+    $url = 'https://nominatim.openstreetmap.org/reverse?format=json&lat='.trim($lat).'&lon='.trim($lng).'&zoom=16&addressdetails=1&email='.get_option('admin_email');

 

     $response = wp_remote_get($url);

-    if ( is_wp_error( $response ) ) {

+    if (is_wp_error($response)) {

         return false;

     }

 

-    $result = json_decode( wp_remote_retrieve_body( $response ) );

+    $result = json_decode(wp_remote_retrieve_body($response));

 

-    if(!empty($result->address)){

+    if (!empty($result->address)) {

         $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

-        $formatted_address = (array)$result->address;

+        $formatted_address = (array) $result->address;

 

-        foreach ( $result->address as $key => $value ) {

+        foreach ($result->address as $key => $value) {

             if (!in_array($key, $address_fields)) {

                 unset($formatted_address[$key]);

             }

@@ -452,7 +452,7 @@ 
         $result->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';

 

         return $result;

-    }else{

+    } else {

         return false;

     }

 }

@@ -474,7 +474,7 @@ 
     }

     

     if (defined('POST_LOCATION_TABLE')) {

-        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

+        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));

         if (!empty($rows)) {

             foreach ($rows as $row) {

                 $translated = __($row->country, 'geodirectory');

@@ -484,7 +484,7 @@ 
             }

         }

         

-        $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) );

+        $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country));

         if (!empty($rows)) {

             foreach ($rows as $row) {

                 $translated = __($row->country, 'geodirectory');

@@ -495,7 +495,7 @@ 
         }

     }

     

-    if ( $default === '0' ) {

+    if ($default === '0') {

         return NULL;

     }

     

@@ -526,10 +526,10 @@ 
 function geodir_get_country_iso2($country) {

     global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {

         return $result;

     }

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", geodir_get_normal_country($country)))) {

         return $result;

     }

     

@@ -548,10 +548,10 @@ 
 function geodir_get_country_by_name($country, $iso2 = false) {

     global $wpdb;

     

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {

         return $result;

     }

-    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {

+    if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE ISO2 LIKE %s", $country))) {

         return $result;

     }

     

@@ -595,7 +595,7 @@ 
 add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');

 

 

-function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){

+function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = '') {

 

     global $wp;

     

@@ -620,8 +620,8 @@ 
                 $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                 $location_name = get_actual_location_name($location_type, $location, true);

             } else {

-                $location_name = preg_replace( '/-(\d+)$/', '', $location_name);

-                $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                $location_name = preg_replace('/-(\d+)$/', '', $location_name);

+                $location_name = preg_replace('/[_-]/', ' ', $location_name);

                 $location_name = __(geodir_ucwords($location_name), 'geodirectory');

             }

         }

@@ -639,8 +639,8 @@ 
                     $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                     $location_single = get_actual_location_name($location_type, $location, true);

                 } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                    $location_name = preg_replace('/-(\d+)$/', '', $location);

+                    $location_name = preg_replace('/[_-]/', ' ', $location_name);

                     $location_single = __(geodir_ucwords($location_name), 'geodirectory');

                 }

             }

@@ -660,8 +660,8 @@ 
                     $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

                     $location_name = get_actual_location_name($location_type, $location, true);

                 } else {

-                    $location_name = preg_replace( '/-(\d+)$/', '', $location);

-                    $location_name = preg_replace( '/[_-]/', ' ', $location_name );

+                    $location_name = preg_replace('/-(\d+)$/', '', $location);

+                    $location_name = preg_replace('/[_-]/', ' ', $location_name);

                     $location_name = __(geodir_ucwords($location_name), 'geodirectory');

                 }

             }

@@ -673,9 +673,9 @@ 
             $full_location = array_unique($full_location);

         }

     }

-    $full_location = !empty($full_location) ? implode(', ', $full_location): '';

+    $full_location = !empty($full_location) ? implode(', ', $full_location) : '';

     

-    if ( empty( $full_location ) ) {

+    if (empty($full_location)) {

         /**

          * Filter the text in meta description in full location is empty.

          *

@@ -686,10 +686,10 @@ 
          * @param string $gd_page       The page being filtered.

          * @param string $sep           The separator.

          */

-         $full_location = apply_filters( 'geodir_meta_description_location_empty_text', '', $location_array, $gd_page, $sep );

+         $full_location = apply_filters('geodir_meta_description_location_empty_text', '', $location_array, $gd_page, $sep);

     }

     

-    if ( empty( $location_single ) ) {

+    if (empty($location_single)) {

         /**

          * Filter the text in meta description in single location is empty.

          *

@@ -700,21 +700,21 @@ 
          * @param string $gd_page       The page being filtered.

          * @param string $sep           The separator.

          */

-         $location_single = apply_filters( 'geodir_meta_description_single_location_empty_text', '', $location_array, $gd_page, $sep );

+         $location_single = apply_filters('geodir_meta_description_single_location_empty_text', '', $location_array, $gd_page, $sep);

     }

 

     $location_replace_vars = array();

     $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|';

     $location_replace_vars['%%location%%'] = $full_location;

-    $location_replace_vars['%%in_location%%'] = $full_location != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $full_location ) : '';

+    $location_replace_vars['%%in_location%%'] = $full_location != '' ? sprintf(_x('in %s', 'in location', 'geodirectory'), $full_location) : '';

     $location_replace_vars['%%location_single%%'] = $location_single;

-    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? sprintf( _x('in %s','in location', 'geodirectory'), $location_single ) : '';

+    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? sprintf(_x('in %s', 'in location', 'geodirectory'), $location_single) : '';

 

     foreach ($location_names as $type => $name) {

         $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type;

 

-        $location_replace_vars['%%location_' . $location_type . '%%'] = $name;

-        $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? sprintf( _x('in %s','in location', 'geodirectory'), $name ) : '';

+        $location_replace_vars['%%location_'.$location_type.'%%'] = $name;

+        $location_replace_vars['%%in_location_'.$location_type.'%%'] = !empty($name) ? sprintf(_x('in %s', 'in location', 'geodirectory'), $name) : '';

     }

 

     /**

@@ -728,5 +728,5 @@ 
      * @param string $gd_page       The page being filtered.

      * @param string $sep           The separator.

      */

-    return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep );

+    return apply_filters('geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep);

 }
\ No newline at end of file