GeoDirectory / geodirectory

geodirectory-functions/location_functions.php

Indentation +372 added lines, -372 removed lines

@@ -9,10 +9,10 @@ 
  */

 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 @@ 
  */

 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 @@ 
  */

 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 @@ 
  */

 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 @@ 
 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 @@ 
  */

 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 @@ 
  */

 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 @@ 
 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 @@ 
  */

 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 @@ 
         }

         */

 

-        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 @@ 
  */

 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 @@ 
  */

 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 @@ 
  */

 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 @@ 
  * @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 @@ 
  * @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 @@ 
  * @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 @@ 
  * @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,16 +545,16 @@ 
  * @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;

 }

 

 

@@ -573,125 +573,125 @@ 
  * @return string Filtered content.

  */

 function geodir_replace_location_variables($content, $location_array = array(), $sep = NULL, $gd_page = '') {

-    global $wp;

+	global $wp;

     

-    if (empty($content)) {

-        return $content;

-    }

+	if (empty($content)) {

+		return $content;

+	}

     

-    $location_manager = defined('GEODIRLOCATION_VERSION') ? true : false;

+	$location_manager = defined('GEODIRLOCATION_VERSION') ? true : false;

     

-    if (empty($location_array)) {

-        $location_array = geodir_get_current_location_terms('query_vars');

-    }

+	if (empty($location_array)) {

+		$location_array = geodir_get_current_location_terms('query_vars');

+	}

     

-    $location_terms = array();

-    $location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : '';

-    $location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : '';

-    $location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : '';

-    $location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : '';

-

-    $location_names = array();

-    foreach ($location_terms as $type => $location) {

-        $location_name = $location;

+	$location_terms = array();

+	$location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : '';

+	$location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : '';

+	$location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : '';

+	$location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : '';

+

+	$location_names = array();

+	foreach ($location_terms as $type => $location) {

+		$location_name = $location;

         

-        if (!empty($location_name)) {

-            if ($location_manager) {

-                $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 = __(geodir_ucwords($location_name), 'geodirectory');

-            }

-        }

+		if (!empty($location_name)) {

+			if ($location_manager) {

+				$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 = __(geodir_ucwords($location_name), 'geodirectory');

+			}

+		}

 

-        $location_names[$type] = $location_name;

-    }

+		$location_names[$type] = $location_name;

+	}

     

-    $location_single = '';

-    foreach ($location_terms as $type => $location) {

-        if (!empty($location)) {

-            if (!empty($location_names[$type])) {

-                $location_single = $location_names[$type];

-            } else {

-                if ($location_manager) {

-                    $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_single = __(geodir_ucwords($location_name), 'geodirectory');

-                }

-            }

-            break;

-        }

-    }

+	$location_single = '';

+	foreach ($location_terms as $type => $location) {

+		if (!empty($location)) {

+			if (!empty($location_names[$type])) {

+				$location_single = $location_names[$type];

+			} else {

+				if ($location_manager) {

+					$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_single = __(geodir_ucwords($location_name), 'geodirectory');

+				}

+			}

+			break;

+		}

+	}

     

-    $full_location = array();

-    if (!empty($location_array)) {

-        $location_array = array_reverse($location_array);

-

-        foreach ($location_array as $type => $location) {

-            if (!empty($location_names[$type])) {

-                $location_name = $location_names[$type];

-            } else {

-                if ($location_manager) {

-                    $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 = __(geodir_ucwords($location_name), 'geodirectory');

-                }

-            }

-

-            $full_location[] = $location_name;

-        }

+	$full_location = array();

+	if (!empty($location_array)) {

+		$location_array = array_reverse($location_array);

+

+		foreach ($location_array as $type => $location) {

+			if (!empty($location_names[$type])) {

+				$location_name = $location_names[$type];

+			} else {

+				if ($location_manager) {

+					$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 = __(geodir_ucwords($location_name), 'geodirectory');

+				}

+			}

+

+			$full_location[] = $location_name;

+		}

         

-        if (!empty($full_location)) {

-            $full_location = array_unique($full_location);

-        }

-    }

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

+		if (!empty($full_location)) {

+			$full_location = array_unique($full_location);

+		}

+	}

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

     

-    $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 != '' ? __( 'in', 'geodirectory' ) . ' ' . $full_location : '';

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

-    $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __( 'in', 'geodirectory' ) . ' ' . $location_single : '';

+	$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 != '' ? __( 'in', 'geodirectory' ) . ' ' . $full_location : '';

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

+	$location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __( 'in', 'geodirectory' ) . ' ' . $location_single : '';

     

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

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

+	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) ? __( 'in', 'geodirectory' ) . ' ' . $name : '';

-    }

