Inspection of "Merge pull request #303 from kprajapatii/master" - GeoDirectory/geodirectory - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — master ( ffefcf...b4bdc7 )

by Stiofan

created 2016-12-24 14:15 UTC

Status

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -124,7 +124,7 @@  discard block
 block discarded – undo
 {
     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 @@  discard block
 block discarded – undo
     
     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 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
          *
          * @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,
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
  */
 function geodir_get_address_by_lat_lan($lat, $lng)
 {
-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;
+    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng='.trim($lat).','.trim($lng);
 
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_URL, $url);
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
 	 * @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;
 
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
  */
 function geodir_get_osm_address_by_lat_lan($lat, $lng) {
     $url = is_ssl() ? 'https:' : 'http:';
-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');
+    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat='.trim($lat).'&lon='.trim($lng).'&zoom=16&addressdetails=1&email='.get_option('admin_email');
 
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_URL, $url);
@@ -448,9 +448,9 @@  discard block
 block discarded – undo
     
     if (!empty($data) && !empty($data->address)) {
         $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');
-        $formatted_address = (array)$data->address;
+        $formatted_address = (array) $data->address;
         
-        foreach ( $data->address as $key => $value ) {
+        foreach ($data->address as $key => $value) {
             if (!in_array($key, $address_fields)) {
                 unset($formatted_address[$key]);
             }
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
     }
     
     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');
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
             }
         }
         
-        $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');
@@ -526,10 +526,10 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 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;
     }
     

Please login to merge, or discard this patch.

Indentation +266 added lines, -266 removed lines patch added patch discarded remove patch

@@ -9,10 +9,10 @@  discard block
 block discarded – undo
  */
 function geodir_get_current_city_lat()
 {
-    $location = geodir_get_default_location();
-    $lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';
+	$location = geodir_get_default_location();
+	$lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';
 
-    return $lat;
+	return $lat;
 }
 
 /**
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
  */
 function geodir_get_current_city_lng()
 {
-    $location = geodir_get_default_location();
-    $lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';
-    return $lng;
+	$location = geodir_get_default_location();
+	$lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';
+	return $lng;
 }
 
 
@@ -40,15 +40,15 @@  discard block
 block discarded – undo
  */
 function geodir_get_default_location()
 {
-    /**
-     * Filter the default location.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     *
-     * @param string $location_result The default location object.
-     */
-    return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));
+	/**
+	 * Filter the default location.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 *
+	 * @param string $location_result The default location object.
+	 */
+	return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));
 }
 
 /**
@@ -60,11 +60,11 @@  discard block
 block discarded – undo
  */
 function geodir_is_default_location_set()
 {
-    $default_location = geodir_get_default_location();
-    if (!empty($default_location))
-        return true;
-    else
-        return false;
+	$default_location = geodir_get_default_location();
+	if (!empty($default_location))
+		return true;
+	else
+		return false;
 }
 
 /**
@@ -78,15 +78,15 @@  discard block
 block discarded – undo
 function create_location_slug($location_string)
 {
 
-    /**
-     * Filter the location slug.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     *
-     * @param string $location_string Sanitized location string.
-     */
-    return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));
+	/**
+	 * Filter the location slug.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 *
+	 * @param string $location_string Sanitized location string.
+	 */
+	return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));
 
 }
 
@@ -100,15 +100,15 @@  discard block
 block discarded – undo
  */
 function geodir_get_location($id = '')
 {
-    /**
-     * Filter the location information.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     *
-     * @param string $id The location ID.
-     */
-    return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);
+	/**
+	 * Filter the location information.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 *
+	 * @param string $id The location ID.
+	 */
+	return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);
 }
 
 /**
@@ -122,28 +122,28 @@  discard block
 block discarded – undo
  */
 function geodir_get_country_dl($post_country = '', $prefix = '')
 {
-    global $wpdb;
+	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();
+	$ISO2 = array();
+	$countries = array();
     
-    foreach ($rows as $row) {
-        $ISO2[$row->Country] = $row->ISO2;
-        $countries[$row->Country] = __($row->Country, 'geodirectory');
-    }
+	foreach ($rows as $row) {
+		$ISO2[$row->Country] = $row->ISO2;
+		$countries[$row->Country] = __($row->Country, 'geodirectory');
+	}
     
-    asort($countries);
+	asort($countries);
     
-    $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, 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;
+	echo $out_put;
 }
 
 
@@ -158,40 +158,40 @@  discard block
 block discarded – undo
 function geodir_location_form_submit()
 {
 
-    global $wpdb, $plugin_prefix;
-    if (isset($_REQUEST['add_location'])) {
+	global $wpdb, $plugin_prefix;
+	if (isset($_REQUEST['add_location'])) {
 
-        $location_info = array(
-            'city' => $_REQUEST['city'],
-            'region' => $_REQUEST['region'],
-            'country' => $_REQUEST['country'],
-            'geo_lat' => $_REQUEST['latitude'],
-            'geo_lng' => $_REQUEST['longitude'],
-            'is_default' => $_REQUEST['is_default'],
-            'update_city' => $_REQUEST['update_city']
-        );
+		$location_info = array(
+			'city' => $_REQUEST['city'],
+			'region' => $_REQUEST['region'],
+			'country' => $_REQUEST['country'],
+			'geo_lat' => $_REQUEST['latitude'],
+			'geo_lng' => $_REQUEST['longitude'],
+			'is_default' => $_REQUEST['is_default'],
+			'update_city' => $_REQUEST['update_city']
+		);
 
-        $old_location = geodir_get_default_location();
+		$old_location = geodir_get_default_location();
 
-        $locationid = geodir_add_new_location($location_info);
+		$locationid = geodir_add_new_location($location_info);
 
-        $default_location = geodir_get_location($locationid);
+		$default_location = geodir_get_location($locationid);
 
-        //UPDATE AND DELETE LISTING
-        $posttype = geodir_get_posttypes();
-        if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {
+		//UPDATE AND DELETE LISTING
+		$posttype = geodir_get_posttypes();
+		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
+			foreach ($posttype as $posttypeobj) {
+				$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)",
-                    array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)
-                );
-                $wpdb->query($sql);
-            }
-        }
-    }
+				$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)",
+					array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)
+				);
+				$wpdb->query($sql);
+			}
+		}
+	}
 }
 
 /**
@@ -215,37 +215,37 @@  discard block
 block discarded – undo
  */
 function geodir_add_new_location($location_info = array())
 {
-    global $wpdb;
-
-    if (!empty($location_info)) {
-        $location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';
-        $location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';
-        $location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all';
-        $location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';
-        $location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';
-        $is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';
-        $country_slug = create_location_slug(__($location_country, 'geodirectory'));
-        $region_slug = create_location_slug($location_region);
-        $city_slug = create_location_slug($location_city);
+	global $wpdb;
+
+	if (!empty($location_info)) {
+		$location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';
+		$location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';
+		$location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all';
+		$location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';
+		$location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';
+		$is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';
+		$country_slug = create_location_slug(__($location_country, 'geodirectory'));
+		$region_slug = create_location_slug($location_region);
+		$city_slug = create_location_slug($location_city);
         
-        /**
-         * Filter add new location data.
-         *
-         * @since 1.0.0
-         */
-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,
-            'country' => $location_country,
-            'region' => $location_region,
-            'city' => $location_city,
-            'country_slug' => $country_slug,
-            'region_slug' => $region_slug,
-            'city_slug' => $city_slug,
-            'city_latitude' => $location_lat,
-            'city_longitude' => $location_lng,
-            'is_default' => $is_default
-        ));
-
-        /* // Not allowed to create country in DB : 2016-12-09
+		/**
+		 * Filter add new location data.
+		 *
+		 * @since 1.0.0
+		 */
+		$geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,
+			'country' => $location_country,
+			'region' => $location_region,
+			'city' => $location_city,
+			'country_slug' => $country_slug,
+			'region_slug' => $region_slug,
+			'city_slug' => $city_slug,
+			'city_latitude' => $location_lat,
+			'city_longitude' => $location_lng,
+			'is_default' => $is_default
+		));
+
+		/* // Not allowed to create country in DB : 2016-12-09
         if ($geodir_location->country) {
 
             $get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country)));
@@ -259,14 +259,14 @@  discard block
 block discarded – undo
         }
         */
 
-        if ($geodir_location->is_default)
-            update_option('geodir_default_location', $geodir_location);
+		if ($geodir_location->is_default)
+			update_option('geodir_default_location', $geodir_location);
 
-        return $geodir_location->location_id;
+		return $geodir_location->location_id;
 