-

-    /**

-     * Filter the location terms variables to search & replace.

-     *

-     * @since   1.6.16

-     * @package GeoDirectory

-     *

-     * @param array $location_replace_vars The array of search & replace variables.

-     * @param string $content       The content with variables.

-     * @param array $location_array The array of location variables.

-     * @param string $gd_page       The page being filtered.

-     * @param string $sep           The separator.

-     */

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

-

-    if (!empty($location_replace_vars)) {

-        foreach ($location_replace_vars as $search => $replace) {

-            if (!empty($search) && strpos($content, $search) !== false) {

-                $content = str_replace($search, $replace, $content);

-            }

-        }

-    }

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

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

+	}

+

+	/**

+	 * Filter the location terms variables to search & replace.

+	 *

+	 * @since   1.6.16

+	 * @package GeoDirectory

+	 *

+	 * @param array $location_replace_vars The array of search & replace variables.

+	 * @param string $content       The content with variables.

+	 * @param array $location_array The array of location variables.

+	 * @param string $gd_page       The page being filtered.

+	 * @param string $sep           The separator.

+	 */

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

+

+	if (!empty($location_replace_vars)) {

+		foreach ($location_replace_vars as $search => $replace) {

+			if (!empty($search) && strpos($content, $search) !== false) {

+				$content = str_replace($search, $replace, $content);

+			}

+		}

+	}

 

-    return $content;

+	return $content;

 }

 add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');

 add_filter('geodir_replace_location_variables_seo', 'geodir_replace_location_variables');
\ No newline at end of file

geodirectory-admin/option-pages/title_meta_settings_array.php

Indentation +355 added lines, -355 removed lines