-    } else {
-        return false;
-    }
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
  */
 function geodir_random_float($min = 0, $max = 1)
 {
-    return $min + mt_rand() / mt_getrandmax() * ($max - $min);
+	return $min + mt_rand() / mt_getrandmax() * ($max - $min);
 }
 
 /**
@@ -294,22 +294,22 @@  discard block
 block discarded – undo
  */
 function geodir_get_address_by_lat_lan($lat, $lng)
 {
-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;
-
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL, $url);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-    $response = curl_exec($ch);
-    curl_close($ch);
-    $data = json_decode($response);
-    $status = $data->status;
-    if ($status == "OK") {
-        return $data->results[0]->address_components;
-    } else
-        return false;
+	$url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;
+
+	$ch = curl_init();
+	curl_setopt($ch, CURLOPT_URL, $url);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+	$response = curl_exec($ch);
+	curl_close($ch);
+	$data = json_decode($response);
+	$status = $data->status;
+	if ($status == "OK") {
+		return $data->results[0]->address_components;
+	} else
+		return false;
 }
 
 /**
@@ -326,70 +326,70 @@  discard block
 block discarded – undo
  */
 function geodir_get_current_location_terms($location_array_from = 'session', $gd_post_type = '')
 {
-    global $wp, $gd_session;
-    $location_array = array();
-    if ($location_array_from == 'session') {
-        if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {
-            return $location_array;
-        }
+	global $wp, $gd_session;
+	$location_array = array();
+	if ($location_array_from == 'session') {
+		if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {
+			return $location_array;
+		}
 
-        $country = $gd_session->get('gd_country');
-        if ($country != '' && $country)
-            $location_array['gd_country'] = urldecode($country);
+		$country = $gd_session->get('gd_country');
+		if ($country != '' && $country)
+			$location_array['gd_country'] = urldecode($country);
 
-        $region = $gd_session->get('gd_region');
-        if ($region != '' && $region)
-            $location_array['gd_region'] = urldecode($region);
+		$region = $gd_session->get('gd_region');
+		if ($region != '' && $region)
+			$location_array['gd_region'] = urldecode($region);
 
-        $city = $gd_session->get('gd_city');
-        if ($city != '' && $city)
-            $location_array['gd_city'] = urldecode($city);
-    } else {
-        if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {
-            return $location_array;
-        }
+		$city = $gd_session->get('gd_city');
+		if ($city != '' && $city)
+			$location_array['gd_city'] = urldecode($city);
+	} else {
+		if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {
+			return $location_array;
+		}
 
-        $country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';
+		$country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';
 
-        $region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';
+		$region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';
 
-        $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';
+		$city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';
 
-        if ($country != '')
-            $location_array['gd_country'] = urldecode($country);
+		if ($country != '')
+			$location_array['gd_country'] = urldecode($country);
 
-        if ($region != '')
-            $location_array['gd_region'] = urldecode($region);
+		if ($region != '')
+			$location_array['gd_region'] = urldecode($region);
 
-        if ($city != '')
-            $location_array['gd_city'] = urldecode($city);
+		if ($city != '')
+			$location_array['gd_city'] = urldecode($city);
 			
 		// Fix category link in ajax popular category widget on change post type
 		if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {
 			$location_array = geodir_get_current_location_terms('session');
 		}
-    }
+	}
 
 	/**
 	 * Filter the location terms.
 	 *
 	 * @since 1.4.6
-     * @package GeoDirectory
+	 * @package GeoDirectory
+	 *
+	 * @param array $location_array {
+	 *    Attributes of the location_array.
+	 *
+	 *    @type string $gd_country The country slug.
+	 *    @type string $gd_region The region slug.
+	 *    @type string $gd_city The city slug.
 	 *
-     * @param array $location_array {
-     *    Attributes of the location_array.
-     *
-     *    @type string $gd_country The country slug.
-     *    @type string $gd_region The region slug.
-     *    @type string $gd_city The city slug.
-     *
-     * }
+	 * }
 	 * @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 );
 
-    return $location_array;
+	return $location_array;
 
 }
 
@@ -402,24 +402,24 @@  discard block
 block discarded – undo
  * @return bool|string
  */
 function geodir_get_location_link($which_location = 'current') {
-    $location_link = get_permalink(geodir_location_page_id());
-
-    if ($which_location == 'base') {
-        return $location_link;
-    } else {
-        $location_terms = geodir_get_current_location_terms();
-
-        if (!empty($location_terms)) {
-            if (get_option('permalink_structure') != '') {
-                $location_terms = implode("/", $location_terms);
-                $location_terms = rtrim($location_terms, '/');
-                $location_link .= $location_terms;
-            } else {
-                $location_link = geodir_getlink($location_link, $location_terms);
-            }
-        }
-    }
-    return $location_link;
+	$location_link = get_permalink(geodir_location_page_id());
+
+	if ($which_location == 'base') {
+		return $location_link;
+	} else {
+		$location_terms = geodir_get_current_location_terms();
+
+		if (!empty($location_terms)) {
+			if (get_option('permalink_structure') != '') {
+				$location_terms = implode("/", $location_terms);
+				$location_terms = rtrim($location_terms, '/');
+				$location_link .= $location_terms;
+			} else {
+				$location_link = geodir_getlink($location_link, $location_terms);
+			}
+		}
+	}
+	return $location_link;
 }
 
 /**
@@ -432,34 +432,34 @@  discard block
 block discarded – undo
  * @return array|bool Returns address on success.
  */
 function geodir_get_osm_address_by_lat_lan($lat, $lng) {
-    $url = is_ssl() ? 'https:' : 'http:';
-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');
-
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL, $url);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-    $response = curl_exec($ch);
-    curl_close($ch);
-    $data = json_decode($response);
+	$url = is_ssl() ? 'https:' : 'http:';
+	$url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');
+
+	$ch = curl_init();
+	curl_setopt($ch, CURLOPT_URL, $url);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+	$response = curl_exec($ch);
+	curl_close($ch);
+	$data = json_decode($response);
     
-    if (!empty($data) && !empty($data->address)) {
-        $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');
-        $formatted_address = (array)$data->address;
+	if (!empty($data) && !empty($data->address)) {
+		$address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');
+		$formatted_address = (array)$data->address;
         
-        foreach ( $data->address as $key => $value ) {
-            if (!in_array($key, $address_fields)) {
-                unset($formatted_address[$key]);
-            }
-        }
-        $data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';
+		foreach ( $data->address as $key => $value ) {
+			if (!in_array($key, $address_fields)) {
+				unset($formatted_address[$key]);
+			}
+		}
+		$data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';
         
-        return $data;
-    } else {
-        return false;
-    }
+		return $data;
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -471,47 +471,47 @@  discard block
 block discarded – undo
  * @return string Returns the country.
  */
 function geodir_get_normal_country($country) {
-    global $wpdb;
-    if ($result = geodir_get_country_by_name($country)) {
-        return $result;
-    }
+	global $wpdb;
+	if ($result = geodir_get_country_by_name($country)) {
+		return $result;
+	}
     
-    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));
-        if (!empty($rows)) {
-            foreach ($rows as $row) {
-                $translated = __($row->country, 'geodirectory');
-                if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {
-                    return $result;
-                }
-            }
-        }
+	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));
+		if (!empty($rows)) {
+			foreach ($rows as $row) {
+				$translated = __($row->country, 'geodirectory');
+				if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {
+					return $result;
+				}
+			}
+		}
         
-        $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');
-                if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {
-                    return $result;
-                }
-            }
-        }
-    }
+		$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');
+				if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {
+					return $result;
+				}
+			}
+		}
+	}
     
-    $default_location = geodir_get_default_location();
-    if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {
-        return $result;
-    }
+	$default_location = geodir_get_default_location();
+	if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {
+		return $result;
+	}
     
-    if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {
-        return $result;
-    }
+	if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {
+		return $result;
+	}
     
-    if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {
-        return $result;
-    }
+	if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {
+		return $result;
+	}
     
-    return $country;
+	return $country;
 }
 
 /**
@@ -523,16 +523,16 @@  discard block
 block discarded – undo
  * @return string Country ISO2 code.
  */
 function geodir_get_country_iso2($country) {
-    global $wpdb;
+	global $wpdb;
     
-    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)))) {
-        return $result;
-    }
+	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)))) {
+		return $result;
+	}
     
-    return $country;
+	return $country;
 }
 
 /**
@@ -545,14 +545,14 @@  discard block
 block discarded – undo
  * @return string|null Country ISO2 code.
  */
 function geodir_get_country_by_name($country, $iso2 = false) {
-    global $wpdb;
+	global $wpdb;
     
-    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))) {
-        return $result;
-    }
+	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))) {
+		return $result;
+	}
     
-    return NULL;
+	return NULL;
 }
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -124,7 +124,7 @@ discard block
		block discarded – undo