@@ -10,7 +10,7 @@ 
 
 $gd_wpseo_use = '';
 if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {
-    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
+	$gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
 }
 
 /**
@@ -21,360 +21,360 @@ 
  */
 $geodir_settings['title_meta_settings'] = apply_filters('geodir_title_meta_settings', array(
 
-    /* Listing Permalink Settings start */
-    array('name' => __('Title / Meta', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set page title and meta', 'id' => 'geodir_title_meta_settings '),
-
-    array('name' => $gd_wpseo_use.__('Available Variables', 'geodirectory'),
-        'desc' => '%%title%%, %%sitename%%, %%sitedesc%%, %%excerpt%%, %%pt_single%%, %%pt_plural%%, %%category%%, %%id%%, %%sep%%, %%location%%, %%in_location%%, %%in_location_single%%, %%location_single%%, %%location_country%%, %%in_location_country%%, %%location_region%%, %%in_location_region%%, %%location_city%%, %%in_location_city%%, %%location_sep%%, %%search_term%%, %%search_near%%, %%name%%, %%page%%, %%pagenumber%%, %%pagetotal%%',
-        'type' => 'sectionstart',
-        'id' => 'geodir_meta_vars'),
-
-    array('type' => 'sectionend', 'id' => 'geodir_meta_vars'),
-
-    array('name' => __('Homepage Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_home_meta'),
-
-    array(
-        'name' => __('Homepage meta title', 'geodirectory'),
-        'desc' => __('This will use the title of the page set as frontpage if left blank.', 'geodirectory'),
-        'id' => 'geodir_meta_title_homepage',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => '',
-        'placeholder' => ''
-    ),
-
-    array(
-        'name' => __('Homepage meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the homepage.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_homepage',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_home_meta'),
-
-    // details page meta
-    array('name' => __('Details Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_details_meta'),
-
-    array(
-        'name' => __('Details page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the details page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_detail',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Details page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the details page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_detail',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%excerpt%%', 'geodirectory'),
-        'placeholder' => '%%excerpt%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_details_meta'),
-
-    // CPT page meta
-    array('name' => __('Post Type Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Post type page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the post type pages.', 'geodirectory'),
-        'id' => 'geodir_meta_title_pt',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% %%in_location%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Post type page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the post type pages.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_pt',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% %%in_location%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% %%in_location%%'
-    ),
-
-    array(
-        'name' => __('Post type page title', 'geodirectory'),
-        'desc' => __('Enter the title for the post type pages.', 'geodirectory'),
-        'id' => 'geodir_page_title_pt',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('All %%pt_plural%% %%in_location_single%%', 'geodirectory'),
-        'placeholder' => 'All %%pt_plural%% %%in_location_single%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_pt_meta'),
-
-    // Cat listing page meta
-    array('name' => __('Listing Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Listing page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the category listing pages.', 'geodirectory'),
-        'id' => 'geodir_meta_title_listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%category%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%category%% %%in_location%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Listing page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the category listing pages.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_listing',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('Posts related to Category: %%category%% %%in_location%%', 'geodirectory'),
-        'placeholder' => 'Posts related to Category: %%category%% %%in_location%%'
-    ),
-
-    array(
-        'name' => __('Category listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the category listing pages.', 'geodirectory'),
-        'id' => 'geodir_page_title_cat-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('All %%category%% %%in_location_single%%', 'geodirectory'),
-        'placeholder' => 'All %%category%% %%in_location_single%%'
-    ),
-
-    array(
-        'name' => __('Tag listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the tag listing pages.', 'geodirectory'),
-        'id' => 'geodir_page_title_tag-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Tag: %%tag%% %%in_location_single%%', 'geodirectory'),
-        'placeholder' => 'Tag: %%tag%% %%in_location_single%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    // location page meta
-    array('name' => __('Location Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Location page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the location pages.', 'geodirectory'),
-        'id' => 'geodir_meta_title_location',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%location%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%location%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Location page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the location pages.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_location',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%location%%', 'geodirectory'),
-        'placeholder' => '%%location%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    // Search page meta
-    array('name' => __('Search Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Search page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the search page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_search',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Search page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the search page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_search',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    //Add listing page meta
-    array('name' => __('Add Listing Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Add listing page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the add listing page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_add-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Add %%pt_single%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => 'Add %%pt_single%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Add listing page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the add listing page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_add-listing',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('Add %%pt_single%%', 'geodirectory'),
-        'placeholder' => 'Add %%pt_single%%'
-    ),
-
-    array(
-        'name' => __('Add listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the add listing page.', 'geodirectory'),
-        'id' => 'geodir_page_title_add-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Add %%pt_single%%', 'geodirectory'),
-        'placeholder' => 'Add %%pt_single%%'
-    ),
-
-    array(
-        'name' => __('Edit listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the edit listing page.', 'geodirectory'),
-        'id' => 'geodir_page_title_edit-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Edit %%pt_single%%', 'geodirectory'),
-        'placeholder' => 'Edit %%pt_single%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    //Author page meta
-    array('name' => __('Author Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Author page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the author page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_author',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Author: %%name%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => 'Author: %%name%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Author page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the author page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_author',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array(
-        'name' => __('Author page title', 'geodirectory'),
-        'desc' => __('Enter the title for the author page.', 'geodirectory'),
-        'id' => 'geodir_page_title_author',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% by: %%name%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% by: %%name%%'
-    ),
-
-    array(
-        'name' => __('Author favorite page title', 'geodirectory'),
-        'desc' => __('Enter the title for the author favorite page.', 'geodirectory'),
-        'id' => 'geodir_page_title_favorite',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%name%%: Favorite %%pt_plural%%', 'geodirectory'),
-        'placeholder' => '%%name%%: Favorite %%pt_plural%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    //Login page meta
-    array('name' => __('Login Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_login_meta'),
-
-    array(
-        'name' => __('Login page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the login page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_login',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Login page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the login page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_login',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
-
-    //Listing success page meta
-    array('name' => __('Listing Success Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_login_meta'),
-
-    array(
-        'name' => __('Listing success page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the listing success page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_listing-success',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Listing success page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the listing success page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_listing-success',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
+	/* Listing Permalink Settings start */
+	array('name' => __('Title / Meta', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set page title and meta', 'id' => 'geodir_title_meta_settings '),
+
+	array('name' => $gd_wpseo_use.__('Available Variables', 'geodirectory'),
+		'desc' => '%%title%%, %%sitename%%, %%sitedesc%%, %%excerpt%%, %%pt_single%%, %%pt_plural%%, %%category%%, %%id%%, %%sep%%, %%location%%, %%in_location%%, %%in_location_single%%, %%location_single%%, %%location_country%%, %%in_location_country%%, %%location_region%%, %%in_location_region%%, %%location_city%%, %%in_location_city%%, %%location_sep%%, %%search_term%%, %%search_near%%, %%name%%, %%page%%, %%pagenumber%%, %%pagetotal%%',
+		'type' => 'sectionstart',
+		'id' => 'geodir_meta_vars'),
+
+	array('type' => 'sectionend', 'id' => 'geodir_meta_vars'),
+
+	array('name' => __('Homepage Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_home_meta'),
+
+	array(
+		'name' => __('Homepage meta title', 'geodirectory'),
+		'desc' => __('This will use the title of the page set as frontpage if left blank.', 'geodirectory'),
+		'id' => 'geodir_meta_title_homepage',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => '',
+		'placeholder' => ''
+	),
+
+	array(
+		'name' => __('Homepage meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the homepage.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_homepage',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_home_meta'),
+
+	// details page meta
+	array('name' => __('Details Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_details_meta'),
+
+	array(
+		'name' => __('Details page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the details page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_detail',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Details page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the details page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_detail',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%excerpt%%', 'geodirectory'),
+		'placeholder' => '%%excerpt%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_details_meta'),
+
+	// CPT page meta
+	array('name' => __('Post Type Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Post type page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the post type pages.', 'geodirectory'),
+		'id' => 'geodir_meta_title_pt',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% %%in_location%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Post type page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the post type pages.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_pt',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% %%in_location%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% %%in_location%%'
+	),
+
+	array(
+		'name' => __('Post type page title', 'geodirectory'),
+		'desc' => __('Enter the title for the post type pages.', 'geodirectory'),
+		'id' => 'geodir_page_title_pt',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('All %%pt_plural%% %%in_location_single%%', 'geodirectory'),
+		'placeholder' => 'All %%pt_plural%% %%in_location_single%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_pt_meta'),
+
+	// Cat listing page meta
+	array('name' => __('Listing Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Listing page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the category listing pages.', 'geodirectory'),
+		'id' => 'geodir_meta_title_listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%category%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%category%% %%in_location%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Listing page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the category listing pages.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_listing',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('Posts related to Category: %%category%% %%in_location%%', 'geodirectory'),
+		'placeholder' => 'Posts related to Category: %%category%% %%in_location%%'
+	),
+
+	array(
+		'name' => __('Category listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the category listing pages.', 'geodirectory'),
+		'id' => 'geodir_page_title_cat-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('All %%category%% %%in_location_single%%', 'geodirectory'),
+		'placeholder' => 'All %%category%% %%in_location_single%%'
+	),
+
+	array(
+		'name' => __('Tag listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the tag listing pages.', 'geodirectory'),
+		'id' => 'geodir_page_title_tag-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Tag: %%tag%% %%in_location_single%%', 'geodirectory'),
+		'placeholder' => 'Tag: %%tag%% %%in_location_single%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	// location page meta
+	array('name' => __('Location Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Location page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the location pages.', 'geodirectory'),
+		'id' => 'geodir_meta_title_location',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%location%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%location%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Location page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the location pages.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_location',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%location%%', 'geodirectory'),
+		'placeholder' => '%%location%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	// Search page meta
+	array('name' => __('Search Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Search page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the search page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_search',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Search page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the search page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_search',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	//Add listing page meta
+	array('name' => __('Add Listing Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Add listing page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the add listing page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_add-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Add %%pt_single%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => 'Add %%pt_single%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Add listing page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the add listing page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_add-listing',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('Add %%pt_single%%', 'geodirectory'),
+		'placeholder' => 'Add %%pt_single%%'
+	),
+
+	array(
+		'name' => __('Add listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the add listing page.', 'geodirectory'),
+		'id' => 'geodir_page_title_add-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Add %%pt_single%%', 'geodirectory'),
+		'placeholder' => 'Add %%pt_single%%'
+	),
+
+	array(
+		'name' => __('Edit listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the edit listing page.', 'geodirectory'),
+		'id' => 'geodir_page_title_edit-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Edit %%pt_single%%', 'geodirectory'),
+		'placeholder' => 'Edit %%pt_single%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	//Author page meta
+	array('name' => __('Author Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Author page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the author page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_author',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Author: %%name%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => 'Author: %%name%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Author page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the author page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_author',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array(
+		'name' => __('Author page title', 'geodirectory'),
+		'desc' => __('Enter the title for the author page.', 'geodirectory'),
+		'id' => 'geodir_page_title_author',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% by: %%name%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% by: %%name%%'
+	),
+
+	array(
+		'name' => __('Author favorite page title', 'geodirectory'),
+		'desc' => __('Enter the title for the author favorite page.', 'geodirectory'),
+		'id' => 'geodir_page_title_favorite',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%name%%: Favorite %%pt_plural%%', 'geodirectory'),
+		'placeholder' => '%%name%%: Favorite %%pt_plural%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	//Login page meta
+	array('name' => __('Login Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_login_meta'),
+
+	array(
+		'name' => __('Login page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the login page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_login',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Login page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the login page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_login',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
+
+	//Listing success page meta
+	array('name' => __('Listing Success Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_login_meta'),
+
+	array(
+		'name' => __('Listing success page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the listing success page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_listing-success',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Listing success page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the listing success page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_listing-success',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
 
 
 

geodirectory-functions/helper_functions.php

Indentation +335 added lines, -335 removed lines

@@ -14,13 +14,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_add_listing_page_id(){
-    $gd_page_id = get_option('geodir_add_listing_page');
+	$gd_page_id = get_option('geodir_add_listing_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -31,13 +31,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_preview_page_id(){
-    $gd_page_id = get_option('geodir_preview_page');
+	$gd_page_id = get_option('geodir_preview_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -48,13 +48,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_success_page_id(){
-    $gd_page_id = get_option('geodir_success_page');
+	$gd_page_id = get_option('geodir_success_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -65,13 +65,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_location_page_id(){
-    $gd_page_id = get_option('geodir_location_page');
+	$gd_page_id = get_option('geodir_location_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -82,13 +82,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_home_page_id(){
-    $gd_page_id = get_option('geodir_home_page');
+	$gd_page_id = get_option('geodir_home_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -99,13 +99,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_info_page_id(){
-    $gd_page_id = get_option('geodir_info_page');
+	$gd_page_id = get_option('geodir_info_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -116,13 +116,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_login_page_id(){
-    $gd_page_id = get_option('geodir_login_page');
+	$gd_page_id = get_option('geodir_login_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 
@@ -134,15 +134,15 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_login_url($args=array()){
-    $gd_page_id = get_option('geodir_login_page');
+	$gd_page_id = get_option('geodir_login_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    if (function_exists('geodir_location_geo_home_link')) {
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-    }
+	if (function_exists('geodir_location_geo_home_link')) {
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+	}
 
 	if (defined('ICL_LANGUAGE_CODE')){
 		$home_url = icl_get_home_url();
@@ -150,35 +150,35 @@ 
 		$home_url = home_url();
 	}
 
-    if (function_exists('geodir_location_geo_home_link')) {
-        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
-    }
-
-    if($gd_page_id){
-        $post = get_post($gd_page_id);
-        $slug = $post->post_name;
-        //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
-        $login_url = trailingslashit($home_url)."$slug/";
-    }else{
-        $login_url = trailingslashit($home_url)."?geodir_signup=true";
-    }
-
-    if($args){
-        $login_url = add_query_arg($args,$login_url );
-    }
-
-    /**
-     * Filter the GeoDirectory login page url.
-     *
-     * This filter can be used to change the GeoDirectory page url.
-     *
-     * @since 1.5.3
-     * @package GeoDirectory
-     * @param string $login_url The url of the login page.
-     * @param array $args The array of query args used.
-     * @param int $gd_page_id The page id of the GD login page.
-     */
-    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
+	if (function_exists('geodir_location_geo_home_link')) {
+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
+	}
+
+	if($gd_page_id){
+		$post = get_post($gd_page_id);
+		$slug = $post->post_name;
+		//$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
+		$login_url = trailingslashit($home_url)."$slug/";
+	}else{
+		$login_url = trailingslashit($home_url)."?geodir_signup=true";
+	}
+
+	if($args){
+		$login_url = add_query_arg($args,$login_url );
+	}
+
+	/**
+	 * Filter the GeoDirectory login page url.
+	 *
+	 * This filter can be used to change the GeoDirectory page url.
+	 *
+	 * @since 1.5.3
+	 * @package GeoDirectory
+	 * @param string $login_url The url of the login page.
+	 * @param array $args The array of query args used.
+	 * @param int $gd_page_id The page id of the GD login page.
+	 */
+	return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
 }
 
 /**
@@ -190,15 +190,15 @@ 
  * @return string Info page url.
  */
 function geodir_info_url($args=array()){
-    $gd_page_id = get_option('geodir_info_page');
+	$gd_page_id = get_option('geodir_info_page');
 
-    if (function_exists('icl_object_id')) {
-	    $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    if (function_exists('geodir_location_geo_home_link')) {
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-    }
+	if (function_exists('geodir_location_geo_home_link')) {
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+	}
 
 	if (defined('ICL_LANGUAGE_CODE')){
 		$home_url = icl_get_home_url();
@@ -206,24 +206,24 @@ 
 		$home_url = home_url();
 	}
 
-    if (function_exists('geodir_location_geo_home_link')) {
-        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
-    }
+	if (function_exists('geodir_location_geo_home_link')) {
+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
+	}
 
-    if($gd_page_id){
-        $post = get_post($gd_page_id);
-        $slug = $post->post_name;
-        //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
-        $info_url = trailingslashit($home_url)."$slug/";
-    }else{
-        $info_url = trailingslashit($home_url);
-    }
+	if($gd_page_id){
+		$post = get_post($gd_page_id);
+		$slug = $post->post_name;
+		//$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
+		$info_url = trailingslashit($home_url)."$slug/";
+	}else{
+		$info_url = trailingslashit($home_url);
+	}
 
-    if($args){
-        $info_url = add_query_arg($args,$info_url );
-    }
+	if($args){
+		$info_url = add_query_arg($args,$info_url );
+	}
 
-    return $info_url;
+	return $info_url;
 }
 
 /**
@@ -239,11 +239,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_ucwords($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_TITLE, $charset);
-    } else {
-        return ucwords($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_TITLE, $charset);
+	} else {
+		return ucwords($string);
+	}
 }
 
 /**
@@ -259,11 +259,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_strtolower($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_LOWER, $charset);
-    } else {
-        return strtolower($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_LOWER, $charset);
+	} else {
+		return strtolower($string);
+	}
 }
 
 /**
@@ -279,11 +279,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_strtoupper($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_UPPER, $charset);
-    } else {
-        return strtoupper($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_UPPER, $charset);
+	} else {
+		return strtoupper($string);
+	}
 }
 
 /**
@@ -462,11 +462,11 @@ 
  * @package GeoDirectory
  */
 function _gd_die_handler() {
-    if ( defined( 'GD_TESTING_MODE' ) ) {
-        return '_gd_die_handler';
-    } else {
-        die();
-    }
+	if ( defined( 'GD_TESTING_MODE' ) ) {
+		return '_gd_die_handler';
+	} else {
+		die();
+	}
 }
 
 /**
@@ -481,9 +481,9 @@ 
  * @param int $status     Optional. Status code.
  */
 function gd_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+	add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
+	add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
+	wp_die( $message, $title, array( 'response' => $status ));
 }
 
 /*
@@ -652,37 +652,37 @@ 
  * @return string The formatted date.
  */
 function geodir_date($date_input, $date_to, $date_from = '') {
-    if (empty($date_input) || empty($date_to)) {
-        return NULL;
-    }
+	if (empty($date_input) || empty($date_to)) {
+		return NULL;
+	}
     
-    $date = '';
-    if (!empty($date_from)) {
-        $datetime = date_create_from_format($date_from, $date_input);
+	$date = '';
+	if (!empty($date_from)) {
+		$datetime = date_create_from_format($date_from, $date_input);
         
-        if (!empty($datetime)) {
-            $date = $datetime->format($date_to);
-        }
-    }
+		if (!empty($datetime)) {
+			$date = $datetime->format($date_to);
+		}
+	}
     
-    if (empty($date)) {
-        $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input;
-        $date = date_i18n($date_to, strtotime($date));
-    }
+	if (empty($date)) {
+		$date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input;
+		$date = date_i18n($date_to, strtotime($date));
+	}
     
-    $date = geodir_maybe_untranslate_date($date);
-    /**
-     * Filter the the date format conversion.
-     *
-     * @since 1.6.7
-     * @package GeoDirectory
-     *
-     * @param string $date The date string.
-     * @param string $date_input The date input.
-     * @param string $date_to The destination date format.
-     * @param string $date_from The source date format.
-     */
-    return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from);
+	$date = geodir_maybe_untranslate_date($date);
+	/**
+	 * Filter the the date format conversion.
+	 *
+	 * @since 1.6.7
+	 * @package GeoDirectory
+	 *
+	 * @param string $date The date string.
+	 * @param string $date_input The date input.
+	 * @param string $date_to The destination date format.
+	 * @param string $date_from The source date format.
+	 */
+	return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from);
 }
 
 /**
@@ -707,91 +707,91 @@ 
  * @return string Trimmed string.
  */
 function geodir_excerpt($text, $length = 100, array $options = []) {
-    if (!(int)$length > 0) {
-        return $text;
-    }
-    $default = [
-        'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false,
-    ];
-    if (!empty($options['html']) && strtolower(mb_internal_encoding()) === 'utf-8') {
-        $default['ellipsis'] = "";
-    }
-    $options += $default;
-
-    $prefix = '';
-    $suffix = $options['ellipsis'];
-
-    if ($options['html']) {
-        $ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options);
-
-        $truncateLength = 0;
-        $totalLength = 0;
-        $openTags = [];
-        $truncate = '';
-
-        preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
-        foreach ($tags as $tag) {
-            $contentLength = geodir_strlen($tag[3], $options);
-
-            if ($truncate === '') {
-                if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) {
-                    if (preg_match('/<[\w]+[^>]*>/', $tag[0])) {
-                        array_unshift($openTags, $tag[2]);
-                    } elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) {
-                        $pos = array_search($closeTag[1], $openTags);
-                        if ($pos !== false) {
-                            array_splice($openTags, $pos, 1);
-                        }
-                    }
-                }
-
-                $prefix .= $tag[1];
-
-                if ($totalLength + $contentLength + $ellipsisLength > $length) {
-                    $truncate = $tag[3];
-                    $truncateLength = $length - $totalLength;
-                } else {
-                    $prefix .= $tag[3];
-                }
-            }
-
-            $totalLength += $contentLength;
-            if ($totalLength > $length) {
-                break;
-            }
-        }
-
-        if ($totalLength <= $length) {
-            return $text;
-        }
-
-        $text = $truncate;
-        $length = $truncateLength;
-
-        foreach ($openTags as $tag) {
-            $suffix .= '</' . $tag . '>';
-        }
-    } else {
-        if (geodir_strlen($text, $options) <= $length) {
-            return $text;
-        }
-        $ellipsisLength = geodir_strlen($options['ellipsis'], $options);
-    }
-
-    $result = geodir_substr($text, 0, $length - $ellipsisLength, $options);
-
-    if (!$options['exact']) {
-        if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') {
-            $result = geodir_remove_last_word($result);
-        }
-
-        // Do not need to count ellipsis in the cut, if result is empty.
-        if (!strlen($result)) {
-            $result = geodir_substr($text, 0, $length, $options);
-        }
-    }
-
-    return $prefix . $result . $suffix;
+	if (!(int)$length > 0) {
+		return $text;
+	}
+	$default = [
+		'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false,
+	];
+	if (!empty($options['html']) && strtolower(mb_internal_encoding()) === 'utf-8') {
+		$default['ellipsis'] = "";
+	}
+	$options += $default;
+
+	$prefix = '';
+	$suffix = $options['ellipsis'];
+
+	if ($options['html']) {
+		$ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options);
+
+		$truncateLength = 0;
+		$totalLength = 0;
+		$openTags = [];
+		$truncate = '';
+
+		preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
+		foreach ($tags as $tag) {
+			$contentLength = geodir_strlen($tag[3], $options);
+
+			if ($truncate === '') {
+				if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) {
+					if (preg_match('/<[\w]+[^>]*>/', $tag[0])) {
+						array_unshift($openTags, $tag[2]);
+					} elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) {
+						$pos = array_search($closeTag[1], $openTags);
+						if ($pos !== false) {
+							array_splice($openTags, $pos, 1);
+						}
+					}
+				}
+
+				$prefix .= $tag[1];
+
+				if ($totalLength + $contentLength + $ellipsisLength > $length) {
+					$truncate = $tag[3];
+					$truncateLength = $length - $totalLength;
+				} else {
+					$prefix .= $tag[3];
+				}
+			}
+
+			$totalLength += $contentLength;
+			if ($totalLength > $length) {
+				break;
+			}
+		}
+
+		if ($totalLength <= $length) {
+			return $text;
+		}
+
+		$text = $truncate;
+		$length = $truncateLength;
+
+		foreach ($openTags as $tag) {
+			$suffix .= '</' . $tag . '>';
+		}
+	} else {
+		if (geodir_strlen($text, $options) <= $length) {
+			return $text;
+		}
+		$ellipsisLength = geodir_strlen($options['ellipsis'], $options);
+	}
+
+	$result = geodir_substr($text, 0, $length - $ellipsisLength, $options);
+
+	if (!$options['exact']) {
+		if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') {
+			$result = geodir_remove_last_word($result);
+		}
+
+		// Do not need to count ellipsis in the cut, if result is empty.
+		if (!strlen($result)) {
+			$result = geodir_substr($text, 0, $length, $options);
+		}
+	}
+
+	return $prefix . $result . $suffix;
 }
 
 /**
@@ -815,28 +815,28 @@ 
  * @return int
  */
 function geodir_strlen($text, array $options) {
-    if (empty($options['trimWidth'])) {
-        $strlen = 'mb_strlen';
-    } else {
-        $strlen = 'mb_strwidth';
-    }
-
-    if (empty($options['html'])) {
-        return $strlen($text);
-    }
-
-    $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
-    $replace = preg_replace_callback(
-        $pattern,
-        function ($match) use ($strlen) {
-            $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
-
-            return str_repeat(' ', $strlen($utf8, 'UTF-8'));
-        },
-        $text
-    );
-
-    return $strlen($replace);
+	if (empty($options['trimWidth'])) {
+		$strlen = 'mb_strlen';
+	} else {
+		$strlen = 'mb_strwidth';
+	}
+
+	if (empty($options['html'])) {
+		return $strlen($text);
+	}
+
+	$pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
+	$replace = preg_replace_callback(
+		$pattern,
+		function ($match) use ($strlen) {
+			$utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
+
+			return str_repeat(' ', $strlen($utf8, 'UTF-8'));
+		},
+		$text
+	);
+
+	return $strlen($replace);
 }
 
 /**
@@ -857,80 +857,80 @@ 
  * @return string
  */
 function geodir_substr($text, $start, $length, array $options) {
-    if (empty($options['trimWidth'])) {
-        $substr = 'mb_substr';
-    } else {
-        $substr = 'mb_strimwidth';
-    }
-
-    $maxPosition = geodir_strlen($text, ['trimWidth' => false] + $options);
-    if ($start < 0) {
-        $start += $maxPosition;
-        if ($start < 0) {
-            $start = 0;
-        }
-    }
-    if ($start >= $maxPosition) {
-        return '';
-    }
-
-    if ($length === null) {
-        $length = geodir_strlen($text, $options);
-    }
-
-    if ($length < 0) {
-        $text = geodir_substr($text, $start, null, $options);
-        $start = 0;
-        $length += geodir_strlen($text, $options);
-    }
-
-    if ($length <= 0) {
-        return '';
-    }
-
-    if (empty($options['html'])) {
-        return (string)$substr($text, $start, $length);
-    }
-
-    $totalOffset = 0;
-    $totalLength = 0;
-    $result = '';
-
-    $pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i';
-    $parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-    foreach ($parts as $part) {
-        $offset = 0;
-
-        if ($totalOffset < $start) {
-            $len = geodir_strlen($part, ['trimWidth' => false] + $options);
-            if ($totalOffset + $len <= $start) {
-                $totalOffset += $len;
-                continue;
-            }
-
-            $offset = $start - $totalOffset;
-            $totalOffset = $start;
-        }
-
-        $len = geodir_strlen($part, $options);
-        if ($offset !== 0 || $totalLength + $len > $length) {
-            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
-                // Entities cannot be passed substr.
-                continue;
-            }
-
-            $part = $substr($part, $offset, $length - $totalLength);
-            $len = geodir_strlen($part, $options);
-        }
-
-        $result .= $part;
-        $totalLength += $len;
-        if ($totalLength >= $length) {
-            break;
-        }
-    }
-
-    return $result;
+	if (empty($options['trimWidth'])) {
+		$substr = 'mb_substr';
+	} else {
+		$substr = 'mb_strimwidth';
+	}
+
+	$maxPosition = geodir_strlen($text, ['trimWidth' => false] + $options);
+	if ($start < 0) {
+		$start += $maxPosition;
+		if ($start < 0) {
+			$start = 0;
+		}
+	}
+	if ($start >= $maxPosition) {
+		return '';
+	}
+
+	if ($length === null) {
+		$length = geodir_strlen($text, $options);
+	}
+
+	if ($length < 0) {
+		$text = geodir_substr($text, $start, null, $options);
+		$start = 0;
+		$length += geodir_strlen($text, $options);
+	}
+
+	if ($length <= 0) {
+		return '';
+	}
+
+	if (empty($options['html'])) {
+		return (string)$substr($text, $start, $length);
+	}
+
+	$totalOffset = 0;
+	$totalLength = 0;
+	$result = '';
+
+	$pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i';
+	$parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+	foreach ($parts as $part) {
+		$offset = 0;
+
+		if ($totalOffset < $start) {
+			$len = geodir_strlen($part, ['trimWidth' => false] + $options);
+			if ($totalOffset + $len <= $start) {
+				$totalOffset += $len;
+				continue;
+			}
+
+			$offset = $start - $totalOffset;
+			$totalOffset = $start;
+		}
+
+		$len = geodir_strlen($part, $options);
+		if ($offset !== 0 || $totalLength + $len > $length) {
+			if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
+				// Entities cannot be passed substr.
+				continue;
+			}
+
+			$part = $substr($part, $offset, $length - $totalLength);
+			$len = geodir_strlen($part, $options);
+		}
+
+		$result .= $part;
+		$totalLength += $len;
+		if ($totalLength >= $length) {
+			break;
+		}
+	}
+
+	return $result;
 }
 
 /**
@@ -943,19 +943,19 @@ 
  * @return string
  */
 function geodir_remove_last_word($text) {
-    $spacepos = mb_strrpos($text, ' ');
+	$spacepos = mb_strrpos($text, ' ');
 
-    if ($spacepos !== false) {
-        $lastWord = mb_strrpos($text, $spacepos);
+	if ($spacepos !== false) {
+		$lastWord = mb_strrpos($text, $spacepos);
 
-        // Some languages are written without word separation.
-        // We recognize a string as a word if it does not contain any full-width characters.
-        if (mb_strwidth($lastWord) === mb_strlen($lastWord)) {
-            $text = mb_substr($text, 0, $spacepos);
-        }
+		// Some languages are written without word separation.
+		// We recognize a string as a word if it does not contain any full-width characters.
+		if (mb_strwidth($lastWord) === mb_strlen($lastWord)) {
+			$text = mb_substr($text, 0, $spacepos);
+		}
 
-        return $text;
-    }
+		return $text;
+	}
 
-    return '';
+	return '';
 }
\ No newline at end of file