124	124	{
125	125	global $wpdb;
126	126
127		- $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");
	127	+ $rows = $wpdb->get_results("SELECT Country,ISO2 FROM ".GEODIR_COUNTRIES_TABLE." ORDER BY Country ASC");
128	128
129	129	$ISO2 = array();
130	130	$countries = array();
		@@ -136,11 +136,11 @@ discard block
		block discarded – undo
136	136
137	137	asort($countries);
138	138
139		- $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';
	139	+ $out_put = '<option '.selected('', $post_country, false).' value="">'.__('Select Country', 'geodirectory').'</option>';
140	140	foreach ($countries as $country => $name) {
141	141	$ccode = $ISO2[$country];
142	142
143		- $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';
	143	+ $out_put .= '<option '.selected($post_country, $country, false).' value="'.esc_attr($country).'" data-country_code="'.$ccode.'">'.$name.'</option>';
144	144	}
145	145
146	146	echo $out_put;
		@@ -182,10 +182,10 @@ discard block
		block discarded – undo
182	182	if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {
183	183
184	184	foreach ($posttype as $posttypeobj) {
185		- $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location
	185	+ $post_locations = '['.$default_location->city_slug.'],['.$default_location->region_slug.'],['.$default_location->country_slug.']'; // set all overall post location
186	186
187	187	$sql = $wpdb->prepare(
188		- "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)",
	188	+ "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)",
189	189	array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)
190	190	);
191	191	$wpdb->query($sql);
		@@ -233,7 +233,7 @@ discard block
		block discarded – undo
233	233	*
234	234	* @since 1.0.0
235	235	*/
236		- $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,
	236	+ $geodir_location = (object) apply_filters('geodir_add_new_location', array('location_id' => 0,
237	237	'country' => $location_country,
238	238	'region' => $location_region,
239	239	'city' => $location_city,
		@@ -295,7 +295,7 @@ discard block
		block discarded – undo
295	295	*/
296	296	function geodir_get_address_by_lat_lan($lat, $lng)
297	297	{
298		- $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;
	298	+ $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng='.trim($lat).','.trim($lng);
299	299
300	300	$ch = curl_init();
301	301	curl_setopt($ch, CURLOPT_URL, $url);
		@@ -388,7 +388,7 @@ discard block
		block discarded – undo
388	388	* @param string $location_array_from Source type of location terms. Default session.
389	389	* @param string $gd_post_type WP post type.
390	390	*/
391		- $location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );
	391	+ $location_array = apply_filters('geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type);
392	392
393	393	return $location_array;
394	394
		@@ -434,7 +434,7 @@ discard block
		block discarded – undo
434	434	*/
435	435	function geodir_get_osm_address_by_lat_lan($lat, $lng) {
436	436	$url = is_ssl() ? 'https:' : 'http:';
437		- $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');
	437	+ $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat='.trim($lat).'&lon='.trim($lng).'&zoom=16&addressdetails=1&email='.get_option('admin_email');
438	438
439	439	$ch = curl_init();
440	440	curl_setopt($ch, CURLOPT_URL, $url);
		@@ -448,9 +448,9 @@ discard block
		block discarded – undo
448	448
449	449	if (!empty($data) && !empty($data->address)) {
450	450	$address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');
451		- $formatted_address = (array)$data->address;
	451	+ $formatted_address = (array) $data->address;
452	452
453		- foreach ( $data->address as $key => $value ) {
	453	+ foreach ($data->address as $key => $value) {
454	454	if (!in_array($key, $address_fields)) {
455	455	unset($formatted_address[$key]);
456	456	}
		@@ -478,7 +478,7 @@ discard block
		block discarded – undo
478	478	}
479	479
480	480	if (defined('POST_LOCATION_TABLE')) {
481		- $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));
	481	+ $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));
482	482	if (!empty($rows)) {
483	483	foreach ($rows as $row) {
484	484	$translated = __($row->country, 'geodirectory');
		@@ -488,7 +488,7 @@ discard block
		block discarded – undo
488	488	}
489	489	}
490	490
491		- $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 ) );
	491	+ $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));
492	492	if (!empty($rows)) {
493	493	foreach ($rows as $row) {
494	494	$translated = __($row->country, 'geodirectory');
		@@ -526,10 +526,10 @@ discard block
		block discarded – undo
526	526	function geodir_get_country_iso2($country) {
527	527	global $wpdb;
528	528
529		- if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {
	529	+ if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {
530	530	return $result;
531	531	}
532		- if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {
	532	+ if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", geodir_get_normal_country($country)))) {
533	533	return $result;
534	534	}
535	535
		@@ -548,10 +548,10 @@ discard block
		block discarded – undo
548	548	function geodir_get_country_by_name($country, $iso2 = false) {
549	549	global $wpdb;
550	550
551		- if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {
	551	+ if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {
552	552	return $result;
553	553	}
554		- if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {
	554	+ if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE ISO2 LIKE %s", $country))) {
555	555	return $result;
556	556	}
557	557

GeoDirectory / geodirectory

Push — master ( ffefcf...b4bdc7 )

Status

Category

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Indentation +266 added lines, -266 removed lines patch added patch discarded remove patch