GeoDirectory / geodirectory

geodirectory_shortcodes.php

Indentation +656 added lines, -656 removed lines

@@ -7,7 +7,7 @@ 
  */
 // If this file is called directly, abort.
 if (!defined('WPINC')) {
-    die;
+	die;
 }
 require_once('geodirectory-functions/shortcode_functions.php');
 
@@ -32,48 +32,48 @@ 
  */
 function geodir_sc_add_listing($atts)
 {
-    ob_start();
-    $defaults = array(
-        'pid' => '',
-        'listing_type' => 'gd_place',
-        'login_msg' => __('You must login to post.', 'geodirectory'),
-        'show_login' => false,
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    foreach ($params as $key => $value) {
-        $_REQUEST[$key] = $value;
-    }
-
-    $user_id = get_current_user_id();
-    if (!$user_id) {
-        echo $params['login_msg'];
-        if ($params['show_login']) {
-            echo "<br />";
-            $defaults = array(
-                'before_widget' => '',
-                'after_widget' => '',
-                'before_title' => '',
-                'after_title' => '',
-            );
-
-            geodir_loginwidget_output($defaults, $defaults);
-        }
-
-
-    } else {
-        ###### MAIN CONTENT ######
-
-        /** This action is documented in geodirectory-templates/add-listing.php */
-        do_action('geodir_add_listing_page_mandatory');
-        /** This action is documented in geodirectory-templates/add-listing.php */
-        do_action('geodir_add_listing_form');
-    }
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	ob_start();
+	$defaults = array(
+		'pid' => '',
+		'listing_type' => 'gd_place',
+		'login_msg' => __('You must login to post.', 'geodirectory'),
+		'show_login' => false,
+	);
+	$params = shortcode_atts($defaults, $atts);
+
+	foreach ($params as $key => $value) {
+		$_REQUEST[$key] = $value;
+	}
+
+	$user_id = get_current_user_id();
+	if (!$user_id) {
+		echo $params['login_msg'];
+		if ($params['show_login']) {
+			echo "<br />";
+			$defaults = array(
+				'before_widget' => '',
+				'after_widget' => '',
+				'before_title' => '',
+				'after_title' => '',
+			);
+
+			geodir_loginwidget_output($defaults, $defaults);
+		}
+
+
+	} else {
+		###### MAIN CONTENT ######
+
+		/** This action is documented in geodirectory-templates/add-listing.php */
+		do_action('geodir_add_listing_page_mandatory');
+		/** This action is documented in geodirectory-templates/add-listing.php */
+		do_action('geodir_add_listing_form');
+	}
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 /**
@@ -101,136 +101,136 @@ 
  */
 function geodir_sc_home_map($atts)
 {
-    ob_start();
-    $defaults = array(
-        'width' => '960',
-        'height' => '425',
-        'maptype' => 'ROADMAP',
-        'zoom' => '13',
-        'autozoom' => '',
-        'child_collapse' => '0',
-        'scrollwheel' => '0',
+	ob_start();
+	$defaults = array(
+		'width' => '960',
+		'height' => '425',
+		'maptype' => 'ROADMAP',
+		'zoom' => '13',
+		'autozoom' => '',
+		'child_collapse' => '0',
+		'scrollwheel' => '0',
 		'marker_cluster' => false,
-        'latitude' => '',
-        'longitude' => ''
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-    $params = gdsc_validate_map_args($params);
-
-    $map_args = array(
-        'map_canvas_name' => 'gd_home_map',
-        'latitude' => $params['latitude'],
-        'longitude' => $params['longitude'],
-
-        /**
-         * Filter the widget width of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param mixed(string|int|float) $params['width'] The map width.
-         */
-        'width' => apply_filters('widget_width', $params['width']),
-        /**
-         * Filter the widget height of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param mixed(string|int|float) $params['height'] The map height.
-         */
-        'height' => apply_filters('widget_heigh', $params['height']),
-        /**
-         * Filter the widget maptype of the map on home/listings page.
-         *
-         * @since 1.0.0
+		'latitude' => '',
+		'longitude' => ''
+	);
+
+	$params = shortcode_atts($defaults, $atts);
+
+	$params = gdsc_validate_map_args($params);
+
+	$map_args = array(
+		'map_canvas_name' => 'gd_home_map',
+		'latitude' => $params['latitude'],
+		'longitude' => $params['longitude'],
+
+		/**
+		 * Filter the widget width of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param mixed(string|int|float) $params['width'] The map width.
+		 */
+		'width' => apply_filters('widget_width', $params['width']),
+		/**
+		 * Filter the widget height of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param mixed(string|int|float) $params['height'] The map height.
+		 */
+		'height' => apply_filters('widget_heigh', $params['height']),
+		/**
+		 * Filter the widget maptype of the map on home/listings page.
+		 *
+		 * @since 1.0.0
 		 * @since 1.5.2 Added TERRAIN map type.
-         * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN.
-         */
-        'maptype' => apply_filters('widget_maptype', $params['maptype']),
-        /**
-         * Filter the widget scrollwheel value of the map on home/listings page.
-         *
-         * Should the scrollwheel zoom the map or not.
-         *
-         * @since 1.0.0
-         * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not.
-         */
-        'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']),
-        /**
-         * Filter the widget zoom level of the map on home/listings page.
-         *
-         * @since 1.0.0
-         * @param int $params['zoom'] The zoom level of the map. Between 1-19.
-         */
-        'zoom' => apply_filters('widget_zoom', $params['zoom']),
-        /**
-         * Filter the widget auto zoom value of the map on home/listings page.
-         *
-         * If the map should autozoom to fit the markers shown.
-         *
-         * @since 1.0.0
-         * @param bool $params['autozoom'] True if the map should autozoom, false if not.
-         */
-        'autozoom' => apply_filters('widget_autozoom', $params['autozoom']),
-        /**
-         * Filter the widget child_collapse value of the map on home/listings page.
-         *
-         * If the map should auto collapse the child categories if the category bar is present.
-         *
-         * @since 1.0.0
-         * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not.
-         */
-        'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']),
-        'enable_cat_filters' => true,
-        'enable_text_search' => true,
-        'enable_post_type_filters' => true,
-        /**
-         * Filter the widget enable_location_filters value of the map on home/listings page.
-         *
-         * This is used when the location addon is used.
-         *
-         * @since 1.0.0
-         * @param bool $val True if location filters should be used, false if not.
-         */
-        'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false),
-        'enable_jason_on_load' => false,
-        'enable_marker_cluster' => false,
-        'enable_map_resize_button' => true,
-        'map_class_name' => 'geodir-map-home-page',
-        'is_geodir_home_map_widget' => true,
-    );
+		 * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN.
+		 */
+		'maptype' => apply_filters('widget_maptype', $params['maptype']),
+		/**
+		 * Filter the widget scrollwheel value of the map on home/listings page.
+		 *
+		 * Should the scrollwheel zoom the map or not.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not.
+		 */
+		'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']),
+		/**
+		 * Filter the widget zoom level of the map on home/listings page.
+		 *
+		 * @since 1.0.0
+		 * @param int $params['zoom'] The zoom level of the map. Between 1-19.
+		 */
+		'zoom' => apply_filters('widget_zoom', $params['zoom']),
+		/**
+		 * Filter the widget auto zoom value of the map on home/listings page.
+		 *
+		 * If the map should autozoom to fit the markers shown.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['autozoom'] True if the map should autozoom, false if not.
+		 */
+		'autozoom' => apply_filters('widget_autozoom', $params['autozoom']),
+		/**
+		 * Filter the widget child_collapse value of the map on home/listings page.
+		 *
+		 * If the map should auto collapse the child categories if the category bar is present.
+		 *
+		 * @since 1.0.0
+		 * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not.
+		 */
+		'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']),
+		'enable_cat_filters' => true,
+		'enable_text_search' => true,
+		'enable_post_type_filters' => true,
+		/**
+		 * Filter the widget enable_location_filters value of the map on home/listings page.
+		 *
+		 * This is used when the location addon is used.
+		 *
+		 * @since 1.0.0
+		 * @param bool $val True if location filters should be used, false if not.
+		 */
+		'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false),
+		'enable_jason_on_load' => false,
+		'enable_marker_cluster' => false,
+		'enable_map_resize_button' => true,
+		'map_class_name' => 'geodir-map-home-page',
+		'is_geodir_home_map_widget' => true,
+	);
 
 	// Add marker cluster
 	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
-        $map_args['enable_marker_cluster'] = true;
-        if(get_option('geodir_marker_cluster_type')) {
-            if ($map_args['autozoom']) {
-                $map_args['enable_marker_cluster_no_reposition'] = false;
-            } else {
-                $map_args['enable_marker_cluster_no_reposition'] = true;
-            }
+		$map_args['enable_marker_cluster'] = true;
+		if(get_option('geodir_marker_cluster_type')) {
+			if ($map_args['autozoom']) {
+				$map_args['enable_marker_cluster_no_reposition'] = false;
+			} else {
+				$map_args['enable_marker_cluster_no_reposition'] = true;
+			}
 
-            $map_args['enable_marker_cluster_server'] = true ;
+			$map_args['enable_marker_cluster_server'] = true ;
 
-        }
+		}
 	} else {
 		$map_args['enable_marker_cluster'] = false;
 	}
 
-    // if lat and long set in shortcode, hack it so the map is not repositioned
-    if(!empty($params['latitude']) && !empty($params['longitude']) ){
-        $map_args['enable_marker_cluster_no_reposition'] = true;
-    }
+	// if lat and long set in shortcode, hack it so the map is not repositioned
+	if(!empty($params['latitude']) && !empty($params['longitude']) ){
+		$map_args['enable_marker_cluster_no_reposition'] = true;
+	}
 
 
-    geodir_draw_map($map_args);
+	geodir_draw_map($map_args);
 
-    add_action('wp_footer', 'geodir_home_map_add_script', 100);
+	add_action('wp_footer', 'geodir_home_map_add_script', 100);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_homepage_map', 'geodir_sc_home_map');
 
@@ -264,77 +264,77 @@ 
  */
 function geodir_sc_listing_map($atts)
 {
-    ob_start();
-    add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
-
-    add_action('the_post', 'create_list_jsondata'); // Add marker in json array
-
-    add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
-
-    $defaults = array(
-        'width' => '294',
-        'height' => '370',
-        'zoom' => '13',
-        'autozoom' => '',
-        'sticky' => '',
-        'showall' => '0',
-        'scrollwheel' => '0',
-        'maptype' => 'ROADMAP',
-        'child_collapse' => 0,
+	ob_start();
+	add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array
+
+	add_action('the_post', 'create_list_jsondata'); // Add marker in json array
+
+	add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers
+
+	$defaults = array(
+		'width' => '294',
+		'height' => '370',
+		'zoom' => '13',
+		'autozoom' => '',
+		'sticky' => '',
+		'showall' => '0',
+		'scrollwheel' => '0',
+		'maptype' => 'ROADMAP',
+		'child_collapse' => 0,
 		'marker_cluster' => false
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-    $params = gdsc_validate_map_args($params);
-
-    $map_args = array(
-        'map_canvas_name' => 'gd_listing_map',
-        'width' => $params['width'],
-        'height' => $params['height'],
-        'zoom' => $params['zoom'],
-        'autozoom' => $params['autozoom'],
-        'sticky' => $params['sticky'],
-        'showall' => $params['showall'],
-        'scrollwheel' => $params['scrollwheel'],
-        'child_collapse' => 0,
-        'enable_cat_filters' => false,
-        'enable_text_search' => false,
-        'enable_post_type_filters' => false,
-        'enable_location_filters' => false,
-        'enable_jason_on_load' => true,
-    );
-
-    if (is_single()) {
-
-        global $post;
-        $map_default_lat = $address_latitude = $post->post_latitude;
-        $map_default_lng = $address_longitude = $post->post_longitude;
-        $mapview = $post->post_mapview;
-        $map_args['zoom'] = $post->post_mapzoom;
-        $map_args['map_class_name'] = 'geodir-map-listing-page-single';
-
-    } else {
-        $default_location = geodir_get_default_location();
-
-        $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
-        $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
-        $map_args['map_class_name'] = 'geodir-map-listing-page';
-    }
-
-    if (empty($mapview)) {
-        $mapview = 'ROADMAP';
-    }
-
-    // Set default map options
-    $map_args['ajax_url'] = geodir_get_ajax_url();
-    $map_args['latitude'] = $map_default_lat;
-    $map_args['longitude'] = $map_default_lng;
-    $map_args['streetViewControl'] = true;
-    $map_args['maptype'] = $mapview;
-    $map_args['showPreview'] = '0';
-    $map_args['maxZoom'] = 21;
-    $map_args['bubble_size'] = 'small';
+	);
+
+	$params = shortcode_atts($defaults, $atts);
+
+	$params = gdsc_validate_map_args($params);
+
+	$map_args = array(
+		'map_canvas_name' => 'gd_listing_map',
+		'width' => $params['width'],
+		'height' => $params['height'],
+		'zoom' => $params['zoom'],
+		'autozoom' => $params['autozoom'],
+		'sticky' => $params['sticky'],
+		'showall' => $params['showall'],
+		'scrollwheel' => $params['scrollwheel'],
+		'child_collapse' => 0,
+		'enable_cat_filters' => false,
+		'enable_text_search' => false,
+		'enable_post_type_filters' => false,
+		'enable_location_filters' => false,
+		'enable_jason_on_load' => true,
+	);
+
+	if (is_single()) {
+
+		global $post;
+		$map_default_lat = $address_latitude = $post->post_latitude;
+		$map_default_lng = $address_longitude = $post->post_longitude;
+		$mapview = $post->post_mapview;
+		$map_args['zoom'] = $post->post_mapzoom;
+		$map_args['map_class_name'] = 'geodir-map-listing-page-single';
+
+	} else {
+		$default_location = geodir_get_default_location();
+
+		$map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
+		$map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
+		$map_args['map_class_name'] = 'geodir-map-listing-page';
+	}
+
+	if (empty($mapview)) {
+		$mapview = 'ROADMAP';
+	}
+
+	// Set default map options
+	$map_args['ajax_url'] = geodir_get_ajax_url();
+	$map_args['latitude'] = $map_default_lat;
+	$map_args['longitude'] = $map_default_lng;
+	$map_args['streetViewControl'] = true;
+	$map_args['maptype'] = $mapview;
+	$map_args['showPreview'] = '0';
+	$map_args['maxZoom'] = 21;
+	$map_args['bubble_size'] = 'small';
 	
 	// Add marker cluster
 	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
@@ -343,13 +343,13 @@ 
 		$map_args['enable_marker_cluster'] = false;
 	}
 
-    geodir_draw_map($map_args);
+	geodir_draw_map($map_args);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_listing_slider', 'geodir_sc_listing_slider');
@@ -382,120 +382,120 @@ 
  */
 function geodir_sc_listing_slider($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_type' => 'gd_place',
-        'category' => '0',
-        'post_number' => '5',
-        'slideshow' => '0',
-        'animation_loop' => 0,
-        'direction_nav' => 0,
-        'slideshow_speed' => 5000,
-        'animation_speed' => 600,
-        'animation' => 'slide',
-        'order_by' => 'latest',
-        'show_title' => '',
-        'show_featured_only' => '',
-        'title' => '',
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-
-    /*
+	ob_start();
+	$defaults = array(
+		'post_type' => 'gd_place',
+		'category' => '0',
+		'post_number' => '5',
+		'slideshow' => '0',
+		'animation_loop' => 0,
+		'direction_nav' => 0,
+		'slideshow_speed' => 5000,
+		'animation_speed' => 600,
+		'animation' => 'slide',
+		'order_by' => 'latest',
+		'show_title' => '',
+		'show_featured_only' => '',
+		'title' => '',
+	);
+
+	$params = shortcode_atts($defaults, $atts);
+
+
+	/*
      *
      * Now we begin the validation of the attributes.
      */
-    // Check we have a valid post_type
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
-
-    // Check we have a valid sort_order
-    $params['order_by'] = gdsc_validate_sort_choice($params['order_by']);
-
-    // Match the chosen animation to our options
-    $animation_list = array('slide', 'fade');
-    if (!(in_array($params['animation'], $animation_list))) {
-        $params['animation'] = 'slide';
-    }
-
-    // Post_number needs to be a positive integer
-    $params['post_number'] = absint($params['post_number']);
-    if (0 == $params['post_number']) {
-        $params['post_number'] = 1;
-    }
-
-    // Manage the entered categories
-    if (0 != $params['category'] || '' != $params['category']) {
-        $params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']);
-    }
-    // Convert show_title to a bool
-    $params['show_title'] = intval(gdsc_to_bool_val($params['show_title']));
-
-    // Convert show_featured_only to a bool
-    $params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only']));
-
-    /*
+	// Check we have a valid post_type
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
+
+	// Check we have a valid sort_order
+	$params['order_by'] = gdsc_validate_sort_choice($params['order_by']);
+
+	// Match the chosen animation to our options
+	$animation_list = array('slide', 'fade');
+	if (!(in_array($params['animation'], $animation_list))) {
+		$params['animation'] = 'slide';
+	}
+
+	// Post_number needs to be a positive integer
+	$params['post_number'] = absint($params['post_number']);
+	if (0 == $params['post_number']) {
+		$params['post_number'] = 1;
+	}
+
+	// Manage the entered categories
+	if (0 != $params['category'] || '' != $params['category']) {
+		$params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']);
+	}
+	// Convert show_title to a bool
+	$params['show_title'] = intval(gdsc_to_bool_val($params['show_title']));
+
+	// Convert show_featured_only to a bool
+	$params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only']));
+
+	/*
      * Hopefully all attributes are now valid, and safe to pass forward
      */
 
-    // redeclare vars after validation
-
-    if (isset($params['direction_nav'])) {
-        $params['directionNav'] = $params['direction_nav'];
-    }
-    if (isset($params['animation_loop'])) {
-        $params['animationLoop'] = $params['animation_loop'];
-    }
-    if (isset($params['slideshow_speed'])) {
-        $params['slideshowSpeed'] = $params['slideshow_speed'];
-    }
-    if (isset($params['animation_speed'])) {
-        $params['animationSpeed'] = $params['animation_speed'];
-    }
-    if (isset($params['order_by'])) {
-        $params['list_sort'] = $params['order_by'];
-    }
-
-    $query_args = array(
-        'post_number' => $params['post_number'],
-        'is_geodir_loop' => true,
-        'post_type' => $params['post_type'],
-        'order_by' => $params['order_by']
-    );
-
-    if (1 == $params['show_featured_only']) {
-        $query_args['show_featured_only'] = 1;
-    }
-
-    if (0 != $params['category'] && '' != $params['category']) {
-        $category_taxonomy = geodir_get_taxonomies($params['post_type']);
-        $tax_query = array(
-            'taxonomy' => $category_taxonomy[0],
-            'field' => 'id',
-            'terms' => $params['category'],
-        );
-
-        $query_args['tax_query'] = array($tax_query);
-    }
-
-    $defaults = array(
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-    );
-
-    $query_args = array_merge($query_args, $params);
-
-    geodir_listing_slider_widget_output($defaults, $query_args);
-
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	// redeclare vars after validation
+
+	if (isset($params['direction_nav'])) {
+		$params['directionNav'] = $params['direction_nav'];
+	}
+	if (isset($params['animation_loop'])) {
+		$params['animationLoop'] = $params['animation_loop'];
+	}
+	if (isset($params['slideshow_speed'])) {
+		$params['slideshowSpeed'] = $params['slideshow_speed'];
+	}
+	if (isset($params['animation_speed'])) {
+		$params['animationSpeed'] = $params['animation_speed'];
+	}
+	if (isset($params['order_by'])) {
+		$params['list_sort'] = $params['order_by'];
+	}
+
+	$query_args = array(
+		'post_number' => $params['post_number'],
+		'is_geodir_loop' => true,
+		'post_type' => $params['post_type'],
+		'order_by' => $params['order_by']
+	);
+
+	if (1 == $params['show_featured_only']) {
+		$query_args['show_featured_only'] = 1;
+	}
+
+	if (0 != $params['category'] && '' != $params['category']) {
+		$category_taxonomy = geodir_get_taxonomies($params['post_type']);
+		$tax_query = array(
+			'taxonomy' => $category_taxonomy[0],
+			'field' => 'id',
+			'terms' => $params['category'],
+		);
+
+		$query_args['tax_query'] = array($tax_query);
+	}
+
+	$defaults = array(
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+	);
+
+	$query_args = array_merge($query_args, $params);
+
+	geodir_listing_slider_widget_output($defaults, $query_args);
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_login_box', 'geodir_sc_login_box');
@@ -519,22 +519,22 @@ 
  */
 function geodir_sc_login_box($atts)
 {
-    ob_start();
+	ob_start();
 
-    $defaults = array(
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-    );
+	$defaults = array(
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+	);
 
-    geodir_loginwidget_output($defaults, $defaults);
+	geodir_loginwidget_output($defaults, $defaults);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_popular_post_category', 'geodir_sc_popular_post_category');
@@ -563,28 +563,28 @@ 
  */
 function geodir_sc_popular_post_category($atts)
 {
-    ob_start();
-    global $geodir_post_category_str;
-    $defaults = array(
-        'category_limit' => 15,
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '',
-        'after_title' => '',
-        'title' => '',
+	ob_start();
+	global $geodir_post_category_str;
+	$defaults = array(
+		'category_limit' => 15,
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+		'title' => '',
 		'default_post_type' => '',
-    );
+	);
 
-    $params = shortcode_atts($defaults, $atts, 'popular_post_category');
-    $params['category_limit'] = absint($params['category_limit']);
+	$params = shortcode_atts($defaults, $atts, 'popular_post_category');
+	$params['category_limit'] = absint($params['category_limit']);
 	$params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : '';
-    geodir_popular_post_category_output($params, $params);
+	geodir_popular_post_category_output($params, $params);
 
-    $output = ob_get_contents();
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_popular_post_view', 'geodir_sc_popular_post_view');
@@ -624,97 +624,97 @@ 
  */
 function geodir_sc_popular_post_view($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_type' => 'gd_place',
-        'category' => '0',
-        'post_number' => '5',
-        'layout' => 'gridview_onehalf',
-        'add_location_filter' => '0',
-        'list_sort' => 'latest',
-        'use_viewing_post_type' => '1',
-        'character_count' => '20',
-        'listing_width' => '',
-        'show_featured_only' => '0',
-        'show_special_only' => '0',
-        'with_pics_only' => '0',
-        'with_videos_only' => '0',
-        'before_widget' => '',
-        'after_widget' => '',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
-        'title' => '',
-        'category_title' => '',
-    );
-
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Validate our incoming params
-     */
+	ob_start();
+	$defaults = array(
+		'post_type' => 'gd_place',
+		'category' => '0',
+		'post_number' => '5',
+		'layout' => 'gridview_onehalf',
+		'add_location_filter' => '0',
+		'list_sort' => 'latest',
+		'use_viewing_post_type' => '1',
+		'character_count' => '20',
+		'listing_width' => '',
+		'show_featured_only' => '0',
+		'show_special_only' => '0',
+		'with_pics_only' => '0',
+		'with_videos_only' => '0',
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+		'title' => '',
+		'category_title' => '',
+	);
 
-    // Validate the selected post type, default to gd_place on fail
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
-
-    // Validate the selected category/ies - Grab the current list based on post_type
-    $category_taxonomy = geodir_get_taxonomies($params['post_type']);
-    $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
-
-    // Make sure we have an array
-    if (!(is_array($params['category']))) {
-        $params['category'] = explode(',', $params['category']);
-    }
-
-    // Array_intersect returns only the items in $params['category'] that are also in our category list
-    // Otherwise it becomes empty and later on that will mean "All"
-    $params['category'] = array_intersect($params['category'], $categories);
-
-    // Post_number needs to be a positive integer
-    $params['post_number'] = absint($params['post_number']);
-    if (0 == $params['post_number']) {
-        $params['post_number'] = 1;
-    }
-
-    // Validate our layout choice
-    // Outside of the norm, I added some more simple terms to match the existing
-    // So now I just run the switch to set it properly.
-    $params['layout'] = gdsc_validate_layout_choice($params['layout']);
-
-    // Validate our sorting choice
-    $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
-
-    // Validate character_count
-    $params['character_count'] = absint($params['character_count']);
-    if (20 > $params['character_count']) {
-        $params['character_count'] = 20;
-    }
-
-    // Validate Listing width, used in the template widget-listing-listview.php
-    // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
-
-    // Validate the checkboxes used on the widget
-    $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
-    $params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
-    $params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
-    $params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
-    $params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
-    $params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']);
-
-    /**
-     * End of validation
-     */
+	$params = shortcode_atts($defaults, $atts);
+
+	/**
+	 * Validate our incoming params
+	 */
+
+	// Validate the selected post type, default to gd_place on fail
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
 
-    geodir_popular_postview_output($params, $params);
+	// Validate the selected category/ies - Grab the current list based on post_type
+	$category_taxonomy = geodir_get_taxonomies($params['post_type']);
+	$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
 
+	// Make sure we have an array
+	if (!(is_array($params['category']))) {
+		$params['category'] = explode(',', $params['category']);
+	}
+
+	// Array_intersect returns only the items in $params['category'] that are also in our category list
+	// Otherwise it becomes empty and later on that will mean "All"
+	$params['category'] = array_intersect($params['category'], $categories);
+
+	// Post_number needs to be a positive integer
+	$params['post_number'] = absint($params['post_number']);
+	if (0 == $params['post_number']) {
+		$params['post_number'] = 1;
+	}
 
-    $output = ob_get_contents();
+	// Validate our layout choice
+	// Outside of the norm, I added some more simple terms to match the existing
+	// So now I just run the switch to set it properly.
+	$params['layout'] = gdsc_validate_layout_choice($params['layout']);
 
-    ob_end_clean();
+	// Validate our sorting choice
+	$params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
 
-    return $output;
+	// Validate character_count
+	$params['character_count'] = absint($params['character_count']);
+	if (20 > $params['character_count']) {
+		$params['character_count'] = 20;
+	}
+
+	// Validate Listing width, used in the template widget-listing-listview.php
+	// The context is in width=$listing_width% - So we need a positive number between 0 & 100
+	$params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
+
+	// Validate the checkboxes used on the widget
+	$params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+	$params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
+	$params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
+	$params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
+	$params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
+	$params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']);
+
+	/**
+	 * End of validation
+	 */
+
+	geodir_popular_postview_output($params, $params);
+
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_recent_reviews', 'geodir_sc_recent_reviews');
@@ -736,37 +736,37 @@ 
  * @return string Recent reviews HTML.
  */
 function geodir_sc_recent_reviews($atts) {
-    ob_start();
-    $defaults = array(
+	ob_start();
+	$defaults = array(
 		'title' => '',
 		'count' => 5,
-    );
+	);
 
-    $params = shortcode_atts($defaults, $atts);
+	$params = shortcode_atts($defaults, $atts);
 
-    $count = absint($params['count']);
-    if (0 == $count) {
-        $count = 1;
-    }
+	$count = absint($params['count']);
+	if (0 == $count) {
+		$count = 1;
+	}
 	
 	$title = !empty($params['title']) ? __($params['title'], 'geodirectory') : '';
 
-    $comments_li = geodir_get_recent_reviews(30, $count, 100, false);
+	$comments_li = geodir_get_recent_reviews(30, $count, 100, false);
 
-    if ($comments_li) {
-        if ($title != '') { ?>
+	if ($comments_li) {
+		if ($title != '') { ?>
 		<h3 class="geodir-sc-recent-reviews-title widget-title"><?php echo $title; ?></h3>
 		<?php } ?>
         <div class="geodir_sc_recent_reviews_section">
             <ul class="geodir_sc_recent_reviews"><?php echo $comments_li; ?></ul>
         </div>
     <?php
-    }
-    $output = ob_get_contents();
+	}
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 add_shortcode('gd_related_listings', 'geodir_sc_related_listings');
@@ -796,64 +796,64 @@ 
  */
 function geodir_sc_related_listings($atts)
 {
-    ob_start();
-    $defaults = array(
-        'post_number' => 5,
-        'relate_to' => 'category',
-        'layout' => 'gridview_onehalf',
-        'add_location_filter' => 0,
-        'listing_width' => '',
-        'list_sort' => 'latest',
-        'character_count' => 20,
-        'is_widget' => 1,
-        'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>',
-    );
-    // The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet.
-
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * Begin validating parameters
-     */
+	ob_start();
+	$defaults = array(
+		'post_number' => 5,
+		'relate_to' => 'category',
+		'layout' => 'gridview_onehalf',
+		'add_location_filter' => 0,
+		'listing_width' => '',
+		'list_sort' => 'latest',
+		'character_count' => 20,
+		'is_widget' => 1,
+		'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>',
+	);
+	// The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet.
+
+	$params = shortcode_atts($defaults, $atts);
+
+	/**
+	 * Begin validating parameters
+	 */
 
-    // Validate that post_number is a number and is 1 or higher
-    $params['post_number'] = absint($params['post_number']);
-    if (0 === $params['post_number']) {
-        $params['post_number'] = 1;
-    }
+	// Validate that post_number is a number and is 1 or higher
+	$params['post_number'] = absint($params['post_number']);
+	if (0 === $params['post_number']) {
+		$params['post_number'] = 1;
+	}
 
-    // Validate relate_to - only category or tags
-    $params['relate_to'] = geodir_strtolower($params['relate_to']);
-    if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) {
-        $params['relate_to'] = 'category';
-    }
+	// Validate relate_to - only category or tags
+	$params['relate_to'] = geodir_strtolower($params['relate_to']);
+	if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) {
+		$params['relate_to'] = 'category';
+	}
 
-    // Validate layout selection
-    $params['layout'] = gdsc_validate_layout_choice($params['layout']);
+	// Validate layout selection
+	$params['layout'] = gdsc_validate_layout_choice($params['layout']);
 
-    // Validate sorting option
-    $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
+	// Validate sorting option
+	$params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
 
-    // Validate add_location_filter
-    $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+	// Validate add_location_filter
+	$params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
 
-    // Validate listing_width
-    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
+	// Validate listing_width
+	$params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
-    // Validate character_count
-    $params['character_count'] = absint($params['character_count']);
-    if (20 > $params['character_count']) {
-        $params['character_count'] = 20;
-    }
+	// Validate character_count
+	$params['character_count'] = absint($params['character_count']);
+	if (20 > $params['character_count']) {
+		$params['character_count'] = 20;
+	}
 
-    if ($related_display = geodir_related_posts_display($params)) {
-        echo $related_display;
-    }
-    $output = ob_get_contents();
+	if ($related_display = geodir_related_posts_display($params)) {
+		echo $related_display;
+	}
+	$output = ob_get_contents();
 
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 
 /**
@@ -877,12 +877,12 @@ 
  * @return string Advanced search widget HTML.
  */
 function geodir_sc_advanced_search($atts) {
-    $defaults = array(
+	$defaults = array(
 		'title' => '',
 		'before_widget' => '<section id="geodir_advanced_search-1" class="widget geodir-widget geodir_advanced_search_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
 		'show_adv_search' => 'default'
 	);
 	
@@ -906,9 +906,9 @@ 
 	the_widget('geodir_advance_search_widget', $params, $params );
 	
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_advanced_search', 'geodir_sc_advanced_search');
 
@@ -954,48 +954,48 @@ 
 		'add_location_filter' => '1',
 		'tab_layout' => 'bestof-tabs-on-top',
 		'before_widget' => '<section id="bestof_widget-1" class="widget geodir-widget geodir_bestof_widget geodir_sc_bestof_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
 	);
 	$params = shortcode_atts($defaults, $atts);
 
-    /**
-     * Validate our incoming params
-     */
+	/**
+	 * Validate our incoming params
+	 */
 
-    // Validate the selected post type, default to gd_place on fail
-    if (!(gdsc_is_post_type_valid($params['post_type']))) {
-        $params['post_type'] = 'gd_place';
-    }
+	// Validate the selected post type, default to gd_place on fail
+	if (!(gdsc_is_post_type_valid($params['post_type']))) {
+		$params['post_type'] = 'gd_place';
+	}
 	
 	// Post limit needs to be a positive integer
-    $params['post_limit'] = absint($params['post_limit']);
-    if (0 == $params['post_limit']) {
-        $params['post_limit'] = 5;
-    }
+	$params['post_limit'] = absint($params['post_limit']);
+	if (0 == $params['post_limit']) {
+		$params['post_limit'] = 5;
+	}
 	
 	// Category limit needs to be a positive integer
-    $params['categ_limit'] = absint($params['categ_limit']);
-    if (0 == $params['categ_limit']) {
-        $params['categ_limit'] = 3;
-    }
+	$params['categ_limit'] = absint($params['categ_limit']);
+	if (0 == $params['categ_limit']) {
+		$params['categ_limit'] = 3;
+	}
 	
 	// Tab layout validation
-    $params['tab_layout'] = $params['tab_layout'];
-    if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) {
-        $params['tab_layout'] = 'bestof-tabs-on-top';
-    }
+	$params['tab_layout'] = $params['tab_layout'];
+	if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) {
+		$params['tab_layout'] = 'bestof-tabs-on-top';
+	}
 	
 	// Validate character_count
-    $params['character_count'] = $params['character_count'];
+	$params['character_count'] = $params['character_count'];
 
 	ob_start();
 	the_widget('geodir_bestof_widget', $params, $params);
-    $output = ob_get_contents();
-    ob_end_clean();
+	$output = ob_get_contents();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_bestof_widget', 'geodir_sc_bestof_widget');
 
@@ -1041,105 +1041,105 @@ 
  * @return string HTML content to display geodirectory listings.
  */
 function geodir_sc_gd_listings($atts, $content = '') {
-    global $post;
+	global $post;
     
-    $defaults = array(
-        'title'                 => '',
-        'post_type'             => 'gd_place',
-        'category'              => 0,
-        'list_sort'             => 'latest',
-        'event_type'            => '',
-        'post_number'           => 10,
-        'post_author'           => '',
-        'layout'                => 'gridview_onehalf',
-        'listing_width'         => '',
-        'character_count'       => 20,
-        'add_location_filter'   => 1,
-        'show_featured_only'    => '',
-        'show_special_only'     => '',
-        'with_pics_only'        => '',
-        'with_videos_only'      => '',
-        'with_pagination'       => '1',
-        'top_pagination'        => '0',
-        'bottom_pagination'     => '1',
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    $params['title']        = wp_strip_all_tags($params['title']);
-    $params['post_type']    = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
-
-    // Validate the selected category/ies - Grab the current list based on post_type
-    $category_taxonomy      = geodir_get_taxonomies($params['post_type']);
-    $categories             = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
-
-    // Make sure we have an array
-    if (!(is_array($params['category']))) {
-        $params['category'] = explode(',', $params['category']);
-    }
-
-    // Array_intersect returns only the items in $params['category'] that are also in our category list
-    // Otherwise it becomes empty and later on that will mean "All"
-    $params['category']     = array_intersect($params['category'], $categories);
-
-    // Post_number needs to be a positive integer
-    $params['post_number']  = absint($params['post_number']);
-    $params['post_number']  = $params['post_number'] > 0 ? $params['post_number'] : 10;
+	$defaults = array(
+		'title'                 => '',
+		'post_type'             => 'gd_place',
+		'category'              => 0,
+		'list_sort'             => 'latest',
+		'event_type'            => '',
+		'post_number'           => 10,
+		'post_author'           => '',
+		'layout'                => 'gridview_onehalf',
+		'listing_width'         => '',
+		'character_count'       => 20,
+		'add_location_filter'   => 1,
+		'show_featured_only'    => '',
+		'show_special_only'     => '',
+		'with_pics_only'        => '',
+		'with_videos_only'      => '',
+		'with_pagination'       => '1',
+		'top_pagination'        => '0',
+		'bottom_pagination'     => '1',
+	);
+	$params = shortcode_atts($defaults, $atts);
+
+	$params['title']        = wp_strip_all_tags($params['title']);
+	$params['post_type']    = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
+
+	// Validate the selected category/ies - Grab the current list based on post_type
+	$category_taxonomy      = geodir_get_taxonomies($params['post_type']);
+	$categories             = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
+
+	// Make sure we have an array
+	if (!(is_array($params['category']))) {
+		$params['category'] = explode(',', $params['category']);
+	}
+
+	// Array_intersect returns only the items in $params['category'] that are also in our category list
+	// Otherwise it becomes empty and later on that will mean "All"
+	$params['category']     = array_intersect($params['category'], $categories);
+
+	// Post_number needs to be a positive integer
+	$params['post_number']  = absint($params['post_number']);
+	$params['post_number']  = $params['post_number'] > 0 ? $params['post_number'] : 10;
     
-    // Post_number needs to be a positive integer
-    if (!empty($atts['post_author'])) {
-        if ($atts['post_author'] == 'current' && !empty($post) && isset($post->post_author) && $post->post_type != 'page') {
-            $params['post_author'] = $post->post_author;
-        } else if ($atts['post_author'] != 'current' && absint($atts['post_author']) > 0) {
-            $params['post_author'] = absint($atts['post_author']);
-        } else {
-            unset($params['post_author']);
-        }
-    } else {
-        unset($params['post_author']);
-    }
-
-    // Validate character_count
-    //todo: is this necessary?
-    $params['character_count']  = $params['character_count'];
-
-    // Validate our layout choice
-    // Outside of the norm, I added some more simple terms to match the existing
-    // So now I just run the switch to set it properly.
-    $params['layout']           = gdsc_validate_layout_choice($params['layout']);
-
-    // Validate our sorting choice
-    $params['list_sort']        = gdsc_validate_sort_choice($params['list_sort']);
-
-    // Validate Listing width, used in the template widget-listing-listview.php
-    // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
-
-    // Validate the checkboxes used on the widget
-    $params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
-    $params['show_featured_only']   = gdsc_to_bool_val($params['show_featured_only']);
-    $params['show_special_only']    = gdsc_to_bool_val($params['show_special_only']);
-    $params['with_pics_only']       = gdsc_to_bool_val($params['with_pics_only']);
-    $params['with_videos_only']     = gdsc_to_bool_val($params['with_videos_only']);
-    $params['with_pagination']      = gdsc_to_bool_val($params['with_pagination']);
-    $params['top_pagination']       = gdsc_to_bool_val($params['top_pagination']);
-    $params['bottom_pagination']    = gdsc_to_bool_val($params['bottom_pagination']);
-
-    /**
-     * End of validation
-     */
-    if (isset($atts['geodir_ajax'])) {
-        $params['geodir_ajax'] = $atts['geodir_ajax'];
-        unset($atts['geodir_ajax']);
-    }
-    if (isset($atts['pageno'])) {
-        $params['pageno'] = $atts['pageno'];
-        unset($atts['pageno']);
-    }
-    $params['shortcode_atts']       = $atts;
-
-    $output = geodir_sc_gd_listings_output($params);
-
-    return $output;
+	// Post_number needs to be a positive integer
+	if (!empty($atts['post_author'])) {
+		if ($atts['post_author'] == 'current' && !empty($post) && isset($post->post_author) && $post->post_type != 'page') {
+			$params['post_author'] = $post->post_author;
+		} else if ($atts['post_author'] != 'current' && absint($atts['post_author']) > 0) {
+			$params['post_author'] = absint($atts['post_author']);
+		} else {
+			unset($params['post_author']);
+		}
+	} else {
+		unset($params['post_author']);
+	}
+
+	// Validate character_count
+	//todo: is this necessary?
+	$params['character_count']  = $params['character_count'];
+
+	// Validate our layout choice
+	// Outside of the norm, I added some more simple terms to match the existing
+	// So now I just run the switch to set it properly.
+	$params['layout']           = gdsc_validate_layout_choice($params['layout']);
+
+	// Validate our sorting choice
+	$params['list_sort']        = gdsc_validate_sort_choice($params['list_sort']);
+
+	// Validate Listing width, used in the template widget-listing-listview.php
+	// The context is in width=$listing_width% - So we need a positive number between 0 & 100
+	$params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
+
+	// Validate the checkboxes used on the widget
+	$params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
+	$params['show_featured_only']   = gdsc_to_bool_val($params['show_featured_only']);
+	$params['show_special_only']    = gdsc_to_bool_val($params['show_special_only']);
+	$params['with_pics_only']       = gdsc_to_bool_val($params['with_pics_only']);
+	$params['with_videos_only']     = gdsc_to_bool_val($params['with_videos_only']);
+	$params['with_pagination']      = gdsc_to_bool_val($params['with_pagination']);
+	$params['top_pagination']       = gdsc_to_bool_val($params['top_pagination']);
+	$params['bottom_pagination']    = gdsc_to_bool_val($params['bottom_pagination']);
+
+	/**
+	 * End of validation
+	 */
+	if (isset($atts['geodir_ajax'])) {
+		$params['geodir_ajax'] = $atts['geodir_ajax'];
+		unset($atts['geodir_ajax']);
+	}
+	if (isset($atts['pageno'])) {
+		$params['pageno'] = $atts['pageno'];
+		unset($atts['pageno']);
+	}
+	$params['shortcode_atts']       = $atts;
+
+	$output = geodir_sc_gd_listings_output($params);
+
+	return $output;
 }
 add_shortcode('gd_listings', 'geodir_sc_gd_listings');
 
@@ -1187,23 +1187,23 @@ 
 		'max_count' => 'all',
 		'max_level' => '1',
 		'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">',
-        'after_widget' => '</section>',
-        'before_title' => '<h3 class="widget-title">',
-        'after_title' => '</h3>',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
 	);
 	$params = shortcode_atts($defaults, $atts);
 
-    /**
-     * Validate our incoming params
-     */
+	/**
+	 * Validate our incoming params
+	 */
 	// Make sure we have an array
-    $params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array();
+	$params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array();
 	 
 	// Validate the checkboxes used on the widget
-    $params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
-    $params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
-    $params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
-    $params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+	$params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
+	$params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
+	$params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
+	$params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
 	
 	if ($params['max_count'] != 'all') {
 		$params['max_count'] = absint($params['max_count']);
@@ -1217,10 +1217,10 @@ 
 
 	ob_start();
 	the_widget('geodir_cpt_categories_widget', $params, $params);
-    $output = ob_get_contents();
-    ob_end_clean();
+	$output = ob_get_contents();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_cpt_categories', 'geodir_sc_cpt_categories_widget');
 ?>
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -202,14 +202,14 @@ 
 	// Add marker cluster
 	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
         $map_args['enable_marker_cluster'] = true;
-        if(get_option('geodir_marker_cluster_type')) {
+        if (get_option('geodir_marker_cluster_type')) {
             if ($map_args['autozoom']) {
                 $map_args['enable_marker_cluster_no_reposition'] = false;
             } else {
                 $map_args['enable_marker_cluster_no_reposition'] = true;
             }
 
-            $map_args['enable_marker_cluster_server'] = true ;
+            $map_args['enable_marker_cluster_server'] = true;
 
         }
 	} else {
@@ -217,7 +217,7 @@ 
 	}
 
     // if lat and long set in shortcode, hack it so the map is not repositioned
-    if(!empty($params['latitude']) && !empty($params['longitude']) ){
+    if (!empty($params['latitude']) && !empty($params['longitude'])) {
         $map_args['enable_marker_cluster_no_reposition'] = true;
     }
 
@@ -890,7 +890,7 @@ 
 	
 	$show_adv_search = isset($params['show_adv_search']) && in_array($params['show_adv_search'], array('default', 'always', 'searched')) ? $params['show_adv_search'] : '';
 	
-	if ($show_adv_search != '' ) {
+	if ($show_adv_search != '') {
 		$show_adv_class = 'geodir-advance-search-' . $show_adv_search . ' ';
 		if ($show_adv_search == 'searched' && geodir_is_page('search')) {
 			$show_adv_search = 'search';
@@ -903,7 +903,7 @@ 
 	ob_start();
 	
 	//geodir_get_template_part('listing', 'filter-form');
-	the_widget('geodir_advance_search_widget', $params, $params );
+	the_widget('geodir_advance_search_widget', $params, $params);
 	
 	$output = ob_get_contents();
     ob_end_clean();
@@ -1100,7 +1100,7 @@ 
 
     // Validate character_count
     //todo: is this necessary?
-    $params['character_count']  = $params['character_count'];
+    $params['character_count'] = $params['character_count'];
 
     // Validate our layout choice
     // Outside of the norm, I added some more simple terms to match the existing
@@ -1112,7 +1112,7 @@ 
 
     // Validate Listing width, used in the template widget-listing-listview.php
     // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width']    = gdsc_validate_listing_width($params['listing_width']);
+    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
     // Validate the checkboxes used on the widget
     $params['add_location_filter']  = gdsc_to_bool_val($params['add_location_filter']);
@@ -1135,7 +1135,7 @@ 
         $params['pageno'] = $atts['pageno'];
         unset($atts['pageno']);
     }
-    $params['shortcode_atts']       = $atts;
+    $params['shortcode_atts'] = $atts;
 
     $output = geodir_sc_gd_listings_output($params);
 
@@ -1202,8 +1202,8 @@ 
 	// Validate the checkboxes used on the widget
     $params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
     $params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
-    $params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
-    $params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+    $params['hide_icon'] = gdsc_to_bool_val($params['hide_icon']);
+    $params['cpt_left'] = gdsc_to_bool_val($params['cpt_left']);
 	
 	if ($params['max_count'] != 'all') {
 		$params['max_count'] = absint($params['max_count']);

geodirectory-functions/general_functions.php

Indentation +2912 added lines, -2912 removed lines

@@ -1,10 +1,10 @@ 
 <?php

 /**

- * Plugin general functions

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * Plugin general functions

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 

 

 /**

@@ -28,11 +28,11 @@ 
 function geodir_plugin_url()

 {

 

-    if (is_ssl()) :

-        return str_replace('http://', 'https://', WP_PLUGIN_URL) . "/" . plugin_basename(dirname(dirname(__FILE__)));

-    else :

-        return WP_PLUGIN_URL . "/" . plugin_basename(dirname(dirname(__FILE__)));

-    endif;

+	if (is_ssl()) :

+		return str_replace('http://', 'https://', WP_PLUGIN_URL) . "/" . plugin_basename(dirname(dirname(__FILE__)));

+	else :

+		return WP_PLUGIN_URL . "/" . plugin_basename(dirname(dirname(__FILE__)));

+	endif;

 }

 

 

@@ -47,7 +47,7 @@ 
  */

 function geodir_plugin_path()

 {

-    return WP_PLUGIN_DIR . "/" . plugin_basename(dirname(dirname(__FILE__)));

+	return WP_PLUGIN_DIR . "/" . plugin_basename(dirname(dirname(__FILE__)));

 }

 

 /**

@@ -61,11 +61,11 @@ 
  */

 function geodir_is_plugin_active($plugin)

 {

-    $active_plugins = get_option('active_plugins');

-    foreach ($active_plugins as $key => $active_plugin) {

-        if (strstr($active_plugin, $plugin)) return true;

-    }

-    return false;

+	$active_plugins = get_option('active_plugins');

+	foreach ($active_plugins as $key => $active_plugin) {

+		if (strstr($active_plugin, $plugin)) return true;

+	}

+	return false;

 }

 

 

@@ -81,7 +81,7 @@ 
  */

 function geodir_get_formated_date($date)

 {

-    return mysql2date(get_option('date_format'), $date);

+	return mysql2date(get_option('date_format'), $date);

 }

 

 /**

@@ -96,7 +96,7 @@ 
  */

 function geodir_get_formated_time($time)

 {

-    return mysql2date(get_option('time_format'), $time, $translate = true);

+	return mysql2date(get_option('time_format'), $time, $translate = true);

 }

 

 

@@ -114,26 +114,26 @@ 
  */

 function geodir_getlink($url, $params = array(), $use_existing_arguments = false)

 {

-    if ($use_existing_arguments) $params = $params + $_GET;

-    if (!$params) return $url;

-    $link = $url;

-    if (strpos($link, '?') === false) $link .= '?'; //If there is no '?' add one at the end

-    elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) $link .= '&amp;'; //If there is no '&' at the END, add one.

-    elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) $link .= '&'; //If there is no '&' at the END, add one.

-

-    $params_arr = array();

-    foreach ($params as $key => $value) {

-        if (gettype($value) == 'array') { //Handle array data properly

-            foreach ($value as $val) {

-                $params_arr[] = $key . '[]=' . urlencode($val);

-            }

-        } else {

-            $params_arr[] = $key . '=' . urlencode($value);

-        }

-    }

-    $link .= implode('&', $params_arr);

+	if ($use_existing_arguments) $params = $params + $_GET;

+	if (!$params) return $url;

+	$link = $url;

+	if (strpos($link, '?') === false) $link .= '?'; //If there is no '?' add one at the end

+	elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) $link .= '&amp;'; //If there is no '&' at the END, add one.

+	elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) $link .= '&'; //If there is no '&' at the END, add one.

+

+	$params_arr = array();

+	foreach ($params as $key => $value) {

+		if (gettype($value) == 'array') { //Handle array data properly

+			foreach ($value as $val) {

+				$params_arr[] = $key . '[]=' . urlencode($val);

+			}

+		} else {

+			$params_arr[] = $key . '=' . urlencode($value);

+		}

+	}

+	$link .= implode('&', $params_arr);

 

-    return $link;

+	return $link;

 }

 

 

@@ -148,17 +148,17 @@ 
  */

 function geodir_get_addlisting_link($post_type = '')

 {

-    global $wpdb;

+	global $wpdb;

 

-    //$check_pkg  = $wpdb->get_var("SELECT pid FROM ".GEODIR_PRICE_TABLE." WHERE post_type='".$post_type."' and status != '0'");

-    $check_pkg = 1;

-    if (post_type_exists($post_type) && $check_pkg) {

+	//$check_pkg  = $wpdb->get_var("SELECT pid FROM ".GEODIR_PRICE_TABLE." WHERE post_type='".$post_type."' and status != '0'");

+	$check_pkg = 1;

+	if (post_type_exists($post_type) && $check_pkg) {

 

-        $add_listing_link = get_page_link(geodir_add_listing_page_id());

+		$add_listing_link = get_page_link(geodir_add_listing_page_id());

 

-        return esc_url( add_query_arg(array('listing_type' => $post_type), $add_listing_link) );

-    } else

-        return get_bloginfo('url');

+		return esc_url( add_query_arg(array('listing_type' => $post_type), $add_listing_link) );

+	} else

+		return get_bloginfo('url');

 }

 

 /**

@@ -171,19 +171,19 @@ 
  */

 function geodir_curPageURL()

 {

-    $pageURL = 'http';

-    if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {

-        $pageURL .= "s";

-    }

-    $pageURL .= "://";

-    $pageURL .= $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];

-    /**

-     * Filter the current page URL returned by function geodir_curPageURL().

-     *

-     * @since 1.4.1

-     * @param string $pageURL The URL of the current page.

-     */

-    return apply_filters('geodir_curPageURL', $pageURL);

+	$pageURL = 'http';

+	if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {

+		$pageURL .= "s";

+	}

+	$pageURL .= "://";

+	$pageURL .= $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];

+	/**

+	 * Filter the current page URL returned by function geodir_curPageURL().

+	 *

+	 * @since 1.4.1

+	 * @param string $pageURL The URL of the current page.

+	 */

+	return apply_filters('geodir_curPageURL', $pageURL);

 }

 

 

@@ -200,12 +200,12 @@ 
 function geodir_clean($string)

 {

 

-    $string = trim(strip_tags(stripslashes($string)));

-    $string = str_replace(" ", "-", $string); // Replaces all spaces with hyphens.

-    $string = preg_replace('/[^A-Za-z0-9\-\_]/', '', $string); // Removes special chars.

-    $string = preg_replace('/-+/', '-', $string); // Replaces multiple hyphens with single one.

+	$string = trim(strip_tags(stripslashes($string)));

+	$string = str_replace(" ", "-", $string); // Replaces all spaces with hyphens.

+	$string = preg_replace('/[^A-Za-z0-9\-\_]/', '', $string); // Removes special chars.

+	$string = preg_replace('/-+/', '-', $string); // Replaces multiple hyphens with single one.

 

-    return $string;

+	return $string;

 }

 

 /**

@@ -217,7 +217,7 @@ 
  */

 function geodir_get_weekday()

 {

-    return array(__('Sunday', 'geodirectory'), __('Monday', 'geodirectory'), __('Tuesday', 'geodirectory'), __('Wednesday', 'geodirectory'), __('Thursday', 'geodirectory'), __('Friday', 'geodirectory'), __('Saturday', 'geodirectory'));

+	return array(__('Sunday', 'geodirectory'), __('Monday', 'geodirectory'), __('Tuesday', 'geodirectory'), __('Wednesday', 'geodirectory'), __('Thursday', 'geodirectory'), __('Friday', 'geodirectory'), __('Saturday', 'geodirectory'));

 }

 

 /**

@@ -229,7 +229,7 @@ 
  */

 function geodir_get_weeks()

 {

-    return array(__('First', 'geodirectory'), __('Second', 'geodirectory'), __('Third', 'geodirectory'), __('Fourth', 'geodirectory'), __('Last', 'geodirectory'));

+	return array(__('First', 'geodirectory'), __('Second', 'geodirectory'), __('Third', 'geodirectory'), __('Fourth', 'geodirectory'), __('Last', 'geodirectory'));

 }

 

 

@@ -248,97 +248,97 @@ 
 function geodir_is_page($gdpage = '')

 {

 

-    global $wp_query, $post,$wp;

-    //if(!is_admin()):

-

-    switch ($gdpage):

-        case 'add-listing':

-

-            if (is_page() && get_query_var('page_id') == geodir_add_listing_page_id()) {

-                return true;

-            } elseif (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

-                return true;

-            }

-

-            break;

-        case 'preview':

-            if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])

-                && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                return true;

-            break;

-        case 'listing-success':

-            if (is_page() && get_query_var('page_id') == geodir_success_page_id())

-                return true;

-            break;

-        case 'detail':

-            if (is_single() && in_array(get_query_var('post_type'), geodir_get_posttypes()))

-                return true;

-            break;

-        case 'pt':

-            if (is_post_type_archive() && in_array(get_query_var('post_type'), geodir_get_posttypes()) && !is_tax())

-                return true;

-

-            break;

-        case 'listing':

-            if (is_tax() && geodir_get_taxonomy_posttype()) {

-                global $current_term, $taxonomy, $term;

-

-                return true;

-            }

-            if (is_post_type_archive() && in_array(get_query_var('post_type'), geodir_get_posttypes()))

-                return true;

-

-            break;

-        case 'home':

-

-            if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home())

-                return true;

-

-            break;

-        case 'location':

-            if (is_page() && get_query_var('page_id') == geodir_location_page_id())

-                return true;

-            break;

-        case 'author':

-            if (is_author() && isset($_REQUEST['geodir_dashbord']))

-                return true;

+	global $wp_query, $post,$wp;

+	//if(!is_admin()):

+

+	switch ($gdpage):

+		case 'add-listing':

+

+			if (is_page() && get_query_var('page_id') == geodir_add_listing_page_id()) {

+				return true;

+			} elseif (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

+				return true;

+			}

+

+			break;

+		case 'preview':

+			if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])

+				&& in_array($_REQUEST['listing_type'], geodir_get_posttypes())

+			)

+				return true;

+			break;

+		case 'listing-success':

+			if (is_page() && get_query_var('page_id') == geodir_success_page_id())

+				return true;

+			break;

+		case 'detail':

+			if (is_single() && in_array(get_query_var('post_type'), geodir_get_posttypes()))

+				return true;

+			break;

+		case 'pt':

+			if (is_post_type_archive() && in_array(get_query_var('post_type'), geodir_get_posttypes()) && !is_tax())

+				return true;

+

+			break;

+		case 'listing':

+			if (is_tax() && geodir_get_taxonomy_posttype()) {

+				global $current_term, $taxonomy, $term;

+

+				return true;

+			}

+			if (is_post_type_archive() && in_array(get_query_var('post_type'), geodir_get_posttypes()))

+				return true;

+

+			break;

+		case 'home':

+

+			if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home())

+				return true;

+

+			break;

+		case 'location':

+			if (is_page() && get_query_var('page_id') == geodir_location_page_id())

+				return true;

+			break;

+		case 'author':

+			if (is_author() && isset($_REQUEST['geodir_dashbord']))

+				return true;

 			

 			if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int)bp_loggedin_user_id()) {

 				if (((bool)bp_is_current_component('listings') || (bool)bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int)bp_displayed_user_id()) {

 					return true;

 				}

 			}

-            break;

-        case 'search':

-            if (is_search() && isset($_REQUEST['geodir_search']))

-                return true;

-            break;

-        case 'info':

-            if (is_page() && get_query_var('page_id') == geodir_info_page_id())

-                return true;

-            break;

-        case 'login':

-            if (is_page() && get_query_var('page_id') == geodir_login_page_id())

-                return true;

-            break;

-        case 'checkout':

-            if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id())

-                return true;

-            break;

-        case 'invoices':

-            if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id())

-                return true;

-            break;

-        default:

-            return false;

-            break;

-

-    endswitch;

-

-    //endif;

-

-    return false;

+			break;

+		case 'search':

+			if (is_search() && isset($_REQUEST['geodir_search']))

+				return true;

+			break;

+		case 'info':

+			if (is_page() && get_query_var('page_id') == geodir_info_page_id())

+				return true;

+			break;

+		case 'login':

+			if (is_page() && get_query_var('page_id') == geodir_login_page_id())

+				return true;

+			break;

+		case 'checkout':

+			if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id())

+				return true;

+			break;

+		case 'invoices':

+			if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id())

+				return true;

+			break;

+		default:

+			return false;

+			break;

+

+	endswitch;

+

+	//endif;

+

+	return false;

 }

 

 /**

@@ -352,97 +352,97 @@ 
  */

 function geodir_set_is_geodir_page($wp)

 {

-    if (!is_admin()) {

-        //$wp->query_vars['gd_is_geodir_page'] = false;

-        //print_r()

-        if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array('preview', 'page', 'paged', 'cpage'))) {

-            if (get_option('geodir_set_as_home'))

-                $wp->query_vars['gd_is_geodir_page'] = true;

-            if(geodir_is_page('home')){

-                $wp->query_vars['gd_is_geodir_page'] = true;

-            }

+	if (!is_admin()) {

+		//$wp->query_vars['gd_is_geodir_page'] = false;

+		//print_r()

+		if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array('preview', 'page', 'paged', 'cpage'))) {

+			if (get_option('geodir_set_as_home'))

+				$wp->query_vars['gd_is_geodir_page'] = true;

+			if(geodir_is_page('home')){

+				$wp->query_vars['gd_is_geodir_page'] = true;

+			}

 

 

-        }

+		}

 

-        if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['page_id'])) {

-            if (

-                $wp->query_vars['page_id'] == geodir_add_listing_page_id()

-                || $wp->query_vars['page_id'] == geodir_preview_page_id()

-                || $wp->query_vars['page_id'] == geodir_success_page_id()

-                || $wp->query_vars['page_id'] == geodir_location_page_id()

-                || $wp->query_vars['page_id'] == geodir_home_page_id()

-                || $wp->query_vars['page_id'] == geodir_info_page_id()

-                || $wp->query_vars['page_id'] == geodir_login_page_id()

-                || (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())

-                || (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())

-            )

-                $wp->query_vars['gd_is_geodir_page'] = true;

-        }

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['page_id'])) {

+			if (

+				$wp->query_vars['page_id'] == geodir_add_listing_page_id()

+				|| $wp->query_vars['page_id'] == geodir_preview_page_id()

+				|| $wp->query_vars['page_id'] == geodir_success_page_id()

+				|| $wp->query_vars['page_id'] == geodir_location_page_id()

+				|| $wp->query_vars['page_id'] == geodir_home_page_id()

+				|| $wp->query_vars['page_id'] == geodir_info_page_id()

+				|| $wp->query_vars['page_id'] == geodir_login_page_id()

+				|| (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())

+				|| (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())

+			)

+				$wp->query_vars['gd_is_geodir_page'] = true;

+		}

 

-        if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {

-            $page = get_page_by_path($wp->query_vars['pagename']);

-

-            if (!empty($page) && (

-                    $page->ID == geodir_add_listing_page_id()

-                    || $page->ID == geodir_preview_page_id()

-                    || $page->ID == geodir_success_page_id()

-                    || $page->ID == geodir_location_page_id()

-                    || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_home_page_id())

-                    || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_info_page_id())

-                    || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_login_page_id())

-                    || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())

-                    || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())

-                )

-            )

-                $wp->query_vars['gd_is_geodir_page'] = true;

-        }

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {

+			$page = get_page_by_path($wp->query_vars['pagename']);

+

+			if (!empty($page) && (

+					$page->ID == geodir_add_listing_page_id()

+					|| $page->ID == geodir_preview_page_id()

+					|| $page->ID == geodir_success_page_id()

+					|| $page->ID == geodir_location_page_id()

+					|| (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_home_page_id())

+					|| (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_info_page_id())

+					|| (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_login_page_id())

+					|| (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())

+					|| (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())

+				)

+			)

+				$wp->query_vars['gd_is_geodir_page'] = true;

+		}

 

 

-        if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {

-            $requested_post_type = $wp->query_vars['post_type'];

-            // check if this post type is geodirectory post types 

-            $post_type_array = geodir_get_posttypes();

-            if (in_array($requested_post_type, $post_type_array)) {

-                $wp->query_vars['gd_is_geodir_page'] = true;

-            }

-        }

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {

+			$requested_post_type = $wp->query_vars['post_type'];

+			// check if this post type is geodirectory post types 

+			$post_type_array = geodir_get_posttypes();

+			if (in_array($requested_post_type, $post_type_array)) {

+				$wp->query_vars['gd_is_geodir_page'] = true;

+			}

+		}

 

-        if (!isset($wp->query_vars['gd_is_geodir_page'])) {

-            $geodir_taxonomis = geodir_get_taxonomies('', true);

-            if(!empty($geodir_taxonomis)){

-                foreach ($geodir_taxonomis as $taxonomy) {

-                    if (array_key_exists($taxonomy, $wp->query_vars)) {

-                        $wp->query_vars['gd_is_geodir_page'] = true;

-                        break;

-                    }

-                }

-            }

+		if (!isset($wp->query_vars['gd_is_geodir_page'])) {

+			$geodir_taxonomis = geodir_get_taxonomies('', true);

+			if(!empty($geodir_taxonomis)){

+				foreach ($geodir_taxonomis as $taxonomy) {

+					if (array_key_exists($taxonomy, $wp->query_vars)) {

+						$wp->query_vars['gd_is_geodir_page'] = true;

+						break;

+					}

+				}

+			}

 

-        }

+		}

 

-        if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord']))

-            $wp->query_vars['gd_is_geodir_page'] = true;

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord']))

+			$wp->query_vars['gd_is_geodir_page'] = true;

 

 

-        if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search']))

-            $wp->query_vars['gd_is_geodir_page'] = true;

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search']))

+			$wp->query_vars['gd_is_geodir_page'] = true;

 

 

 //check if homepage

-        if(!isset($wp->query_vars['gd_is_geodir_page'])

-            && !isset($wp->query_vars['page_id'])

-            && !isset($wp->query_vars['pagename'])

-            && is_page_geodir_home()){

-            $wp->query_vars['gd_is_geodir_page'] = true;

-        }

-        //echo $wp->query_vars['gd_is_geodir_page'] ;

-        /*echo "<pre>" ;

+		if(!isset($wp->query_vars['gd_is_geodir_page'])

+			&& !isset($wp->query_vars['page_id'])

+			&& !isset($wp->query_vars['pagename'])

+			&& is_page_geodir_home()){

+			$wp->query_vars['gd_is_geodir_page'] = true;

+		}

+		//echo $wp->query_vars['gd_is_geodir_page'] ;

+		/*echo "<pre>" ;

 		print_r($wp) ;

 		echo "</pre>" ;

 	//	exit();

 			*/

-    } // end of is admin

+	} // end of is admin

 }

 

 /**

@@ -455,56 +455,56 @@ 
  */

 function geodir_is_geodir_page()

 {

-    global $wp;

-    if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page'])

-        return true;

-    else

-        return false;

+	global $wp;

+	if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page'])

+		return true;

+	else

+		return false;

 }

 

 if (!function_exists('geodir_get_imagesize')) {

-    /**

-     * Get image size using the size key .

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $size The image size key.

-     * @return array|mixed|void|WP_Error If valid returns image size. Else returns error.

-     */

-    function geodir_get_imagesize($size = '')

-    {

-

-        $imagesizes = array('list-thumb' => array('w' => 283, 'h' => 188),

-            'thumbnail' => array('w' => 125, 'h' => 125),

-            'widget-thumb' => array('w' => 50, 'h' => 50),

-            'slider-thumb' => array('w' => 100, 'h' => 100)

-        );

-

-        /**

-         * Filter the image sizes array.

-         *

-         * @since 1.0.0

-         * @param array $imagesizes Image size array.

-         */

-        $imagesizes = apply_filters('geodir_imagesizes', $imagesizes);

-

-        if (!empty($size) && array_key_exists($size, $imagesizes)) {

-            /**

-             * Filters image size of the passed key.

-             *

-             * @since 1.0.0

-             * @param array $imagesizes[$size] Image size array of the passed key.

-             */

-            return apply_filters('geodir_get_imagesize_' . $size, $imagesizes[$size]);

-

-        } elseif (!empty($size)) {

-

-            return new WP_Error('geodir_no_imagesize', __("Given image size is not valid", 'geodirectory'));

+	/**

+	 * Get image size using the size key .

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $size The image size key.

+	 * @return array|mixed|void|WP_Error If valid returns image size. Else returns error.

+	 */

+	function geodir_get_imagesize($size = '')

+	{

+

+		$imagesizes = array('list-thumb' => array('w' => 283, 'h' => 188),

+			'thumbnail' => array('w' => 125, 'h' => 125),

+			'widget-thumb' => array('w' => 50, 'h' => 50),

+			'slider-thumb' => array('w' => 100, 'h' => 100)

+		);

+

+		/**

+		 * Filter the image sizes array.

+		 *

+		 * @since 1.0.0

+		 * @param array $imagesizes Image size array.

+		 */

+		$imagesizes = apply_filters('geodir_imagesizes', $imagesizes);

+

+		if (!empty($size) && array_key_exists($size, $imagesizes)) {

+			/**

+			 * Filters image size of the passed key.

+			 *

+			 * @since 1.0.0

+			 * @param array $imagesizes[$size] Image size array of the passed key.

+			 */

+			return apply_filters('geodir_get_imagesize_' . $size, $imagesizes[$size]);

+

+		} elseif (!empty($size)) {

+

+			return new WP_Error('geodir_no_imagesize', __("Given image size is not valid", 'geodirectory'));

 

-        }

+		}

 

-        return $imagesizes;

-    }

+		return $imagesizes;

+	}

 }

 

 /**

@@ -524,148 +524,148 @@ 
 

 

 if (!function_exists('createRandomString')) {

-    /**

-     * Creates random string.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return string Random string.

-     */

-    function createRandomString()

-    {

-        $chars = "abcdefghijkmlnopqrstuvwxyz1023456789";

-        srand((double)microtime() * 1000000);

-        $i = 0;

-        $rstring = '';

-        while ($i <= 25) {

-            $num = rand() % 33;

-            $tmp = substr($chars, $num, 1);

-            $rstring = $rstring . $tmp;

-            $i++;

-        }

-        return $rstring;

-    }

+	/**

+	 * Creates random string.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return string Random string.

+	 */

+	function createRandomString()

+	{

+		$chars = "abcdefghijkmlnopqrstuvwxyz1023456789";

+		srand((double)microtime() * 1000000);

+		$i = 0;

+		$rstring = '';

+		while ($i <= 25) {

+			$num = rand() % 33;

+			$tmp = substr($chars, $num, 1);

+			$rstring = $rstring . $tmp;

+			$i++;

+		}

+		return $rstring;

+	}

 }

 

 if (!function_exists('geodir_getDistanceRadius')) {

-    /**

-     * Calculates the distance radius.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $uom Measurement unit type.

-     * @return float The mean radius.

-     */

-    function geodir_getDistanceRadius($uom = 'km')

-    {

+	/**

+	 * Calculates the distance radius.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $uom Measurement unit type.

+	 * @return float The mean radius.

+	 */

+	function geodir_getDistanceRadius($uom = 'km')

+	{

 //	Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude

-        switch (geodir_strtolower($uom)):

-            case 'km'    :

-                $earthMeanRadius = 6371.009; // km

-                break;

-            case 'm'    :

-            case 'meters'    :

-                $earthMeanRadius = 6371.009 * 1000; // km

-                break;

-            case 'miles'    :

-                $earthMeanRadius = 3958.761; // miles

-                break;

-            case 'yards'    :

-            case 'yds'    :

-                $earthMeanRadius = 3958.761 * 1760; // yards

-                break;

-            case 'feet'    :

-            case 'ft'    :

-                $earthMeanRadius = 3958.761 * 1760 * 3; // feet

-                break;

-            case 'nm'    :

-                $earthMeanRadius = 3440.069; //  miles

-                break;

-            default:

-                $earthMeanRadius = 3958.761; // miles

-                break;

-        endswitch;

-        return $earthMeanRadius;

-    }

+		switch (geodir_strtolower($uom)):

+			case 'km'    :

+				$earthMeanRadius = 6371.009; // km

+				break;

+			case 'm'    :

+			case 'meters'    :

+				$earthMeanRadius = 6371.009 * 1000; // km

+				break;

+			case 'miles'    :

+				$earthMeanRadius = 3958.761; // miles

+				break;

+			case 'yards'    :

+			case 'yds'    :

+				$earthMeanRadius = 3958.761 * 1760; // yards

+				break;

+			case 'feet'    :

+			case 'ft'    :

+				$earthMeanRadius = 3958.761 * 1760 * 3; // feet

+				break;

+			case 'nm'    :

+				$earthMeanRadius = 3440.069; //  miles

+				break;

+			default:

+				$earthMeanRadius = 3958.761; // miles

+				break;

+		endswitch;

+		return $earthMeanRadius;

+	}

 }

 

 

 if (!function_exists('geodir_calculateDistanceFromLatLong')) {

-    /**

-     * Calculate the great circle distance between two points identified by longitude and latitude.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $point1 Latitude and Longitude of point 1.

-     * @param array $point2 Latitude and Longitude of point 2.

-     * @param string $uom Unit of measurement.

-     * @return float The distance.

-     */

-    function geodir_calculateDistanceFromLatLong($point1, $point2, $uom = 'km')

-    {

+	/**

+	 * Calculate the great circle distance between two points identified by longitude and latitude.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $point1 Latitude and Longitude of point 1.

+	 * @param array $point2 Latitude and Longitude of point 2.

+	 * @param string $uom Unit of measurement.

+	 * @return float The distance.

+	 */

+	function geodir_calculateDistanceFromLatLong($point1, $point2, $uom = 'km')

+	{

 //	Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude

 

-        $earthMeanRadius = geodir_getDistanceRadius($uom);

+		$earthMeanRadius = geodir_getDistanceRadius($uom);

 

-        $deltaLatitude = deg2rad($point2['latitude'] - $point1['latitude']);

-        $deltaLongitude = deg2rad($point2['longitude'] - $point1['longitude']);

-        $a = sin($deltaLatitude / 2) * sin($deltaLatitude / 2) +

-            cos(deg2rad($point1['latitude'])) * cos(deg2rad($point2['latitude'])) *

-            sin($deltaLongitude / 2) * sin($deltaLongitude / 2);

-        $c = 2 * atan2(sqrt($a), sqrt(1 - $a));

-        $distance = $earthMeanRadius * $c;

-        return $distance;

+		$deltaLatitude = deg2rad($point2['latitude'] - $point1['latitude']);

+		$deltaLongitude = deg2rad($point2['longitude'] - $point1['longitude']);

+		$a = sin($deltaLatitude / 2) * sin($deltaLatitude / 2) +

+			cos(deg2rad($point1['latitude'])) * cos(deg2rad($point2['latitude'])) *

+			sin($deltaLongitude / 2) * sin($deltaLongitude / 2);

+		$c = 2 * atan2(sqrt($a), sqrt(1 - $a));

+		$distance = $earthMeanRadius * $c;

+		return $distance;

 

-    }

+	}

 }

 

 

 if (!function_exists('geodir_sendEmail')) {

-    /**

-     * The main function that send transactional emails using the args provided.

-     *

-     * @since 1.0.0

-     * @since 1.5.7 Added db translations for notifications subject and content.

-     * @package GeoDirectory

-     * @param string $fromEmail Sender email address.

-     * @param string $fromEmailName Sender name.

-     * @param string $toEmail Receiver email address.

-     * @param string $toEmailName Receiver name.

-     * @param string $to_subject Email subject.

-     * @param string $to_message Email content.

-     * @param string $extra Not being used.

-     * @param string $message_type The message type. Can be send_friend, send_enquiry, forgot_password, registration, post_submit, listing_published.

-     * @param string $post_id The post ID.

-     * @param string $user_id The user ID.

-     */

-    function geodir_sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '') {

-        $login_details = '';

-

-        // strip slashes from subject & message text

-        $to_subject = stripslashes_deep($to_subject);

-        $to_message = stripslashes_deep($to_message);

-

-        if ($message_type == 'send_friend') {

-            $subject = get_option('geodir_email_friend_subject');

-            $message = get_option('geodir_email_friend_content');

-        } elseif ($message_type == 'send_enquiry') {

-            $subject = get_option('geodir_email_enquiry_subject');

-            $message = get_option('geodir_email_enquiry_content');

-        } elseif ($message_type == 'forgot_password') {

-            $subject = get_option('geodir_forgot_password_subject');

-            $message = get_option('geodir_forgot_password_content');

-            $login_details = $to_message;

-        } elseif ($message_type == 'registration') {

-            $subject = get_option('geodir_registration_success_email_subject');

-            $message = get_option('geodir_registration_success_email_content');

-            $login_details = $to_message;

-        } elseif ($message_type == 'post_submit') {

-            $subject = get_option('geodir_post_submited_success_email_subject');

-            $message = get_option('geodir_post_submited_success_email_content');

-        } elseif ($message_type == 'listing_published') {

-            $subject = get_option('geodir_post_published_email_subject');

-            $message = get_option('geodir_post_published_email_content');

-        }

+	/**

+	 * The main function that send transactional emails using the args provided.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.7 Added db translations for notifications subject and content.

+	 * @package GeoDirectory

+	 * @param string $fromEmail Sender email address.

+	 * @param string $fromEmailName Sender name.

+	 * @param string $toEmail Receiver email address.

+	 * @param string $toEmailName Receiver name.

+	 * @param string $to_subject Email subject.

+	 * @param string $to_message Email content.

+	 * @param string $extra Not being used.

+	 * @param string $message_type The message type. Can be send_friend, send_enquiry, forgot_password, registration, post_submit, listing_published.

+	 * @param string $post_id The post ID.

+	 * @param string $user_id The user ID.

+	 */

+	function geodir_sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '') {

+		$login_details = '';

+

+		// strip slashes from subject & message text

+		$to_subject = stripslashes_deep($to_subject);

+		$to_message = stripslashes_deep($to_message);

+

+		if ($message_type == 'send_friend') {

+			$subject = get_option('geodir_email_friend_subject');

+			$message = get_option('geodir_email_friend_content');

+		} elseif ($message_type == 'send_enquiry') {

+			$subject = get_option('geodir_email_enquiry_subject');

+			$message = get_option('geodir_email_enquiry_content');

+		} elseif ($message_type == 'forgot_password') {

+			$subject = get_option('geodir_forgot_password_subject');

+			$message = get_option('geodir_forgot_password_content');

+			$login_details = $to_message;

+		} elseif ($message_type == 'registration') {

+			$subject = get_option('geodir_registration_success_email_subject');

+			$message = get_option('geodir_registration_success_email_content');

+			$login_details = $to_message;

+		} elseif ($message_type == 'post_submit') {

+			$subject = get_option('geodir_post_submited_success_email_subject');

+			$message = get_option('geodir_post_submited_success_email_content');

+		} elseif ($message_type == 'listing_published') {

+			$subject = get_option('geodir_post_published_email_subject');

+			$message = get_option('geodir_post_published_email_content');

+		}

 		

 		if (!empty($subject)) {

 			$subject = __(stripslashes_deep($subject),'geodirectory');

@@ -675,125 +675,125 @@ 
 			$message = __(stripslashes_deep($message),'geodirectory');

 		}

 

-        $to_message = nl2br($to_message);

-        $sitefromEmail = get_option('site_email');

-        $sitefromEmailName = get_site_emailName();

-        $productlink = get_permalink($post_id);

+		$to_message = nl2br($to_message);

+		$sitefromEmail = get_option('site_email');

+		$sitefromEmailName = get_site_emailName();

+		$productlink = get_permalink($post_id);

 

-        $user_login = '';

-        if ($user_id > 0 && $user_info = get_userdata($user_id)) {

-            $user_login = $user_info->user_login;

-        }

+		$user_login = '';

+		if ($user_id > 0 && $user_info = get_userdata($user_id)) {

+			$user_login = $user_info->user_login;

+		}

 

-        $posted_date = '';

-        $listingLink = '';

+		$posted_date = '';

+		$listingLink = '';

 

-        $post_info = get_post($post_id);

+		$post_info = get_post($post_id);

 

-        if ($post_info) {

-            $posted_date = $post_info->post_date;

-            $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>';

-        }

-        $siteurl = home_url();

-        $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

-        $loginurl = geodir_login_url();

-        $loginurl_link = '<a href="' . $loginurl . '">login</a>';

+		if ($post_info) {

+			$posted_date = $post_info->post_date;

+			$listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>';

+		}

+		$siteurl = home_url();

+		$siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

+		$loginurl = geodir_login_url();

+		$loginurl_link = '<a href="' . $loginurl . '">login</a>';

 

-        if ($fromEmail == '') {

-            $fromEmail = get_option('site_email');

-        }

+		if ($fromEmail == '') {

+			$fromEmail = get_option('site_email');

+		}

 

-        if ($fromEmailName == '') {

-            $fromEmailName = get_option('site_email_name');

-        }

+		if ($fromEmailName == '') {

+			$fromEmailName = get_option('site_email_name');

+		}

 

-        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]','[#from_email#]','[#user_login#]','[#username#]');

-        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName, $posted_date,$fromEmail, $user_login, $user_login);

-        $message = str_replace($search_array, $replace_array, $message);

-

-        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]','[#from_email#]','[#user_login#]','[#username#]');

-        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName, $posted_date,$fromEmail, $user_login, $user_login);

-        $subject = str_replace($search_array, $replace_array, $subject);

-

-        $headers = 'MIME-Version: 1.0' . "\r\n";

-        $headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";

-        $headers .= "Reply-To: " . $fromEmail . "\r\n";

-        $headers .= 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>' . "\r\n";

-

-        $to = $toEmail;

-        $sent = wp_mail($to, $subject, $message, $headers);

-

-        if( ! $sent ) {

-            if ( is_array( $to ) ) {

-                $to = implode( ',', $to );

-            }

-            $log_message = sprintf(

-                __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

-                $message_type,

-                date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

-                $to,

-                $subject

-            );

-            geodir_error_log( $log_message );

-        }

+		$search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]','[#from_email#]','[#user_login#]','[#username#]');

+		$replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName, $posted_date,$fromEmail, $user_login, $user_login);

+		$message = str_replace($search_array, $replace_array, $message);

 

-        ///////// ADMIN BCC EMIALS

-        $adminEmail = get_bloginfo('admin_email');

-        $to = $adminEmail;

+		$search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]','[#from_email#]','[#user_login#]','[#username#]');

+		$replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName, $posted_date,$fromEmail, $user_login, $user_login);

+		$subject = str_replace($search_array, $replace_array, $subject);

 

-        $admin_bcc = false;

-        if ($message_type == 'post_submit') {

-            $subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');

-            $message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');

+		$headers = 'MIME-Version: 1.0' . "\r\n";

+		$headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";

+		$headers .= "Reply-To: " . $fromEmail . "\r\n";

+		$headers .= 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>' . "\r\n";

 

-            $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]','[#user_login#]','[#username#]');

-            $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName, $posted_date, $user_login, $user_login);

-            $message = str_replace($search_array, $replace_array, $message);

+		$to = $toEmail;

+		$sent = wp_mail($to, $subject, $message, $headers);

 

-            $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]','[#user_login#]','[#username#]');

-            $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName, $posted_date, $user_login, $user_login);

-            $subject = str_replace($search_array, $replace_array, $subject);

+		if( ! $sent ) {

+			if ( is_array( $to ) ) {

+				$to = implode( ',', $to );

+			}

+			$log_message = sprintf(

+				__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+				$message_type,

+				date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+				$to,

+				$subject

+			);

+			geodir_error_log( $log_message );

+		}

 

-            $subject .= ' - ADMIN BCC COPY';

-            $admin_bcc = true;

+		///////// ADMIN BCC EMIALS

+		$adminEmail = get_bloginfo('admin_email');

+		$to = $adminEmail;

 

-        }

-        elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {

-            $subject .= ' - ADMIN BCC COPY';

-            $admin_bcc = true;

-        }

-        elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {

-            $subject .= ' - ADMIN BCC COPY';

-            $admin_bcc = true;

-        }

-        elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {

-            $subject .= ' - ADMIN BCC COPY';

-            $admin_bcc = true;

-        }

-        elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {

-            $subject .= ' - ADMIN BCC COPY';

-            $admin_bcc = true;

-        }

+		$admin_bcc = false;

+		if ($message_type == 'post_submit') {

+			$subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');

+			$message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');

 

-        if($admin_bcc===true){

-            $sent = wp_mail($to, $subject, $message, $headers);

-

-            if( ! $sent ) {

-                if ( is_array( $to ) ) {

-                    $to = implode( ',', $to );

-                }

-                $log_message = sprintf(

-                    __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

-                    $message_type,

-                    date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

-                    $to,

-                    $subject

-                );

-                geodir_error_log( $log_message );

-            }

-        }

+			$search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]','[#user_login#]','[#username#]');

+			$replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName, $posted_date, $user_login, $user_login);

+			$message = str_replace($search_array, $replace_array, $message);

+

+			$search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]','[#user_login#]','[#username#]');

+			$replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName, $posted_date, $user_login, $user_login);

+			$subject = str_replace($search_array, $replace_array, $subject);

+

+			$subject .= ' - ADMIN BCC COPY';

+			$admin_bcc = true;

+

+		}

+		elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {

+			$subject .= ' - ADMIN BCC COPY';

+			$admin_bcc = true;

+		}

+		elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {

+			$subject .= ' - ADMIN BCC COPY';

+			$admin_bcc = true;

+		}

+		elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {

+			$subject .= ' - ADMIN BCC COPY';

+			$admin_bcc = true;

+		}

+		elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {

+			$subject .= ' - ADMIN BCC COPY';

+			$admin_bcc = true;

+		}

+

+		if($admin_bcc===true){

+			$sent = wp_mail($to, $subject, $message, $headers);

+

+			if( ! $sent ) {

+				if ( is_array( $to ) ) {

+					$to = implode( ',', $to );

+				}

+				$log_message = sprintf(

+					__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+					$message_type,

+					date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+					$to,

+					$subject

+				);

+				geodir_error_log( $log_message );

+			}

+		}

 

-    }

+	}

 }

 

 

@@ -806,27 +806,27 @@ 
 function geodir_taxonomy_breadcrumb()

 {

 

-    $term = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));

-    $parent = $term->parent;

+	$term = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));

+	$parent = $term->parent;

 

-    while ($parent):

-        $parents[] = $parent;

-        $new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));

-        $parent = $new_parent->parent;

-    endwhile;

+	while ($parent):

+		$parents[] = $parent;

+		$new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));

+		$parent = $new_parent->parent;

+	endwhile;

 

-    if (!empty($parents)):

-        $parents = array_reverse($parents);

+	if (!empty($parents)):

+		$parents = array_reverse($parents);

 

-        foreach ($parents as $parent):

-            $item = get_term_by('id', $parent, get_query_var('taxonomy'));

-            $url = get_term_link($item, get_query_var('taxonomy'));

-            echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>';

-        endforeach;

+		foreach ($parents as $parent):

+			$item = get_term_by('id', $parent, get_query_var('taxonomy'));

+			$url = get_term_link($item, get_query_var('taxonomy'));

+			echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>';

+		endforeach;

 

-    endif;

+	endif;

 

-    echo '<li> > ' . $term->name . '</li>';

+	echo '<li> > ' . $term->name . '</li>';

 }

 

 

@@ -842,365 +842,365 @@ 
  */

 function geodir_breadcrumb()

 {

-    global $wp_query, $geodir_add_location_url;

-

-    /**

-     * Filter breadcrumb separator.

-     *

-     * @since 1.0.0

-     */

-    $separator = apply_filters('geodir_breadcrumb_separator', ' > ');

-

-    if (!geodir_is_page('home')) {

-        $breadcrumb = '';

-        $url_categoris = '';

-        $breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">';

-        /**

-         * Filter breadcrumb's first link.

-         *

-         * @since 1.0.0

-         */

-        $breadcrumb .= '<li>' . apply_filters('geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __('Home', 'geodirectory') . '</a>') . '</li>';

+	global $wp_query, $geodir_add_location_url;

+

+	/**

+	 * Filter breadcrumb separator.

+	 *

+	 * @since 1.0.0

+	 */

+	$separator = apply_filters('geodir_breadcrumb_separator', ' > ');

+

+	if (!geodir_is_page('home')) {

+		$breadcrumb = '';

+		$url_categoris = '';

+		$breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">';

+		/**

+		 * Filter breadcrumb's first link.

+		 *

+		 * @since 1.0.0

+		 */

+		$breadcrumb .= '<li>' . apply_filters('geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __('Home', 'geodirectory') . '</a>') . '</li>';

+

+		$gd_post_type = geodir_get_current_posttype();

+		$post_type_info = get_post_type_object($gd_post_type);

+

+		remove_filter('post_type_archive_link', 'geodir_get_posttype_link');

+

+		$listing_link = get_post_type_archive_link($gd_post_type);

+

+		add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);

+		$listing_link = rtrim($listing_link, '/');

+		$listing_link .= '/';

+

+		$post_type_for_location_link = $listing_link;

+		$location_terms = geodir_get_current_location_terms('query_vars', $gd_post_type);

+

+		global $wp, $gd_session;

+		$location_link = $post_type_for_location_link;

+

+		if (geodir_is_page('detail') || geodir_is_page('listing')) {

+			global $post;

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

+			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

+				

+			if(geodir_is_page('detail') && isset($post->country_slug)){

+				$location_terms = array(

+					'gd_country' => $post->country_slug,

+					'gd_region' => $post->region_slug,

+					'gd_city' => $post->city_slug

+				);

+				

+				if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {

+					$location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

+				}

+			}

 

-        $gd_post_type = geodir_get_current_posttype();

-        $post_type_info = get_post_type_object($gd_post_type);

+			$geodir_show_location_url = get_option('geodir_show_location_url');

 

-        remove_filter('post_type_archive_link', 'geodir_get_posttype_link');

+			$hide_url_part = array();

+			if ($location_manager) {

+				$hide_country_part = get_option('geodir_location_hide_country_part');

+				$hide_region_part = get_option('geodir_location_hide_region_part');

 

-        $listing_link = get_post_type_archive_link($gd_post_type);

+				if ($hide_region_part && $hide_country_part) {

+					$hide_url_part = array('gd_country', 'gd_region');

+				} else if ($hide_region_part && !$hide_country_part) {

+					$hide_url_part = array('gd_region');

+				} else if (!$hide_region_part && $hide_country_part) {

+					$hide_url_part = array('gd_country');

+				}

+			}

 

-        add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);

-        $listing_link = rtrim($listing_link, '/');

-        $listing_link .= '/';

+			$hide_text_part = array();

+			if ($geodir_show_location_url == 'country_city') {

+				$hide_text_part = array('gd_region');

 

-        $post_type_for_location_link = $listing_link;

-        $location_terms = geodir_get_current_location_terms('query_vars', $gd_post_type);

+				if (isset($location_terms['gd_region']) && !$location_manager) {

+					unset($location_terms['gd_region']);

+				}

+			} else if ($geodir_show_location_url == 'region_city') {

+				$hide_text_part = array('gd_country');

 

-        global $wp, $gd_session;

-        $location_link = $post_type_for_location_link;

+				if (isset($location_terms['gd_country']) && !$location_manager) {

+					unset($location_terms['gd_country']);

+				}

+			} else if ($geodir_show_location_url == 'city') {

+				$hide_text_part = array('gd_country', 'gd_region');

 

-        if (geodir_is_page('detail') || geodir_is_page('listing')) {

-            global $post;

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

-			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

-				

-			if(geodir_is_page('detail') && isset($post->country_slug)){

-                $location_terms = array(

-                    'gd_country' => $post->country_slug,

-                    'gd_region' => $post->region_slug,

-                    'gd_city' => $post->city_slug

-                );

-				

-				if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {

-					$location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

+				if (isset($location_terms['gd_country']) && !$location_manager) {

+					unset($location_terms['gd_country']);

 				}

-            }

-

-            $geodir_show_location_url = get_option('geodir_show_location_url');

-

-            $hide_url_part = array();

-            if ($location_manager) {

-                $hide_country_part = get_option('geodir_location_hide_country_part');

-                $hide_region_part = get_option('geodir_location_hide_region_part');

-

-                if ($hide_region_part && $hide_country_part) {

-                    $hide_url_part = array('gd_country', 'gd_region');

-                } else if ($hide_region_part && !$hide_country_part) {

-                    $hide_url_part = array('gd_region');

-                } else if (!$hide_region_part && $hide_country_part) {

-                    $hide_url_part = array('gd_country');

-                }

-            }

-

-            $hide_text_part = array();

-            if ($geodir_show_location_url == 'country_city') {

-                $hide_text_part = array('gd_region');

-

-                if (isset($location_terms['gd_region']) && !$location_manager) {

-                    unset($location_terms['gd_region']);

-                }

-            } else if ($geodir_show_location_url == 'region_city') {

-                $hide_text_part = array('gd_country');

-

-                if (isset($location_terms['gd_country']) && !$location_manager) {

-                    unset($location_terms['gd_country']);

-                }

-            } else if ($geodir_show_location_url == 'city') {

-                $hide_text_part = array('gd_country', 'gd_region');

-

-                if (isset($location_terms['gd_country']) && !$location_manager) {

-                    unset($location_terms['gd_country']);

-                }

-                if (isset($location_terms['gd_region']) && !$location_manager) {

-                    unset($location_terms['gd_region']);

-                }

-            }

-

-            $is_location_last = '';

-            $is_taxonomy_last = '';

-            $breadcrumb .= '<li>';

-            if (get_query_var($gd_post_type . 'category'))

-                $gd_taxonomy = $gd_post_type . 'category';

-            elseif (get_query_var($gd_post_type . '_tags'))

-                $gd_taxonomy = $gd_post_type . '_tags';

-

-            $breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __(ucfirst($post_type_info->label), 'geodirectory') . '</a>';

-            if (!empty($gd_taxonomy) || geodir_is_page('detail'))

-                $is_location_last = false;

-            else

-                $is_location_last = true;

-

-            if (!empty($gd_taxonomy) && geodir_is_page('listing'))

-                $is_taxonomy_last = true;

-            else

-                $is_taxonomy_last = false;

-

-            if (!empty($location_terms)) {

-                $geodir_get_locations = function_exists('get_actual_location_name') ? true : false;

-

-                foreach ($location_terms as $key => $location_term) {

-                    if ($location_term != '') {

-                        if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.

-                            continue;

-                        }

-

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

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

-                        $gd_location_link_text = ucfirst($gd_location_link_text);

-

-                        $location_term_actual_country = '';

-                        $location_term_actual_region = '';

-                        $location_term_actual_city = '';

-                        if ($geodir_get_locations) {

-                            if ($key == 'gd_country') {

-                                $location_term_actual_country = get_actual_location_name('country', $location_term, true);

-                            } else if ($key == 'gd_region') {

-                                $location_term_actual_region = get_actual_location_name('region', $location_term, true);

-                            } else if ($key == 'gd_city') {

-                                $location_term_actual_city = get_actual_location_name('city', $location_term, true);

-                            }

-                        } else {

-                            $location_info = geodir_get_location();

-

-                            if (!empty($location_info) && isset($location_info->location_id)) {

-                                if ($key == 'gd_country') {

-                                    $location_term_actual_country = __($location_info->country, 'geodirectory');

-                                } else if ($key == 'gd_region') {

-                                    $location_term_actual_region = __($location_info->region, 'geodirectory');

-                                } else if ($key == 'gd_city') {

-                                    $location_term_actual_city = __($location_info->city, 'geodirectory');

-                                }

-                            }

-                        }

-

-                        if ($is_location_last && $key == 'gd_country' && !(isset($location_terms['gd_region']) && $location_terms['gd_region'] != '') && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {

-                            $breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text;

-                        } else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {

-                            $breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text;

-                        } else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {

-                            $breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text;

-                        } else if ($is_location_last && $key == 'gd_neighbourhood') {

-                            $breadcrumb .= $separator . $gd_location_link_text;

-                        } else {

-                            if (get_option('permalink_structure') != '') {

-                                $location_link .= $location_term . '/';

-                            } else {

-                                $location_link .= "&$key=" . $location_term;

-                            }

+				if (isset($location_terms['gd_region']) && !$location_manager) {

+					unset($location_terms['gd_region']);

+				}

+			}

 

-                            if ($key == 'gd_country' && $location_term_actual_country != '') {

-                                $gd_location_link_text = $location_term_actual_country;

-                            } else if ($key == 'gd_region' && $location_term_actual_region != '') {

-                                $gd_location_link_text = $location_term_actual_region;

-                            } else if ($key == 'gd_city' && $location_term_actual_city != '') {

-                                $gd_location_link_text = $location_term_actual_city;

-                            }

+			$is_location_last = '';

+			$is_taxonomy_last = '';

+			$breadcrumb .= '<li>';

+			if (get_query_var($gd_post_type . 'category'))

+				$gd_taxonomy = $gd_post_type . 'category';

+			elseif (get_query_var($gd_post_type . '_tags'))

+				$gd_taxonomy = $gd_post_type . '_tags';

+

+			$breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __(ucfirst($post_type_info->label), 'geodirectory') . '</a>';

+			if (!empty($gd_taxonomy) || geodir_is_page('detail'))

+				$is_location_last = false;

+			else

+				$is_location_last = true;

+

+			if (!empty($gd_taxonomy) && geodir_is_page('listing'))

+				$is_taxonomy_last = true;

+			else

+				$is_taxonomy_last = false;

+

+			if (!empty($location_terms)) {

+				$geodir_get_locations = function_exists('get_actual_location_name') ? true : false;

+

+				foreach ($location_terms as $key => $location_term) {

+					if ($location_term != '') {

+						if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.

+							continue;

+						}

+

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

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

+						$gd_location_link_text = ucfirst($gd_location_link_text);

+

+						$location_term_actual_country = '';

+						$location_term_actual_region = '';

+						$location_term_actual_city = '';

+						if ($geodir_get_locations) {

+							if ($key == 'gd_country') {

+								$location_term_actual_country = get_actual_location_name('country', $location_term, true);

+							} else if ($key == 'gd_region') {

+								$location_term_actual_region = get_actual_location_name('region', $location_term, true);

+							} else if ($key == 'gd_city') {

+								$location_term_actual_city = get_actual_location_name('city', $location_term, true);

+							}

+						} else {

+							$location_info = geodir_get_location();

+

+							if (!empty($location_info) && isset($location_info->location_id)) {

+								if ($key == 'gd_country') {

+									$location_term_actual_country = __($location_info->country, 'geodirectory');

+								} else if ($key == 'gd_region') {

+									$location_term_actual_region = __($location_info->region, 'geodirectory');

+								} else if ($key == 'gd_city') {

+									$location_term_actual_city = __($location_info->city, 'geodirectory');

+								}

+							}

+						}

 

-                            /*

+						if ($is_location_last && $key == 'gd_country' && !(isset($location_terms['gd_region']) && $location_terms['gd_region'] != '') && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {

+							$breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text;

+						} else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {

+							$breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text;

+						} else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {

+							$breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text;

+						} else if ($is_location_last && $key == 'gd_neighbourhood') {

+							$breadcrumb .= $separator . $gd_location_link_text;

+						} else {

+							if (get_option('permalink_structure') != '') {

+								$location_link .= $location_term . '/';

+							} else {

+								$location_link .= "&$key=" . $location_term;

+							}

+

+							if ($key == 'gd_country' && $location_term_actual_country != '') {

+								$gd_location_link_text = $location_term_actual_country;

+							} else if ($key == 'gd_region' && $location_term_actual_region != '') {

+								$gd_location_link_text = $location_term_actual_region;

+							} else if ($key == 'gd_city' && $location_term_actual_city != '') {

+								$gd_location_link_text = $location_term_actual_city;

+							}

+

+							/*

                             if (geodir_is_page('detail') && !empty($hide_text_part) && in_array($key, $hide_text_part)) {

                                 continue;

                             }

                             */

 

-                            $breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>';

-                        }

-                    }

-                }

-            }

-

-            if (!empty($gd_taxonomy)) {

-                $term_index = 1;

-

-                //if(get_option('geodir_add_categories_url'))

-                {

-                    if (get_query_var($gd_post_type . '_tags')) {

-                        $cat_link = $listing_link . 'tags/';

-                    } else

-                        $cat_link = $listing_link;

-

-                    foreach ($location_terms as $key => $location_term) {

-                        if ($location_manager && in_array($key, $hide_url_part)) {

-                            continue;

-                        }

-

-                        if ($location_term != '') {

-                            if (get_option('permalink_structure') != '') {

-                                $cat_link .= $location_term . '/';

-                            }

-                        }

-                    }

-

-                    $term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));

-                    foreach ($term_array as $term) {

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

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

-

-                        // get term actual name

-                        $term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');

-                        if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {

-                            $term_link_text = urldecode($term_info['name']);

-                        } else {

-                            $term_link_text = geodir_ucwords(urldecode($term_link_text));

-                        }

-

-                        if ($term_index == count($term_array) && $is_taxonomy_last)

-                            $breadcrumb .= $separator . $term_link_text;

-                        else {

-                            $cat_link .= $term . '/';

-                            $breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>';

-                        }

-                        $term_index++;

-                    }

-                }

-

-

-            }

-

-            if (geodir_is_page('detail'))

-                $breadcrumb .= $separator . get_the_title();

-

-            $breadcrumb .= '</li>';

-

-

-        } elseif (geodir_is_page('author')) {

-            $user_id = get_current_user_id();

-            $author_link = get_author_posts_url($user_id);

-            $default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => 'gd_place'), false);

-

-            /**

-             * Filter author page link.

-             *

-             * @since 1.0.0

-             * @param string $default_author_link Default author link.

-             * @param int $user_id Author ID.

-             */

-            $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);

-

-            $breadcrumb .= '<li>';

-            $breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __('My Dashboard', 'geodirectory') . '</a>';

-

-            if (isset($_REQUEST['list'])) {

-                $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => $_REQUEST['stype']), false);

-

-                /**

-                 * Filter author page link.

-                 *

-                 * @since 1.0.0

-                 * @param string $author_link Author page link.

-                 * @param int $user_id Author ID.

-                 * @param string $_REQUEST['stype'] Post type.

-                 */

-                $author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);

-

-                $breadcrumb .= $separator . '<a href="' . $author_link . '">' . __(ucfirst($post_type_info->label), 'geodirectory') . '</a>';

-                $breadcrumb .= $separator . ucfirst(__('My', 'geodirectory') . ' ' . $_REQUEST['list']);

-            } else

-                $breadcrumb .= $separator . __(ucfirst($post_type_info->label), 'geodirectory');

-

-            $breadcrumb .= '</li>';

-        } elseif (is_category() || is_single()) {

-            $category = get_the_category();

-            if (is_category()) {

-                $breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>';

-            }

-            if (is_single()) {

-                $breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link($category[0]->term_id) . '">' . $category[0]->cat_name . '</a></li>';

-                $breadcrumb .= '<li>' . $separator . get_the_title() . '</li>';

-            }

-            /* End of my version ##################################################### */

-        } else if (is_page()) {

-            $page_title = get_the_title();

-

-            if (geodir_is_page('location')) {

-                $page_title = defined('GD_LOCATION') ? GD_LOCATION : __('Location', 'geodirectory');

-            }

-

-            $breadcrumb .= '<li>' . $separator;

-            $breadcrumb .= stripslashes_deep($page_title);

-            $breadcrumb .= '</li>';

-        } else if (is_tag()) {

-            $breadcrumb .=  "<li> " . $separator . single_tag_title('',false) . '</li>';

-        } else if (is_day()) {

-            $breadcrumb .= "<li> " . $separator . __(" Archive for", 'geodirectory') . " ";

-            the_time('F jS, Y');

-            $breadcrumb .= '</li>';

-        } else if (is_month()) {

-            $breadcrumb .= "<li> " . $separator . __(" Archive for", 'geodirectory') . " ";

-            the_time('F, Y');

-            $breadcrumb .= '</li>';

-        } else if (is_year()) {

-            $breadcrumb .= "<li> " . $separator . __(" Archive for", 'geodirectory') . " ";

-            the_time('Y');

-            $breadcrumb .= '</li>';

-        } else if (is_author()) {

-            $breadcrumb .= "<li> " . $separator . __(" Author Archive", 'geodirectory');

-            $breadcrumb .= '</li>';

-        } else if (isset($_GET['paged']) && !empty($_GET['paged'])) {

-            $breadcrumb .= "<li>" . $separator . __("Blog Archives", 'geodirectory');

-            $breadcrumb .= '</li>';

-        } else if (is_search()) {

-            $breadcrumb .= "<li> " . $separator . __(" Search Results", 'geodirectory');

-            $breadcrumb .= '</li>';

-        }

-        $breadcrumb .= '</ul></div>';

-

-        /**

-         * Filter breadcrumb html output.

-         *

-         * @since 1.0.0

-         * @param string $breadcrumb Breadcrumb HTML.

-         * @param string $separator Breadcrumb separator.

-         */

-        echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);

-    }

+							$breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>';

+						}

+					}

+				}

+			}

+

+			if (!empty($gd_taxonomy)) {

+				$term_index = 1;

+

+				//if(get_option('geodir_add_categories_url'))

+				{

+					if (get_query_var($gd_post_type . '_tags')) {

+						$cat_link = $listing_link . 'tags/';

+					} else

+						$cat_link = $listing_link;

+

+					foreach ($location_terms as $key => $location_term) {

+						if ($location_manager && in_array($key, $hide_url_part)) {

+							continue;

+						}

+

+						if ($location_term != '') {

+							if (get_option('permalink_structure') != '') {

+								$cat_link .= $location_term . '/';

+							}

+						}

+					}

+

+					$term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));

+					foreach ($term_array as $term) {

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

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

+

+						// get term actual name

+						$term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');

+						if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {

+							$term_link_text = urldecode($term_info['name']);

+						} else {

+							$term_link_text = geodir_ucwords(urldecode($term_link_text));

+						}

+

+						if ($term_index == count($term_array) && $is_taxonomy_last)

+							$breadcrumb .= $separator . $term_link_text;

+						else {

+							$cat_link .= $term . '/';

+							$breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>';

+						}

+						$term_index++;

+					}

+				}

+

+

+			}

+

+			if (geodir_is_page('detail'))

+				$breadcrumb .= $separator . get_the_title();

+

+			$breadcrumb .= '</li>';

+

+

+		} elseif (geodir_is_page('author')) {

+			$user_id = get_current_user_id();

+			$author_link = get_author_posts_url($user_id);

+			$default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => 'gd_place'), false);

+

+			/**

+			 * Filter author page link.

+			 *

+			 * @since 1.0.0

+			 * @param string $default_author_link Default author link.

+			 * @param int $user_id Author ID.

+			 */

+			$default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);

+

+			$breadcrumb .= '<li>';

+			$breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __('My Dashboard', 'geodirectory') . '</a>';

+

+			if (isset($_REQUEST['list'])) {

+				$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => $_REQUEST['stype']), false);

+

+				/**

+				 * Filter author page link.

+				 *

+				 * @since 1.0.0

+				 * @param string $author_link Author page link.

+				 * @param int $user_id Author ID.

+				 * @param string $_REQUEST['stype'] Post type.

+				 */

+				$author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);

+

+				$breadcrumb .= $separator . '<a href="' . $author_link . '">' . __(ucfirst($post_type_info->label), 'geodirectory') . '</a>';

+				$breadcrumb .= $separator . ucfirst(__('My', 'geodirectory') . ' ' . $_REQUEST['list']);

+			} else

+				$breadcrumb .= $separator . __(ucfirst($post_type_info->label), 'geodirectory');

+

+			$breadcrumb .= '</li>';

+		} elseif (is_category() || is_single()) {

+			$category = get_the_category();

+			if (is_category()) {

+				$breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>';

+			}

+			if (is_single()) {

+				$breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link($category[0]->term_id) . '">' . $category[0]->cat_name . '</a></li>';

+				$breadcrumb .= '<li>' . $separator . get_the_title() . '</li>';

+			}

+			/* End of my version ##################################################### */

+		} else if (is_page()) {

+			$page_title = get_the_title();

+

+			if (geodir_is_page('location')) {

+				$page_title = defined('GD_LOCATION') ? GD_LOCATION : __('Location', 'geodirectory');

+			}

+

+			$breadcrumb .= '<li>' . $separator;

+			$breadcrumb .= stripslashes_deep($page_title);

+			$breadcrumb .= '</li>';

+		} else if (is_tag()) {

+			$breadcrumb .=  "<li> " . $separator . single_tag_title('',false) . '</li>';

+		} else if (is_day()) {

+			$breadcrumb .= "<li> " . $separator . __(" Archive for", 'geodirectory') . " ";

+			the_time('F jS, Y');

+			$breadcrumb .= '</li>';

+		} else if (is_month()) {

+			$breadcrumb .= "<li> " . $separator . __(" Archive for", 'geodirectory') . " ";

+			the_time('F, Y');

+			$breadcrumb .= '</li>';

+		} else if (is_year()) {

+			$breadcrumb .= "<li> " . $separator . __(" Archive for", 'geodirectory') . " ";

+			the_time('Y');

+			$breadcrumb .= '</li>';

+		} else if (is_author()) {

+			$breadcrumb .= "<li> " . $separator . __(" Author Archive", 'geodirectory');

+			$breadcrumb .= '</li>';

+		} else if (isset($_GET['paged']) && !empty($_GET['paged'])) {

+			$breadcrumb .= "<li>" . $separator . __("Blog Archives", 'geodirectory');

+			$breadcrumb .= '</li>';

+		} else if (is_search()) {

+			$breadcrumb .= "<li> " . $separator . __(" Search Results", 'geodirectory');

+			$breadcrumb .= '</li>';

+		}

+		$breadcrumb .= '</ul></div>';

+

+		/**

+		 * Filter breadcrumb html output.

+		 *

+		 * @since 1.0.0

+		 * @param string $breadcrumb Breadcrumb HTML.

+		 * @param string $separator Breadcrumb separator.

+		 */

+		echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);

+	}

 }

 

 

 add_action("admin_init", "geodir_allow_wpadmin"); // check user is admin

 if (!function_exists('geodir_allow_wpadmin')) {

-    /**

-     * Allow only admins to access wp-admin.

-     *

-     * Normal users will be redirected to home page.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     */

-    function geodir_allow_wpadmin()

-    {

-        global $wpdb;

-        if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!isset($_REQUEST['action']))) // checking action in request to allow ajax request go through

-        {

-            if (current_user_can('manage_options')) {

-            } else {

-

-                wp_redirect(home_url());

-                exit;

-            }

+	/**

+	 * Allow only admins to access wp-admin.

+	 *

+	 * Normal users will be redirected to home page.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 */

+	function geodir_allow_wpadmin()

+	{

+		global $wpdb;

+		if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!isset($_REQUEST['action']))) // checking action in request to allow ajax request go through

+		{

+			if (current_user_can('manage_options')) {

+			} else {

+

+				wp_redirect(home_url());

+				exit;

+			}

 

-        }

-    }

+		}

+	}

 }

 

 

@@ -1214,50 +1214,50 @@ 
  */

 function fetch_remote_file($url)

 {

-    // extract the file name and extension from the url

-    require_once(ABSPATH . 'wp-includes/pluggable.php');

-    $file_name = basename($url);

-    if (strpos($file_name, '?') !== false) {

-        list($file_name) = explode('?', $file_name);

-    }

-

-

-    // get placeholder file in the upload dir with a unique, sanitized filename

-

-    $post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : '';

-

-    $upload = wp_upload_bits($file_name, 0, '', $post_upload_date);

-    if ($upload['error'])

-        return new WP_Error('upload_dir_error', $upload['error']);

-

-    // fetch the remote url and write it to the placeholder file

-    $headers = wp_remote_get($url, array('stream' => true,'filename' => $upload['file']));

-

-    $log_message = '';

-    $filesize = filesize($upload['file']);

-    // request failed

-    if (!$headers) {

-        $log_message = __('Remote server did not respond', 'geodirectory');

-    }

-    // make sure the fetch was successful

-    elseif ($headers['response']['code'] != '200') {

-        $log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));

-    }

-    elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {

-        $log_message =  __('Remote file is incorrect size', 'geodirectory');

-    }

-    elseif (0 == $filesize) {

-        $log_message = __('Zero size file downloaded', 'geodirectory');

-    }

-

-    if($log_message){

-        $del = unlink($upload['file']);

-        if(!$del){geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));}

-        return new WP_Error('import_file_error',$log_message );

-    }

-

-

-    return $upload;

+	// extract the file name and extension from the url

+	require_once(ABSPATH . 'wp-includes/pluggable.php');

+	$file_name = basename($url);

+	if (strpos($file_name, '?') !== false) {

+		list($file_name) = explode('?', $file_name);

+	}

+

+

+	// get placeholder file in the upload dir with a unique, sanitized filename

+

+	$post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : '';

+

+	$upload = wp_upload_bits($file_name, 0, '', $post_upload_date);

+	if ($upload['error'])

+		return new WP_Error('upload_dir_error', $upload['error']);

+

+	// fetch the remote url and write it to the placeholder file

+	$headers = wp_remote_get($url, array('stream' => true,'filename' => $upload['file']));

+

+	$log_message = '';

+	$filesize = filesize($upload['file']);

+	// request failed

+	if (!$headers) {

+		$log_message = __('Remote server did not respond', 'geodirectory');

+	}

+	// make sure the fetch was successful

+	elseif ($headers['response']['code'] != '200') {

+		$log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));

+	}

+	elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {

+		$log_message =  __('Remote file is incorrect size', 'geodirectory');

+	}

+	elseif (0 == $filesize) {

+		$log_message = __('Zero size file downloaded', 'geodirectory');

+	}

+

+	if($log_message){

+		$del = unlink($upload['file']);

+		if(!$del){geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));}

+		return new WP_Error('import_file_error',$log_message );

+	}

+

+

+	return $upload;

 }

 

 /**

@@ -1269,21 +1269,21 @@ 
  */

 function geodir_max_upload_size()

 {

-    $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

-

-    if ($max_filesize > 0 && $max_filesize < 1) {

-        $max_filesize = (int)($max_filesize * 1024) . 'kb';

-    } else {

-        $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

-    }

-

-    /**

-     * Filter default image upload size limit.

-     *

-     * @since 1.0.0

-     * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb.

-     */

-    return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

+	$max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+

+	if ($max_filesize > 0 && $max_filesize < 1) {

+		$max_filesize = (int)($max_filesize * 1024) . 'kb';

+	} else {

+		$max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

+	}

+

+	/**

+	 * Filter default image upload size limit.

+	 *

+	 * @since 1.0.0

+	 * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb.

+	 */

+	return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

 }

 

 /**

@@ -1297,11 +1297,11 @@ 
  */

 function geodir_dummy_folder_exists()

 {

-    $path = geodir_plugin_path() . '/geodirectory-admin/dummy/';

-    if (!is_dir($path))

-        return false;

-    else

-        return true;

+	$path = geodir_plugin_path() . '/geodirectory-admin/dummy/';

+	if (!is_dir($path))

+		return false;

+	else

+		return true;

 

 }

 

@@ -1316,237 +1316,237 @@ 
  */

 function  geodir_get_author_info($aid)

 {

-    global $wpdb;

-    /*$infosql = "select * from $wpdb->users where ID=$aid";*/

-    $infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));

-    $info = $wpdb->get_results($infosql);

-    if ($info) {

-        return $info[0];

-    }

+	global $wpdb;

+	/*$infosql = "select * from $wpdb->users where ID=$aid";*/

+	$infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));

+	$info = $wpdb->get_results($infosql);

+	if ($info) {

+		return $info[0];

+	}

 }

 

 if (!function_exists('adminEmail')) {

-    /**

-     * Send emails to client on post submission, renew etc.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param int|string $page_id Page ID.

-     * @param int|string $user_id User ID.

-     * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

-     * @param string $custom_1 Custom data to be sent.

-     */

-    function adminEmail($page_id, $user_id, $message_type, $custom_1 = '')

-    {

-        global $wpdb;

-        if ($message_type == 'expiration') {

-            $subject = stripslashes(__(get_option('renew_email_subject'),'geodirectory'));

-            $client_message = stripslashes(__(get_option('renew_email_content'),'geodirectory'));

-        } elseif ($message_type == 'post_submited') {

-            $subject = __(get_option('post_submited_success_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('post_submited_success_email_content_admin'),'geodirectory');

-        } elseif ($message_type == 'renew') {

-            $subject = __(get_option('post_renew_success_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('post_renew_success_email_content_admin'),'geodirectory');

-        } elseif ($message_type == 'upgrade') {

-            $subject = __(get_option('post_upgrade_success_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('post_upgrade_success_email_content_admin'),'geodirectory');

-        } elseif ($message_type == 'claim_approved') {

-            $subject = __(get_option('claim_approved_email_subject'),'geodirectory');

-            $client_message = __(get_option('claim_approved_email_content'),'geodirectory');

-        } elseif ($message_type == 'claim_rejected') {

-            $subject = __(get_option('claim_rejected_email_subject'),'geodirectory');

-            $client_message = __(get_option('claim_rejected_email_content'),'geodirectory');

-        } elseif ($message_type == 'claim_requested') {

-            $subject = __(get_option('claim_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('claim_email_content_admin'),'geodirectory');

-        } elseif ($message_type == 'auto_claim') {

-            $subject = __(get_option('auto_claim_email_subject'),'geodirectory');

-            $client_message = __(get_option('auto_claim_email_content'),'geodirectory');

-        } elseif ($message_type == 'payment_success') {

-            $subject = __(get_option('post_payment_success_admin_email_subject'),'geodirectory');

-            $client_message = __(get_option('post_payment_success_admin_email_content'),'geodirectory');

-        } elseif ($message_type == 'payment_fail') {

-            $subject = __(get_option('post_payment_fail_admin_email_subject'),'geodirectory');

-            $client_message = __(get_option('post_payment_fail_admin_email_content'),'geodirectory');

-        }

-        $transaction_details = $custom_1;

-        $fromEmail = get_option('site_email');

-        $fromEmailName = get_site_emailName();

+	/**

+	 * Send emails to client on post submission, renew etc.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param int|string $page_id Page ID.

+	 * @param int|string $user_id User ID.

+	 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

+	 * @param string $custom_1 Custom data to be sent.

+	 */

+	function adminEmail($page_id, $user_id, $message_type, $custom_1 = '')

+	{

+		global $wpdb;

+		if ($message_type == 'expiration') {

+			$subject = stripslashes(__(get_option('renew_email_subject'),'geodirectory'));

+			$client_message = stripslashes(__(get_option('renew_email_content'),'geodirectory'));

+		} elseif ($message_type == 'post_submited') {

+			$subject = __(get_option('post_submited_success_email_subject_admin'),'geodirectory');

+			$client_message = __(get_option('post_submited_success_email_content_admin'),'geodirectory');

+		} elseif ($message_type == 'renew') {

+			$subject = __(get_option('post_renew_success_email_subject_admin'),'geodirectory');

+			$client_message = __(get_option('post_renew_success_email_content_admin'),'geodirectory');

+		} elseif ($message_type == 'upgrade') {

+			$subject = __(get_option('post_upgrade_success_email_subject_admin'),'geodirectory');

+			$client_message = __(get_option('post_upgrade_success_email_content_admin'),'geodirectory');

+		} elseif ($message_type == 'claim_approved') {

+			$subject = __(get_option('claim_approved_email_subject'),'geodirectory');

+			$client_message = __(get_option('claim_approved_email_content'),'geodirectory');

+		} elseif ($message_type == 'claim_rejected') {

+			$subject = __(get_option('claim_rejected_email_subject'),'geodirectory');

+			$client_message = __(get_option('claim_rejected_email_content'),'geodirectory');

+		} elseif ($message_type == 'claim_requested') {

+			$subject = __(get_option('claim_email_subject_admin'),'geodirectory');

+			$client_message = __(get_option('claim_email_content_admin'),'geodirectory');

+		} elseif ($message_type == 'auto_claim') {

+			$subject = __(get_option('auto_claim_email_subject'),'geodirectory');

+			$client_message = __(get_option('auto_claim_email_content'),'geodirectory');

+		} elseif ($message_type == 'payment_success') {

+			$subject = __(get_option('post_payment_success_admin_email_subject'),'geodirectory');

+			$client_message = __(get_option('post_payment_success_admin_email_content'),'geodirectory');

+		} elseif ($message_type == 'payment_fail') {

+			$subject = __(get_option('post_payment_fail_admin_email_subject'),'geodirectory');

+			$client_message = __(get_option('post_payment_fail_admin_email_content'),'geodirectory');

+		}

+		$transaction_details = $custom_1;

+		$fromEmail = get_option('site_email');

+		$fromEmailName = get_site_emailName();

 //$alivedays = get_post_meta($page_id,'alive_days',true);

-        $pkg_limit = get_property_price_info_listing($page_id);

-        $alivedays = $pkg_limit['days'];

-        $productlink = get_permalink($page_id);

-        $post_info = get_post($page_id);

-        $post_date = date('dS F,Y', strtotime($post_info->post_date));

-        $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>';

-        $loginurl = geodir_login_url();

-        $loginurl_link = '<a href="' . $loginurl . '">login</a>';

-        $siteurl = home_url();

-        $siteurl_link = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>';

-        $user_info = get_userdata($user_id);

-        $user_email = $user_info->user_email;

-        $display_name = geodir_get_client_name($user_id);

-        $user_login = $user_info->user_login;

-        $number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');

-        if ($number_of_grace_days == '') {

-            $number_of_grace_days = 1;

-        }

-        if ($post_info->post_type == 'event') {

-            $post_type = 'event';

-        } else {

-            $post_type = 'listing';

-        }

-        $renew_link = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>';

-        $search_array = array('[#client_name#]', '[#listing_link#]', '[#posted_date#]', '[#number_of_days#]', '[#number_of_grace_days#]', '[#login_url#]', '[#username#]', '[#user_email#]', '[#site_name_url#]', '[#renew_link#]', '[#post_id#]', '[#site_name#]', '[#transaction_details#]');

-        $replace_array = array($display_name, $listingLink, $post_date, $alivedays, $number_of_grace_days, $loginurl_link, $user_login, $user_email, $siteurl_link, $renew_link, $page_id, $fromEmailName, $transaction_details);

-        $client_message = str_replace($search_array, $replace_array, $client_message);

-        $subject = str_replace($search_array, $replace_array, $subject);

-        $headers = 'MIME-Version: 1.0' . "\r\n";

-        $headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";

-        $headers .= 'From: ' . $fromEmailName . ' <' . $fromEmail . '>' . "\r\n";

-

-        $to = $fromEmail;

-        $message = $client_message;

-        $sent = wp_mail($to, $subject, $message, $headers);

-        if( ! $sent ) {

-            if ( is_array( $to ) ) {

-                $to = implode( ',', $to );

-            }

-            $log_message = sprintf(

-                __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

-                $message_type,

-                date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

-                $to,

-                $subject

-            );

-            geodir_error_log( $log_message );

-        }

-    }

+		$pkg_limit = get_property_price_info_listing($page_id);

+		$alivedays = $pkg_limit['days'];

+		$productlink = get_permalink($page_id);

+		$post_info = get_post($page_id);

+		$post_date = date('dS F,Y', strtotime($post_info->post_date));

+		$listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>';

+		$loginurl = geodir_login_url();

+		$loginurl_link = '<a href="' . $loginurl . '">login</a>';

+		$siteurl = home_url();

+		$siteurl_link = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>';

+		$user_info = get_userdata($user_id);

+		$user_email = $user_info->user_email;

+		$display_name = geodir_get_client_name($user_id);

+		$user_login = $user_info->user_login;

+		$number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');

+		if ($number_of_grace_days == '') {

+			$number_of_grace_days = 1;

+		}

+		if ($post_info->post_type == 'event') {

+			$post_type = 'event';

+		} else {

+			$post_type = 'listing';

+		}

+		$renew_link = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>';

+		$search_array = array('[#client_name#]', '[#listing_link#]', '[#posted_date#]', '[#number_of_days#]', '[#number_of_grace_days#]', '[#login_url#]', '[#username#]', '[#user_email#]', '[#site_name_url#]', '[#renew_link#]', '[#post_id#]', '[#site_name#]', '[#transaction_details#]');

+		$replace_array = array($display_name, $listingLink, $post_date, $alivedays, $number_of_grace_days, $loginurl_link, $user_login, $user_email, $siteurl_link, $renew_link, $page_id, $fromEmailName, $transaction_details);

+		$client_message = str_replace($search_array, $replace_array, $client_message);

+		$subject = str_replace($search_array, $replace_array, $subject);

+		$headers = 'MIME-Version: 1.0' . "\r\n";

+		$headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";

+		$headers .= 'From: ' . $fromEmailName . ' <' . $fromEmail . '>' . "\r\n";

+

+		$to = $fromEmail;

+		$message = $client_message;

+		$sent = wp_mail($to, $subject, $message, $headers);

+		if( ! $sent ) {

+			if ( is_array( $to ) ) {

+				$to = implode( ',', $to );

+			}

+			$log_message = sprintf(

+				__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+				$message_type,

+				date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+				$to,

+				$subject

+			);

+			geodir_error_log( $log_message );

+		}

+	}

 }

 

 if (!function_exists('sendEmail')) {

-    /**

-     * @todo could be a duplicate of geodir_sendEmail.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $fromEmail Sender email address.

-     * @param string $fromEmailName Sender name.

-     * @param string $toEmail Receiver email address.

-     * @param string $toEmailName Receiver name.

-     * @param string $to_subject Email subject.

-     * @param string $to_message Email content.

-     * @param string $extra Not being used.

-     * @param string $message_type The message type. Can be send_friend, send_enquiry, forgot_password, registration.

-     * @param string $post_id The post ID.

-     * @param string $user_id The user ID.

-     */

-    function sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '')

-    {

-        $login_details = '';

-        if ($message_type == 'send_friend') {

-            $subject = stripslashes(__(get_option('email_friend_subject'),'geodirectory'));

-            $message = stripslashes(__(get_option('email_friend_content'),'geodirectory'));

-        } elseif ($message_type == 'send_enquiry') {

-            $subject = __(get_option('email_enquiry_subject'),'geodirectory');

-            $message = __(get_option('email_enquiry_content'),'geodirectory');

-        } elseif ($message_type == 'forgot_password') {

-            $subject = __(get_option('forgot_password_subject'),'geodirectory');

-            $message = __(get_option('forgot_password_content'),'geodirectory');

-            $login_details = $to_message;

-        } elseif ($message_type == 'registration') {

-            $subject = __(get_option('registration_success_email_subject'),'geodirectory');

-            $message = __(get_option('registration_success_email_content'),'geodirectory');

-            $login_details = $to_message;

-        }

-        $to_message = nl2br($to_message);

-        $sitefromEmail = get_option('site_email');

-        $sitefromEmailName = get_site_emailName();

-        $productlink = get_permalink($post_id);

-        $post_info = get_post($post_id);

-        $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>';

-        $siteurl = home_url();

-        $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

-        $loginurl = geodir_login_url();

-        $loginurl_link = '<a href="' . $loginurl . '">login</a>';

-        if ($fromEmail == '') {

-            $fromEmail = get_option('site_email');

-        }

-        if ($fromEmailName == '') {

-            $fromEmailName = get_option('site_email_name');

-        }

-        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]');

-        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName);

-        $message = str_replace($search_array, $replace_array, $message);

-

-        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]');

-        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName);

-        $subject = str_replace($search_array, $replace_array, $subject);

-        $headers = 'MIME-Version: 1.0' . "\r\n";

-        $headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";

-        $headers .= "Reply-To: " . $fromEmail . "\r\n";

-        $headers .= 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>' . "\r\n";

-

-        $to = $toEmail;

-

-        $sent = wp_mail($to, $subject, $message, $headers);

-        if( ! $sent ) {

-            if ( is_array( $to ) ) {

-                $to = implode( ',', $to );

-            }

-            $log_message = sprintf(

-                __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

-                $message_type,

-                date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

-                $to,

-                $subject

-            );

-            geodir_error_log( $log_message );

-        }

+	/**

+	 * @todo could be a duplicate of geodir_sendEmail.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $fromEmail Sender email address.

+	 * @param string $fromEmailName Sender name.

+	 * @param string $toEmail Receiver email address.

+	 * @param string $toEmailName Receiver name.

+	 * @param string $to_subject Email subject.

+	 * @param string $to_message Email content.

+	 * @param string $extra Not being used.

+	 * @param string $message_type The message type. Can be send_friend, send_enquiry, forgot_password, registration.

+	 * @param string $post_id The post ID.

+	 * @param string $user_id The user ID.

+	 */

+	function sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '')

+	{

+		$login_details = '';

+		if ($message_type == 'send_friend') {

+			$subject = stripslashes(__(get_option('email_friend_subject'),'geodirectory'));

+			$message = stripslashes(__(get_option('email_friend_content'),'geodirectory'));

+		} elseif ($message_type == 'send_enquiry') {

+			$subject = __(get_option('email_enquiry_subject'),'geodirectory');

+			$message = __(get_option('email_enquiry_content'),'geodirectory');

+		} elseif ($message_type == 'forgot_password') {

+			$subject = __(get_option('forgot_password_subject'),'geodirectory');

+			$message = __(get_option('forgot_password_content'),'geodirectory');

+			$login_details = $to_message;

+		} elseif ($message_type == 'registration') {

+			$subject = __(get_option('registration_success_email_subject'),'geodirectory');

+			$message = __(get_option('registration_success_email_content'),'geodirectory');

+			$login_details = $to_message;

+		}

+		$to_message = nl2br($to_message);

+		$sitefromEmail = get_option('site_email');

+		$sitefromEmailName = get_site_emailName();

+		$productlink = get_permalink($post_id);

+		$post_info = get_post($post_id);

+		$listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>';

+		$siteurl = home_url();

+		$siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

+		$loginurl = geodir_login_url();

+		$loginurl_link = '<a href="' . $loginurl . '">login</a>';

+		if ($fromEmail == '') {

+			$fromEmail = get_option('site_email');

+		}

+		if ($fromEmailName == '') {

+			$fromEmailName = get_option('site_email_name');

+		}

+		$search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]');

+		$replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName);

+		$message = str_replace($search_array, $replace_array, $message);

+

+		$search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]');

+		$replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName);

+		$subject = str_replace($search_array, $replace_array, $subject);

+		$headers = 'MIME-Version: 1.0' . "\r\n";

+		$headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";

+		$headers .= "Reply-To: " . $fromEmail . "\r\n";

+		$headers .= 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>' . "\r\n";

+

+		$to = $toEmail;

+

+		$sent = wp_mail($to, $subject, $message, $headers);

+		if( ! $sent ) {

+			if ( is_array( $to ) ) {

+				$to = implode( ',', $to );

+			}

+			$log_message = sprintf(

+				__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+				$message_type,

+				date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+				$to,

+				$subject

+			);

+			geodir_error_log( $log_message );

+		}

 

-        ///////// ADMIN BCC EMIALS

-        $admin_bcc = false;

-        if ($message_type == 'registration') {

-            $message_raw = explode(__("Password:", 'geodirectory'), $message);

-            $message_raw2 = explode("</p>", $message_raw[1], 2);

-            $message = $message_raw[0] . __('Password:', 'geodirectory') . ' **********</p>' . $message_raw2[1];

-        }

-        $adminEmail = get_bloginfo('admin_email');

-        $to = $adminEmail;

+		///////// ADMIN BCC EMIALS

+		$admin_bcc = false;

+		if ($message_type == 'registration') {

+			$message_raw = explode(__("Password:", 'geodirectory'), $message);

+			$message_raw2 = explode("</p>", $message_raw[1], 2);

+			$message = $message_raw[0] . __('Password:', 'geodirectory') . ' **********</p>' . $message_raw2[1];

+		}

+		$adminEmail = get_bloginfo('admin_email');

+		$to = $adminEmail;

 

-        if ($message_type == 'registration' && get_option('bcc_new_user')) {

-            $subject .= ' - ADMIN BCC COPY';

-            $admin_bcc = true;

-        }

-        elseif ($message_type == 'send_friend' && get_option('bcc_friend')) {

-            $subject .= ' - ADMIN BCC COPY';

-            $admin_bcc = true;

-        }

-        elseif ($message_type == 'send_enquiry' && get_option('bcc_enquiry')) {

-            $subject .= ' - ADMIN BCC COPY';

-            $admin_bcc = true;

-        }

+		if ($message_type == 'registration' && get_option('bcc_new_user')) {

+			$subject .= ' - ADMIN BCC COPY';

+			$admin_bcc = true;

+		}

+		elseif ($message_type == 'send_friend' && get_option('bcc_friend')) {

+			$subject .= ' - ADMIN BCC COPY';

+			$admin_bcc = true;

+		}

+		elseif ($message_type == 'send_enquiry' && get_option('bcc_enquiry')) {

+			$subject .= ' - ADMIN BCC COPY';

+			$admin_bcc = true;

+		}

 

-        if($admin_bcc === true){

-            $sent = wp_mail($to, $subject, $message, $headers);

-            if( ! $sent ) {

-                if ( is_array( $to ) ) {

-                    $to = implode( ',', $to );

-                }

-                $log_message = sprintf(

-                    __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

-                    $message_type,

-                    date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

-                    $to,

-                    $subject

-                );

-                geodir_error_log( $log_message );

-            }

-        }

+		if($admin_bcc === true){

+			$sent = wp_mail($to, $subject, $message, $headers);

+			if( ! $sent ) {

+				if ( is_array( $to ) ) {

+					$to = implode( ',', $to );

+				}

+				$log_message = sprintf(

+					__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+					$message_type,

+					date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+					$to,

+					$subject

+				);

+				geodir_error_log( $log_message );

+			}

+		}

 

-    }

+	}

 }

 

 /*

@@ -1564,16 +1564,16 @@ 
  */

 function gd_lang_object_ids($ids_array, $type)

 {

-    if (function_exists('icl_object_id')) {

-        $res = array();

-        foreach ($ids_array as $id) {

-            $xlat = icl_object_id($id, $type, false);

-            if (!is_null($xlat)) $res[] = $xlat;

-        }

-        return $res;

-    } else {

-        return $ids_array;

-    }

+	if (function_exists('icl_object_id')) {

+		$res = array();

+		foreach ($ids_array as $id) {

+			$xlat = icl_object_id($id, $type, false);

+			if (!is_null($xlat)) $res[] = $xlat;

+		}

+		return $res;

+	} else {

+		return $ids_array;

+	}

 }

 

 

@@ -1588,31 +1588,31 @@ 
  * @return array Modified Body CSS classes.

  */

 function geodir_custom_posts_body_class($classes) {

-    global $wpdb, $wp;

-    $post_types = geodir_get_posttypes('object');

-    if (!empty($post_types) && count((array)$post_types) > 1) {

-        $classes[] = 'geodir_custom_posts';

-    }

-

-    // fix body class for signup page

-    if (geodir_is_page('login')) {

-        $new_classes = array();

-        $new_classes[] = 'signup page-geodir-signup';

-        if (!empty($classes)) {

-            foreach ($classes as $class) {

-                if ($class && $class != 'home' && $class != 'blog') {

-                    $new_classes[] = $class;

-                }

-            }

-        }

-        $classes = $new_classes;

-    }

+	global $wpdb, $wp;

+	$post_types = geodir_get_posttypes('object');

+	if (!empty($post_types) && count((array)$post_types) > 1) {

+		$classes[] = 'geodir_custom_posts';

+	}

+

+	// fix body class for signup page

+	if (geodir_is_page('login')) {

+		$new_classes = array();

+		$new_classes[] = 'signup page-geodir-signup';

+		if (!empty($classes)) {

+			foreach ($classes as $class) {

+				if ($class && $class != 'home' && $class != 'blog') {

+					$new_classes[] = $class;

+				}

+			}

+		}

+		$classes = $new_classes;

+	}

 

-    if (geodir_is_geodir_page()) {

-        $classes[] = 'geodir-page';

-    }

+	if (geodir_is_geodir_page()) {

+		$classes[] = 'geodir-page';

+	}

 

-    return $classes;

+	return $classes;

 }

 

 add_filter('body_class', 'geodir_custom_posts_body_class'); // let's add a class to the body so we can style the new addition to the search

@@ -1627,12 +1627,12 @@ 
  */

 function geodir_map_zoom_level()

 {

-    /**

-     * Filter GD map zoom level.

-     *

-     * @since 1.0.0

-     */

-    return apply_filters('geodir_map_zoom_level', array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19));

+	/**

+	 * Filter GD map zoom level.

+	 *

+	 * @since 1.0.0

+	 */

+	return apply_filters('geodir_map_zoom_level', array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19));

 

 }

 

@@ -1646,12 +1646,12 @@ 
  */

 function geodir_option_version_backup($geodir_option_name)

 {

-    $version_date = time();

-    $geodir_option = get_option($geodir_option_name);

+	$version_date = time();

+	$geodir_option = get_option($geodir_option_name);

 

-    if (!empty($geodir_option)) {

-        add_option($geodir_option_name . '_' . $version_date, $geodir_option);

-    }

+	if (!empty($geodir_option)) {

+		add_option($geodir_option_name . '_' . $version_date, $geodir_option);

+	}

 }

 

 /**

@@ -1664,11 +1664,11 @@ 
  */

 function get_page_id_geodir_add_listing_page($page_id)

 {

-    if (geodir_wpml_multilingual_status()) {

-        $post_type = 'post_page';

-        $page_id = geodir_get_wpml_element_id($page_id, $post_type);

-    }

-    return $page_id;

+	if (geodir_wpml_multilingual_status()) {

+		$post_type = 'post_page';

+		$page_id = geodir_get_wpml_element_id($page_id, $post_type);

+	}

+	return $page_id;

 }

 

 /**

@@ -1680,10 +1680,10 @@ 
  */

 function geodir_wpml_multilingual_status()

 {

-    if (function_exists('icl_object_id')) {

-        return true;

-    }

-    return false;

+	if (function_exists('icl_object_id')) {

+		return true;

+	}

+	return false;

 }

 

 /**

@@ -1697,22 +1697,22 @@ 
  */

 function geodir_get_wpml_element_id($page_id, $post_type)

 {

-    global $sitepress;

-    if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {

-        $trid = $sitepress->get_element_trid($page_id, $post_type);

+	global $sitepress;

+	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {

+		$trid = $sitepress->get_element_trid($page_id, $post_type);

 

-        if ($trid > 0) {

-            $translations = $sitepress->get_element_translations($trid, $post_type);

+		if ($trid > 0) {

+			$translations = $sitepress->get_element_translations($trid, $post_type);

 

-            $lang = $sitepress->get_current_language();

-            $lang = $lang ? $lang : $sitepress->get_default_language();

+			$lang = $sitepress->get_current_language();

+			$lang = $lang ? $lang : $sitepress->get_default_language();

 

-            if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {

-                $page_id = $translations[$lang]->element_id;

-            }

-        }

-    }

-    return $page_id;

+			if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {

+				$page_id = $translations[$lang]->element_id;

+			}

+		}

+	}

+	return $page_id;

 }

 

 /**

@@ -1724,20 +1724,20 @@ 
  */

 function geodir_wpml_check_element_id()

 {

-    global $sitepress;

-    if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {

-        $el_type = 'post_page';

-        $el_id = get_option('geodir_add_listing_page');

-        $default_lang = $sitepress->get_default_language();

-        $el_details = $sitepress->get_element_language_details($el_id, $el_type);

-

-        if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {

-            if (!$el_details->source_language_code) {

-                $sitepress->set_element_language_details($el_id, $el_type, '', $default_lang);

-                $sitepress->icl_translations_cache->clear();

-            }

-        }

-    }

+	global $sitepress;

+	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {

+		$el_type = 'post_page';

+		$el_id = get_option('geodir_add_listing_page');

+		$default_lang = $sitepress->get_default_language();

+		$el_details = $sitepress->get_element_language_details($el_id, $el_type);

+

+		if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {

+			if (!$el_details->source_language_code) {

+				$sitepress->set_element_language_details($el_id, $el_type, '', $default_lang);

+				$sitepress->icl_translations_cache->clear();

+			}

+		}

+	}

 }

 

 /**

@@ -1752,44 +1752,44 @@ 
  */

 function geodir_widget_listings_get_order($query_args)

 {

-    global $wpdb, $plugin_prefix, $gd_query_args_widgets;

-

-    $query_args = $gd_query_args_widgets;

-    if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

-        return $wpdb->posts . ".post_date DESC, ";

-    }

-

-    $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

-    $table = $plugin_prefix . $post_type . '_detail';

-

-    $sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : '';

-

-    switch ($sort_by) {

-        case 'latest':

-        case 'newest':

-            $orderby = $wpdb->posts . ".post_date DESC, ";

-            break;

-        case 'featured':

-            $orderby = $table . ".is_featured ASC, ";

-            break;

-        case 'az':

-            $orderby = $wpdb->posts . ".post_title ASC, ";

-            break;

-        case 'high_review':

-            $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

-            break;

-        case 'high_rating':

-            $orderby = "( " . $table . ".overall_rating  ) DESC, ";

-            break;

-        case 'random':

-            $orderby = "RAND(), ";

-            break;

-        default:

-            $orderby = $wpdb->posts . ".post_title ASC, ";

-            break;

-    }

-

-    return $orderby;

+	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

+

+	$query_args = $gd_query_args_widgets;

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

+		return $wpdb->posts . ".post_date DESC, ";

+	}

+

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

+	$table = $plugin_prefix . $post_type . '_detail';

+

+	$sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : '';

+

+	switch ($sort_by) {

+		case 'latest':

+		case 'newest':

+			$orderby = $wpdb->posts . ".post_date DESC, ";

+			break;

+		case 'featured':

+			$orderby = $table . ".is_featured ASC, ";

+			break;

+		case 'az':

+			$orderby = $wpdb->posts . ".post_title ASC, ";

+			break;

+		case 'high_review':

+			$orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

+			break;

+		case 'high_rating':

+			$orderby = "( " . $table . ".overall_rating  ) DESC, ";

+			break;

+		case 'random':

+			$orderby = "RAND(), ";

+			break;

+		default:

+			$orderby = $wpdb->posts . ".post_title ASC, ";

+			break;

+	}

+

+	return $orderby;

 }

 

 /**

@@ -1807,127 +1807,127 @@ 
  */

 function geodir_get_widget_listings($query_args = array(), $count_only = false)

 {

-    global $wpdb, $plugin_prefix, $table_prefix;

-    $GLOBALS['gd_query_args_widgets'] = $query_args;

-    $gd_query_args_widgets = $query_args;

-

-    $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

-    $table = $plugin_prefix . $post_type . '_detail';

-

-    $fields = $wpdb->posts . ".*, " . $table . ".*";

-    /**

-     * Filter widget listing fields string part that is being used for query.

-     *

-     * @since 1.0.0

-     * @param string $fields Fields string.

-     * @param string $table Table name.

-     * @param string $post_type Post type.

-     */

-    $fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);

-

-    $join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";

-

-    ########### WPML ###########

-

-    if (function_exists('icl_object_id')) {

-        global $sitepress;

-        $lang_code = ICL_LANGUAGE_CODE;

-        $default_lang_code = $sitepress->get_default_language();

-        if ($lang_code) {

-            $join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

-        }

-    }

-

-    ########### WPML ###########

+	global $wpdb, $plugin_prefix, $table_prefix;

+	$GLOBALS['gd_query_args_widgets'] = $query_args;

+	$gd_query_args_widgets = $query_args;

+

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

+	$table = $plugin_prefix . $post_type . '_detail';

+

+	$fields = $wpdb->posts . ".*, " . $table . ".*";

+	/**

+	 * Filter widget listing fields string part that is being used for query.

+	 *

+	 * @since 1.0.0

+	 * @param string $fields Fields string.

+	 * @param string $table Table name.

+	 * @param string $post_type Post type.

+	 */

+	$fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);

+

+	$join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";

+

+	########### WPML ###########

+

+	if (function_exists('icl_object_id')) {

+		global $sitepress;

+		$lang_code = ICL_LANGUAGE_CODE;

+		$default_lang_code = $sitepress->get_default_language();

+		if ($lang_code) {

+			$join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

+		}

+	}

 

-    /**

-     * Filter widget listing join clause string part that is being used for query.

-     *

-     * @since 1.0.0

-     * @param string $join Join clause string.

-     * @param string $post_type Post type.

-     */

-    $join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);

+	########### WPML ###########

 

-    $post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : '';

+	/**

+	 * Filter widget listing join clause string part that is being used for query.

+	 *

+	 * @since 1.0.0

+	 * @param string $join Join clause string.

+	 * @param string $post_type Post type.

+	 */

+	$join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);

 

-    $where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'";

+	$post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : '';

 

-    ########### WPML ###########

-    if (function_exists('icl_object_id')) {

-        if ($lang_code) {

-            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' ";

-        }

-    }

-    ########### WPML ###########

-    /**

-     * Filter widget listing where clause string part that is being used for query.

-     *

-     * @since 1.0.0

-     * @param string $where Where clause string.

-     * @param string $post_type Post type.

-     */

-    $where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);

-    $where = $where != '' ? " WHERE 1=1 " . $where : '';

-

-    $groupby = " GROUP BY $wpdb->posts.ID ";

-    /**

-     * Filter widget listing groupby clause string part that is being used for query.

-     *

-     * @since 1.0.0

-     * @param string $groupby Group by clause string.

-     * @param string $post_type Post type.

-     */

-    $groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);

+	$where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'";

 

-    if ($count_only) {

-        $sql = "SELECT COUNT(" . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . "

+	########### WPML ###########

+	if (function_exists('icl_object_id')) {

+		if ($lang_code) {

+			$where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' ";

+		}

+	}

+	########### WPML ###########

+	/**

+	 * Filter widget listing where clause string part that is being used for query.

+	 *

+	 * @since 1.0.0

+	 * @param string $where Where clause string.

+	 * @param string $post_type Post type.

+	 */

+	$where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);

+	$where = $where != '' ? " WHERE 1=1 " . $where : '';

+

+	$groupby = " GROUP BY $wpdb->posts.ID ";

+	/**

+	 * Filter widget listing groupby clause string part that is being used for query.

+	 *

+	 * @since 1.0.0

+	 * @param string $groupby Group by clause string.

+	 * @param string $post_type Post type.

+	 */

+	$groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);

+

+	if ($count_only) {

+		$sql = "SELECT COUNT(" . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . "

 			" . $join . "

 			" . $where;

-        $rows = (int)$wpdb->get_var($sql);

-    } else {

-        $orderby = geodir_widget_listings_get_order($query_args);

-        /**

-         * Filter widget listing orderby clause string part that is being used for query.

-         *

-         * @since 1.0.0

-         * @param string $orderby Order by clause string.

-         * @param string $table Table name.

-         * @param string $post_type Post type.

-         */

-        $orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);

-        $orderby .= $wpdb->posts . ".post_title ASC";

-        $orderby = $orderby != '' ? " ORDER BY " . $orderby : '';

-

-        $limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5;

-        /**

-         * Filter widget listing limit that is being used for query.

-         *

-         * @since 1.0.0

-         * @param int $limit Query results limit.

-         * @param string $post_type Post type.

-         */

-        $limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);

-

-        $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1;

-        if ( !$page )

-            $page = 1;

-

-        $limit = (int)$limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int)$limit ) . ", " . (int)$limit : "";

-

-        $sql = "SELECT SQL_CALC_FOUND_ROWS " . $fields . " FROM " . $wpdb->posts . "

+		$rows = (int)$wpdb->get_var($sql);

+	} else {

+		$orderby = geodir_widget_listings_get_order($query_args);

+		/**

+		 * Filter widget listing orderby clause string part that is being used for query.

+		 *

+		 * @since 1.0.0

+		 * @param string $orderby Order by clause string.

+		 * @param string $table Table name.

+		 * @param string $post_type Post type.

+		 */

+		$orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);

+		$orderby .= $wpdb->posts . ".post_title ASC";

+		$orderby = $orderby != '' ? " ORDER BY " . $orderby : '';

+

+		$limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5;

+		/**

+		 * Filter widget listing limit that is being used for query.

+		 *

+		 * @since 1.0.0

+		 * @param int $limit Query results limit.

+		 * @param string $post_type Post type.

+		 */

+		$limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);

+

+		$page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1;

+		if ( !$page )

+			$page = 1;

+

+		$limit = (int)$limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int)$limit ) . ", " . (int)$limit : "";

+

+		$sql = "SELECT SQL_CALC_FOUND_ROWS " . $fields . " FROM " . $wpdb->posts . "

 			" . $join . "

 			" . $where . "

 			" . $groupby . "

 			" . $orderby . "

 			" . $limit;

-        $rows = $wpdb->get_results($sql);

-    }

+		$rows = $wpdb->get_results($sql);

+	}

 

-    unset($GLOBALS['gd_query_args_widgets']);

-    unset($gd_query_args_widgets);

+	unset($GLOBALS['gd_query_args_widgets']);

+	unset($gd_query_args_widgets);

 

-    return $rows;

+	return $rows;

 }

 

 /**

@@ -1942,21 +1942,21 @@ 
  */

 function geodir_function_widget_listings_fields($fields)

 {

-    global $wpdb, $plugin_prefix, $gd_query_args_widgets;

+	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

-    $query_args = $gd_query_args_widgets;

-    if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

-        return $fields;

-    }

-    $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

-    $table = $plugin_prefix . $post_type . '_detail';

+	$query_args = $gd_query_args_widgets;

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

+		return $fields;

+	}

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

+	$table = $plugin_prefix . $post_type . '_detail';

 

-    /*

+	/*

 	if ( $post_type == 'gd_event' && defined( 'EVENT_SCHEDULE' ) ) {

 		$fields .= $fields != '' ? ", " . EVENT_SCHEDULE . ".*" : EVENT_SCHEDULE . ".*";

 	}

 	*/

-    return $fields;

+	return $fields;

 }

 

 /**

@@ -1971,34 +1971,34 @@ 
  */

 function geodir_function_widget_listings_join($join)

 {

-    global $wpdb, $plugin_prefix, $gd_query_args_widgets;

+	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

-    $query_args = $gd_query_args_widgets;

-    if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

-        return $where;

-    }

+	$query_args = $gd_query_args_widgets;

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

+		return $where;

+	}

 

-    $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

-    $table = $plugin_prefix . $post_type . '_detail';

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

+	$table = $plugin_prefix . $post_type . '_detail';

 

-    if (!empty($query_args['with_pics_only'])) {

-        $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

-    }

+	if (!empty($query_args['with_pics_only'])) {

+		$join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

+	}

 

-    /*

+	/*

 	if ( $post_type == 'gd_event' && defined( 'EVENT_SCHEDULE' ) ) {

 		$join .= " INNER JOIN " . EVENT_SCHEDULE ." ON (" . EVENT_SCHEDULE .".event_id = " . $wpdb->posts . ".ID)";

 	}

 	*/

 

-    if (!empty($query_args['tax_query'])) {

-        $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID');

-        if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {

-            $join .= $tax_queries['join'];

-        }

-    }

+	if (!empty($query_args['tax_query'])) {

+		$tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID');

+		if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {

+			$join .= $tax_queries['join'];

+		}

+	}

 

-    return $join;

+	return $join;

 }

 

 /**

@@ -2013,54 +2013,54 @@ 
  */

 function geodir_function_widget_listings_where($where)

 {

-    global $wpdb, $plugin_prefix, $gd_query_args_widgets;

-

-    $query_args = $gd_query_args_widgets;

-    if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

-        return $where;

-    }

-    $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

-    $table = $plugin_prefix . $post_type . '_detail';

-

-    if (!empty($query_args)) {

-        if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {

-            $where = geodir_default_location_where($where, $table);

-        }

+	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

-        if (!empty($query_args['post_author'])) {

-            $where .= " AND " . $wpdb->posts . ".post_author = " . (int)$query_args['post_author'];

-        }

-        

-        if (!empty($query_args['show_featured_only'])) {

-            $where .= " AND " . $table . ".is_featured = '1'";

-        }

+	$query_args = $gd_query_args_widgets;

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

+		return $where;

+	}

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

+	$table = $plugin_prefix . $post_type . '_detail';

 

-        if (!empty($query_args['show_special_only'])) {

-            $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

-        }

+	if (!empty($query_args)) {

+		if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {

+			$where = geodir_default_location_where($where, $table);

+		}

 

-        if (!empty($query_args['with_pics_only'])) {

-            $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL ";

-        }

+		if (!empty($query_args['post_author'])) {

+			$where .= " AND " . $wpdb->posts . ".post_author = " . (int)$query_args['post_author'];

+		}

+        

+		if (!empty($query_args['show_featured_only'])) {

+			$where .= " AND " . $table . ".is_featured = '1'";

+		}

 

-        if (!empty($query_args['featured_image_only'])) {

-            $where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' ";

-        }

+		if (!empty($query_args['show_special_only'])) {

+			$where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

+		}

 

-        if (!empty($query_args['with_videos_only'])) {

-            $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

-        }

+		if (!empty($query_args['with_pics_only'])) {

+			$where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL ";

+		}

 

-        if (!empty($query_args['tax_query'])) {

-            $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID');

+		if (!empty($query_args['featured_image_only'])) {

+			$where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' ";

+		}

 

-            if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {

-                $where .= $tax_queries['where'];

-            }

-        }

-    }

+		if (!empty($query_args['with_videos_only'])) {

+			$where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

+		}

+

+		if (!empty($query_args['tax_query'])) {

+			$tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID');

 

-    return $where;

+			if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {

+				$where .= $tax_queries['where'];

+			}

+		}

+	}

+

+	return $where;

 }

 

 /**

@@ -2075,23 +2075,23 @@ 
  */

 function geodir_function_widget_listings_orderby($orderby)

 {

-    global $wpdb, $plugin_prefix, $gd_query_args_widgets;

+	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

-    $query_args = $gd_query_args_widgets;

-    if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

-        return $orderby;

-    }

+	$query_args = $gd_query_args_widgets;

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

+		return $orderby;

+	}

 

-    $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

-    $table = $plugin_prefix . $post_type . '_detail';

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

+	$table = $plugin_prefix . $post_type . '_detail';

 

-    /*

+	/*

 	if ( $post_type == 'gd_event' && defined( 'EVENT_SCHEDULE' ) ) {

 		$orderby .= EVENT_SCHEDULE . ".event_date ASC, " . EVENT_SCHEDULE . ".event_starttime ASC , " . $table . ".is_featured ASC, ";

 	}

 	*/

 

-    return $orderby;

+	return $orderby;

 }

 

 /**

@@ -2106,18 +2106,18 @@ 
  */

 function geodir_function_widget_listings_limit($limit)

 {

-    global $wpdb, $plugin_prefix, $gd_query_args_widgets;

+	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

-    $query_args = $gd_query_args_widgets;

-    if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

-        return $limit;

-    }

+	$query_args = $gd_query_args_widgets;

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

+		return $limit;

+	}

 

-    if (!empty($query_args) && !empty($query_args['posts_per_page'])) {

-        $limit = (int)$query_args['posts_per_page'];

-    }

+	if (!empty($query_args) && !empty($query_args['posts_per_page'])) {

+		$limit = (int)$query_args['posts_per_page'];

+	}

 

-    return $limit;

+	return $limit;

 }

 

 /**

@@ -2131,24 +2131,24 @@ 
  */

 function geodir_media_image_large_width($default = 800, $params = '')

 {

-    $large_size_w = get_option('large_size_w');

-    $large_size_w = $large_size_w > 0 ? $large_size_w : $default;

-    $large_size_w = absint($large_size_w);

-

-    if (!get_option('geodir_use_wp_media_large_size')) {

-        $large_size_w = 800;

-    }

-

-    /**

-     * Filter large image width.

-     *

-     * @since 1.0.0

-     * @param int $large_size_w Large image width.

-     * @param int $default Default width.

-     * @param string|array $params Image parameters.

-     */

-    $large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);

-    return $large_size_w;

+	$large_size_w = get_option('large_size_w');

+	$large_size_w = $large_size_w > 0 ? $large_size_w : $default;

+	$large_size_w = absint($large_size_w);

+

+	if (!get_option('geodir_use_wp_media_large_size')) {

+		$large_size_w = 800;

+	}

+

+	/**

+	 * Filter large image width.

+	 *

+	 * @since 1.0.0

+	 * @param int $large_size_w Large image width.

+	 * @param int $default Default width.

+	 * @param string|array $params Image parameters.

+	 */

+	$large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);

+	return $large_size_w;

 }

 

 /**

@@ -2162,25 +2162,25 @@ 
  */

 function geodir_media_image_large_height($default = 800, $params = '')

 {

-    $large_size_h = get_option('large_size_h');

-    $large_size_h = $large_size_h > 0 ? $large_size_h : $default;

-    $large_size_h = absint($large_size_h);

-

-    if (!get_option('geodir_use_wp_media_large_size')) {

-        $large_size_h = 800;

-    }

-

-    /**

-     * Filter large image height.

-     *

-     * @since 1.0.0

-     * @param int $large_size_h Large image height.

-     * @param int $default Default height.

-     * @param string|array $params Image parameters.

-     */

-    $large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);

+	$large_size_h = get_option('large_size_h');

+	$large_size_h = $large_size_h > 0 ? $large_size_h : $default;

+	$large_size_h = absint($large_size_h);

 

-    return $large_size_h;

+	if (!get_option('geodir_use_wp_media_large_size')) {

+		$large_size_h = 800;

+	}

+

+	/**

+	 * Filter large image height.

+	 *

+	 * @since 1.0.0

+	 * @param int $large_size_h Large image height.

+	 * @param int $default Default height.

+	 * @param string|array $params Image parameters.

+	 */

+	$large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);

+

+	return $large_size_h;

 }

 

 /**

@@ -2195,25 +2195,25 @@ 
  */

 function geodir_sanitize_location_name($type, $name, $translate = true)

 {

-    if ($name == '') {

-        return NULL;

-    }

-

-    $type = $type == 'gd_country' ? 'country' : $type;

-    $type = $type == 'gd_region' ? 'region' : $type;

-    $type = $type == 'gd_city' ? 'city' : $type;

-

-    $return = $name;

-    if (function_exists('get_actual_location_name')) {

-        $return = get_actual_location_name($type, $name, $translate);

-    } else {

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

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

-        $return = geodir_ucwords($return);

-        $return = $translate ? __($return, 'geodirectory') : $return;

-    }

-

-    return $return;

+	if ($name == '') {

+		return NULL;

+	}

+

+	$type = $type == 'gd_country' ? 'country' : $type;

+	$type = $type == 'gd_region' ? 'region' : $type;

+	$type = $type == 'gd_city' ? 'city' : $type;

+

+	$return = $name;

+	if (function_exists('get_actual_location_name')) {

+		$return = get_actual_location_name($type, $name, $translate);

+	} else {

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

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

+		$return = geodir_ucwords($return);

+		$return = $translate ? __($return, 'geodirectory') : $return;

+	}

+

+	return $return;

 }

 

 

@@ -2227,14 +2227,14 @@ 
 function geodir_comments_number($number)

 {

 

-    if ($number > 1) {

-        $output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));

-    } elseif ($number == 0 || $number == '') {

-        $output = __('No Reviews', 'geodirectory');

-    } else { // must be one

-        $output = __('1 Review', 'geodirectory');

-    }

-    echo $output;

+	if ($number > 1) {

+		$output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));

+	} elseif ($number == 0 || $number == '') {

+		$output = __('No Reviews', 'geodirectory');

+	} else { // must be one

+		$output = __('1 Review', 'geodirectory');

+	}

+	echo $output;

 }

 

 /**

@@ -2247,23 +2247,23 @@ 
  */

 function is_page_geodir_home()

 {

-    global $wpdb;

-    $cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());

-    if (function_exists('geodir_location_geo_home_link')) {

-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

-    }

-    $home_url = home_url('', 'http');

-    if (function_exists('geodir_location_geo_home_link')) {

-        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

-    }

-    $home_url = str_replace("www.", "", $home_url);

-    if ( (strpos($home_url, $cur_url) !== false || strpos($home_url . '/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front')==get_option('geodir_home_page')) ) {

-        return true;

-    }elseif(get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front')==get_option('geodir_home_page')){

-        return true;

-    } else {

-        return false;

-    }

+	global $wpdb;

+	$cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());

+	if (function_exists('geodir_location_geo_home_link')) {

+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+	}

+	$home_url = home_url('', 'http');

+	if (function_exists('geodir_location_geo_home_link')) {

+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+	}

+	$home_url = str_replace("www.", "", $home_url);

+	if ( (strpos($home_url, $cur_url) !== false || strpos($home_url . '/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front')==get_option('geodir_home_page')) ) {

+		return true;

+	}elseif(get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front')==get_option('geodir_home_page')){

+		return true;

+	} else {

+		return false;

+	}

 

 }

 

@@ -2279,13 +2279,13 @@ 
  */

 function geodir_wpseo_homepage_canonical($url)

 {

-    global $post;

+	global $post;

 

-    if (is_page_geodir_home()) {

-        return home_url();

-    }

+	if (is_page_geodir_home()) {

+		return home_url();

+	}

 

-    return $url;

+	return $url;

 }

 

 add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);

@@ -2302,16 +2302,16 @@ 
  */

 function geodir_googlemap_script_extra_details_page($extra)

 {

-    global $post;

-    $add_google_places_api = false;

-    if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

-        $add_google_places_api = true;

-    }

-    if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {

-        $extra .= "&amp;libraries=places";

-    }

-

-    return $extra;

+	global $post;

+	$add_google_places_api = false;

+	if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

+		$add_google_places_api = true;

+	}

+	if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {

+		$extra .= "&amp;libraries=places";

+	}

+

+	return $extra;

 }

 

 add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);

@@ -2331,91 +2331,91 @@ 
  */

 function geodir_popular_post_category_output($args = '', $instance = '')

 {

-    // prints the widget

-    global $wpdb, $plugin_prefix, $geodir_post_category_str;

-    extract($args, EXTR_SKIP);

+	// prints the widget

+	global $wpdb, $plugin_prefix, $geodir_post_category_str;

+	extract($args, EXTR_SKIP);

 

-    echo $before_widget;

+	echo $before_widget;

 

-    /** This filter is documented in geodirectory_widgets.php */

-    $title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+	/** This filter is documented in geodirectory_widgets.php */

+	$title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 

-    $gd_post_type = geodir_get_current_posttype();

+	$gd_post_type = geodir_get_current_posttype();

 

-    $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int)$instance['category_limit'] : 15;

-    $default_post_type = !empty($gd_post_type) ? $gd_post_type : (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type']) ? $instance['default_post_type'] : '');

+	$category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int)$instance['category_limit'] : 15;

+	$default_post_type = !empty($gd_post_type) ? $gd_post_type : (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type']) ? $instance['default_post_type'] : '');

 

-    $taxonomy = array();

-    if (!empty($gd_post_type)) {

-        $taxonomy[] = $gd_post_type . "category";

-    } else {

-        $taxonomy = geodir_get_taxonomies($gd_post_type);

-    }

+	$taxonomy = array();

+	if (!empty($gd_post_type)) {

+		$taxonomy[] = $gd_post_type . "category";

+	} else {

+		$taxonomy = geodir_get_taxonomies($gd_post_type);

+	}

 

-    $terms = get_terms($taxonomy);

-    $a_terms = array();

-    $b_terms = array();

+	$terms = get_terms($taxonomy);

+	$a_terms = array();

+	$b_terms = array();

 

-    foreach ($terms as $term) {

-        if ($term->count > 0) {

-            $a_terms[$term->taxonomy][] = $term;

-        }

-    }

+	foreach ($terms as $term) {

+		if ($term->count > 0) {

+			$a_terms[$term->taxonomy][] = $term;

+		}

+	}

 

-    if (!empty($a_terms)) {

-        foreach ($a_terms as $b_key => $b_val) {

-            $b_terms[$b_key] = geodir_sort_terms($b_val, 'count');

-        }

+	if (!empty($a_terms)) {

+		foreach ($a_terms as $b_key => $b_val) {

+			$b_terms[$b_key] = geodir_sort_terms($b_val, 'count');

+		}

 

-        $default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type . 'category']) ? $default_post_type . 'category' : '';

-

-        $tax_change_output = '';

-        if (count($b_terms) > 1) {

-            $tax_change_output .= "<select data-limit='$category_limit' class='geodir-cat-list-tax'  onchange='geodir_get_post_term(this);'>";

-            foreach ($b_terms as $key => $val) {

-                $ptype = get_post_type_object(str_replace("category", "", $key));

-                $cpt_name = __($ptype->labels->singular_name, 'geodirectory');

-                $tax_change_output .= "<option value='$key' ". selected($key, $default_taxonomy, false) .">" . sprintf(__('%s Categories', 'geodirectory'),$cpt_name) . "</option>";

-            }

-            $tax_change_output .= "</select>";

-        }

+		$default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type . 'category']) ? $default_post_type . 'category' : '';

+

+		$tax_change_output = '';

+		if (count($b_terms) > 1) {

+			$tax_change_output .= "<select data-limit='$category_limit' class='geodir-cat-list-tax'  onchange='geodir_get_post_term(this);'>";

+			foreach ($b_terms as $key => $val) {

+				$ptype = get_post_type_object(str_replace("category", "", $key));

+				$cpt_name = __($ptype->labels->singular_name, 'geodirectory');

+				$tax_change_output .= "<option value='$key' ". selected($key, $default_taxonomy, false) .">" . sprintf(__('%s Categories', 'geodirectory'),$cpt_name) . "</option>";

+			}

+			$tax_change_output .= "</select>";

+		}

 

-        if (!empty($b_terms)) {

-            $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms);// get the first array

-            global $cat_count;//make global so we can change via function

-            $cat_count = 0;

-            ?>

+		if (!empty($b_terms)) {

+			$terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms);// get the first array

+			global $cat_count;//make global so we can change via function

+			$cat_count = 0;

+			?>

             <div class="geodir-category-list-in clearfix">

                 <div class="geodir-cat-list clearfix">

                     <?php

-                    echo $before_title . __($title) . $after_title;

+					echo $before_title . __($title) . $after_title;

 

-                    echo $tax_change_output;

+					echo $tax_change_output;

 

-                    echo '<ul class="geodir-popular-cat-list">';

+					echo '<ul class="geodir-popular-cat-list">';

 

-                    geodir_helper_cat_list_output($terms, $category_limit);

+					geodir_helper_cat_list_output($terms, $category_limit);

 

-                    echo '</ul>';

-                    ?>

+					echo '</ul>';

+					?>

                 </div>

                 <?php

-                $hide = '';

-                if ($cat_count < $category_limit) {

-                    $hide = 'style="display:none;"';

-                }

-                echo "<div class='geodir-cat-list-more' $hide >";

-                echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __('More Categories', 'geodirectory') . '</a>';

-                echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __('Less Categories', 'geodirectory') . '</a>';

-                echo "</div>";

-                /* add scripts */

-                add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);

-                ?>

+				$hide = '';

+				if ($cat_count < $category_limit) {

+					$hide = 'style="display:none;"';

+				}

+				echo "<div class='geodir-cat-list-more' $hide >";

+				echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __('More Categories', 'geodirectory') . '</a>';

+				echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __('Less Categories', 'geodirectory') . '</a>';

+				echo "</div>";

+				/* add scripts */

+				add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);

+				?>

             </div>

         <?php

-        }

-    }

-    echo $after_widget;

+		}

+	}

+	echo $after_widget;

 }

 

 /**

@@ -2429,38 +2429,38 @@ 
  */

 function geodir_helper_cat_list_output($terms, $category_limit)

 {

-    global $geodir_post_category_str, $cat_count;

-    $term_icons = geodir_get_term_icon();

+	global $geodir_post_category_str, $cat_count;

+	$term_icons = geodir_get_term_icon();

 

-    $geodir_post_category_str = array();

+	$geodir_post_category_str = array();

 

 

-    foreach ($terms as $cat) {

-        $post_type = str_replace("category", "", $cat->taxonomy);

-        $term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : '';

+	foreach ($terms as $cat) {

+		$post_type = str_replace("category", "", $cat->taxonomy);

+		$term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : '';

 

-        $cat_count++;

+		$cat_count++;

 

-        $geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);

+		$geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);

 

-        $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show';

-        $total_post = $cat->count;

+		$class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show';

+		$total_post = $cat->count;

 

-        $term_link = get_term_link( $cat, $cat->taxonomy );

-        /**

-         * Filer the category term link.

-         *

-         * @since 1.4.5

-         * @param string $term_link The term permalink.

-         * @param int    $cat->term_id The term id.

-         * @param string $post_type Wordpress post type.

-         */

-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type );

+		$term_link = get_term_link( $cat, $cat->taxonomy );

+		/**

+		 * Filer the category term link.

+		 *

+		 * @since 1.4.5

+		 * @param string $term_link The term permalink.

+		 * @param int    $cat->term_id The term id.

+		 * @param string $post_type Wordpress post type.

+		 */

+		$term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type );

 

-        echo '<li class="' . $class_row . '"><a href="' . $term_link . '">';

-        echo '<img alt="' . esc_attr($cat->name) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';

-        echo '</a></li>';

-    }

+		echo '<li class="' . $class_row . '"><a href="' . $term_link . '">';

+		echo '<img alt="' . esc_attr($cat->name) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';

+		echo '</a></li>';

+	}

 }

 

 /**

@@ -2474,108 +2474,108 @@ 
  */

 function geodir_listing_slider_widget_output($args = '', $instance = '')

 {

-    // prints the widget

-    extract($args, EXTR_SKIP);

-

-    echo $before_widget;

-

-    /** This filter is documented in geodirectory_widgets.php */

-    $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

-    /**

-     * Filter the widget post type.

-     *

-     * @since 1.0.0

-     * @param string $instance['post_type'] Post type of listing.

-     */

-    $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);

-    /**

-     * Filter the widget's term.

-     *

-     * @since 1.0.0

-     * @param string $instance['category'] Filter by term. Can be any valid term.

-     */

-    $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);

-    /**

-     * Filter the widget listings limit.

-     *

-     * @since 1.0.0

-     * @param string $instance['post_number'] Number of listings to display.

-     */

-    $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);

-    /**

-     * Filter the widget listings limit shown at one time.

-     *

-     * @since 1.5.0

-     * @param string $instance['max_show'] Number of listings to display on screen.

-     */

-    $max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);

-    /**

-     * Filter the widget slide width.

-     *

-     * @since 1.5.0

-     * @param string $instance['slide_width'] Width of the slides shown.

-     */

-    $slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);

-    /**

-     * Filter widget's "show title" value.

-     *

-     * @since 1.0.0

-     * @param string|bool $instance['show_title'] Do you want to display title? Can be 1 or 0.

-     */

-    $show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);

-    /**

-     * Filter widget's "slideshow" value.

-     *

-     * @since 1.0.0

-     * @param int $instance['slideshow'] Setup a slideshow for the slider to animate automatically.

-     */

-    $slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);

-    /**

-     * Filter widget's "animationLoop" value.

-     *

-     * @since 1.0.0

-     * @param int $instance['animationLoop'] Gives the slider a seamless infinite loop.

-     */

-    $animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);

-    /**

-     * Filter widget's "directionNav" value.

-     *

-     * @since 1.0.0

-     * @param int $instance['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0.

-     */

-    $directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);

-    /**

-     * Filter widget's "slideshowSpeed" value.

-     *

-     * @since 1.0.0

-     * @param int $instance['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds.

-     */

-    $slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);

-    /**

-     * Filter widget's "animationSpeed" value.

-     *

-     * @since 1.0.0

-     * @param int $instance['animationSpeed'] Set the speed of animations, in milliseconds.

-     */

-    $animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);

-    /**

-     * Filter widget's "animation" value.

-     *

-     * @since 1.0.0

-     * @param string $instance['animation'] Controls the animation type, "fade" or "slide".

-     */

-    $animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);

-    /**

-     * Filter widget's "list_sort" type.

-     *

-     * @since 1.0.0

-     * @param string $instance['list_sort'] Listing sort by type.

-     */

-    $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);

-    $show_featured_only = !empty($instance['show_featured_only']) ? 1 : NULL;

-

-    wp_enqueue_script('geodirectory-jquery-flexslider-js');

-    ?>

+	// prints the widget

+	extract($args, EXTR_SKIP);

+

+	echo $before_widget;

+

+	/** This filter is documented in geodirectory_widgets.php */

+	$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+	/**

+	 * Filter the widget post type.

+	 *

+	 * @since 1.0.0

+	 * @param string $instance['post_type'] Post type of listing.

+	 */

+	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);

+	/**

+	 * Filter the widget's term.

+	 *

+	 * @since 1.0.0

+	 * @param string $instance['category'] Filter by term. Can be any valid term.

+	 */

+	$category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);

+	/**

+	 * Filter the widget listings limit.

+	 *

+	 * @since 1.0.0

+	 * @param string $instance['post_number'] Number of listings to display.

+	 */

+	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);

+	/**

+	 * Filter the widget listings limit shown at one time.

+	 *

+	 * @since 1.5.0

+	 * @param string $instance['max_show'] Number of listings to display on screen.

+	 */

+	$max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);

+	/**

+	 * Filter the widget slide width.

+	 *

+	 * @since 1.5.0

+	 * @param string $instance['slide_width'] Width of the slides shown.

+	 */

+	$slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);

+	/**

+	 * Filter widget's "show title" value.

+	 *

+	 * @since 1.0.0

+	 * @param string|bool $instance['show_title'] Do you want to display title? Can be 1 or 0.

+	 */

+	$show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);

+	/**

+	 * Filter widget's "slideshow" value.

+	 *

+	 * @since 1.0.0

+	 * @param int $instance['slideshow'] Setup a slideshow for the slider to animate automatically.

+	 */

+	$slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);

+	/**

+	 * Filter widget's "animationLoop" value.

+	 *

+	 * @since 1.0.0

+	 * @param int $instance['animationLoop'] Gives the slider a seamless infinite loop.

+	 */

+	$animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);

+	/**

+	 * Filter widget's "directionNav" value.

+	 *

+	 * @since 1.0.0

+	 * @param int $instance['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0.

+	 */

+	$directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);

+	/**

+	 * Filter widget's "slideshowSpeed" value.

+	 *

+	 * @since 1.0.0

+	 * @param int $instance['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds.

+	 */

+	$slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);

+	/**

+	 * Filter widget's "animationSpeed" value.

+	 *

+	 * @since 1.0.0

+	 * @param int $instance['animationSpeed'] Set the speed of animations, in milliseconds.

+	 */

+	$animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);

+	/**

+	 * Filter widget's "animation" value.

+	 *

+	 * @since 1.0.0

+	 * @param string $instance['animation'] Controls the animation type, "fade" or "slide".

+	 */

+	$animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);

+	/**

+	 * Filter widget's "list_sort" type.

+	 *

+	 * @since 1.0.0

+	 * @param string $instance['list_sort'] Listing sort by type.

+	 */

+	$list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);

+	$show_featured_only = !empty($instance['show_featured_only']) ? 1 : NULL;

+

+	wp_enqueue_script('geodirectory-jquery-flexslider-js');

+	?>

     <script type="text/javascript">

         jQuery(window).load(function () {

             jQuery('#geodir_widget_carousel').flexslider({

@@ -2616,73 +2616,73 @@ 
         });

     </script>

     <?php

-    $query_args = array(

-        'posts_per_page' => $post_number,

-        'is_geodir_loop' => true,

-        'post_type' => $post_type,

-        'order_by' => $list_sort

-    );

-    if ($show_featured_only) {

-        $query_args['show_featured_only'] = 1;

-    }

-

-    if ($category != 0 || $category != '') {

-        $category_taxonomy = geodir_get_taxonomies($post_type);

-        $tax_query = array(

-            'taxonomy' => $category_taxonomy[0],

-            'field' => 'id',

-            'terms' => $category

-        );

-

-        $query_args['tax_query'] = array($tax_query);

-    }

-

-    // we want listings with featured image only

-    $query_args['featured_image_only'] = 1;

-

-    if ($post_type == 'gd_event') {

-        $query_args['gedir_event_listing_filter'] = 'upcoming';

-    }// show only upcomming events

-

-    $widget_listings = geodir_get_widget_listings($query_args);

-    if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {

-        if ($title) {

-            echo $before_title . $title . $after_title;

-        }

+	$query_args = array(

+		'posts_per_page' => $post_number,

+		'is_geodir_loop' => true,

+		'post_type' => $post_type,

+		'order_by' => $list_sort

+	);

+	if ($show_featured_only) {

+		$query_args['show_featured_only'] = 1;

+	}

 

-        global $post;

+	if ($category != 0 || $category != '') {

+		$category_taxonomy = geodir_get_taxonomies($post_type);

+		$tax_query = array(

+			'taxonomy' => $category_taxonomy[0],

+			'field' => 'id',

+			'terms' => $category

+		);

 

-        $current_post = $post;// keep current post info

+		$query_args['tax_query'] = array($tax_query);

+	}

 

-        $widget_main_slides = '';

-        $nav_slides = '';

-        $widget_slides = 0;

+	// we want listings with featured image only

+	$query_args['featured_image_only'] = 1;

 

-        foreach ($widget_listings as $widget_listing) {

-            global $gd_widget_listing_type;

-            $post = $widget_listing;

-            $widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

+	if ($post_type == 'gd_event') {

+		$query_args['gedir_event_listing_filter'] = 'upcoming';

+	}// show only upcomming events

 

-            if (!empty($widget_image)) {

-                if ($widget_image->height >= 200) {

-                    $widget_spacer_height = 0;

-                } else {

-                    $widget_spacer_height = ((200 - $widget_image->height) / 2);

-                }

+	$widget_listings = geodir_get_widget_listings($query_args);

+	if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {

+		if ($title) {

+			echo $before_title . $title . $after_title;

+		}

 

-                $widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:' . $widget_spacer_height . 'px !important;margin:0 auto;" width="100" />';

+		global $post;

 

-                $title = '';

-                if ($show_title) {

-                    $title = '<div class="geodir-slider-title"><a href="' . get_permalink($post->ID) . '">' . get_the_title($post->ID) . '</a></div>';

-                }

+		$current_post = $post;// keep current post info

 

-                $widget_main_slides .= $title . '<img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></li>';

-                $nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

-                $widget_slides++;

-            }

-        }

-        ?>

+		$widget_main_slides = '';

+		$nav_slides = '';

+		$widget_slides = 0;

+

+		foreach ($widget_listings as $widget_listing) {

+			global $gd_widget_listing_type;

+			$post = $widget_listing;

+			$widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

+

+			if (!empty($widget_image)) {

+				if ($widget_image->height >= 200) {

+					$widget_spacer_height = 0;

+				} else {

+					$widget_spacer_height = ((200 - $widget_image->height) / 2);

+				}

+

+				$widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:' . $widget_spacer_height . 'px !important;margin:0 auto;" width="100" />';

+

+				$title = '';

+				if ($show_title) {

+					$title = '<div class="geodir-slider-title"><a href="' . get_permalink($post->ID) . '">' . get_the_title($post->ID) . '</a></div>';

+				}

+

+				$widget_main_slides .= $title . '<img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></li>';

+				$nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

+				$widget_slides++;

+			}

+		}

+		?>

         <div class="flex-container" style="min-height:200px;">

             <div class="geodir-listing-flex-loader"><i class="fa fa-refresh fa-spin"></i></div>

             <div id="geodir_widget_slider" class="geodir_flexslider">

@@ -2695,10 +2695,10 @@ 
             <?php } ?>

         </div>

         <?php

-        $GLOBALS['post'] = $current_post;

-        setup_postdata($current_post);

-    }

-    echo $after_widget;

+		$GLOBALS['post'] = $current_post;

+		setup_postdata($current_post);

+	}

+	echo $after_widget;

 }

 

 

@@ -2713,68 +2713,68 @@ 
  */

 function geodir_loginwidget_output($args = '', $instance = '')

 {

-    //print_r($args);

-    //print_r($instance);

-    // prints the widget

-    extract($args, EXTR_SKIP);

+	//print_r($args);

+	//print_r($instance);

+	// prints the widget

+	extract($args, EXTR_SKIP);

 

-    /** This filter is documented in geodirectory_widgets.php */

-    $title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+	/** This filter is documented in geodirectory_widgets.php */

+	$title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 

-    echo $before_widget;

-    echo $before_title . $title . $after_title;

+	echo $before_widget;

+	echo $before_title . $title . $after_title;

 

-    if (is_user_logged_in()) {

-        global $current_user;

+	if (is_user_logged_in()) {

+		global $current_user;

 

-        $login_url = geodir_login_url();

-        $add_listurl = get_permalink(geodir_add_listing_page_id());

-        $add_listurl = geodir_getlink($add_listurl, array('listing_type' => 'gd_place'));

-        $author_link = get_author_posts_url($current_user->data->ID);

-        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);

+		$login_url = geodir_login_url();

+		$add_listurl = get_permalink(geodir_add_listing_page_id());

+		$add_listurl = geodir_getlink($add_listurl, array('listing_type' => 'gd_place'));

+		$author_link = get_author_posts_url($current_user->data->ID);

+		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);

 

-        echo '<ul class="geodir-loginbox-list">';

-        ob_start();

-        ?>

+		echo '<ul class="geodir-loginbox-list">';

+		ob_start();

+		?>

         <li><a class="signin"

                href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>

         <?php

-        $post_types = geodir_get_posttypes('object');

-        $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');

-        $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

+		$post_types = geodir_get_posttypes('object');

+		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');

+		$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

 

-        if (!empty($show_add_listing_post_types_main_nav)) {

-            $addlisting_links = '';

-            foreach ($post_types as $key => $postobj) {

+		if (!empty($show_add_listing_post_types_main_nav)) {

+			$addlisting_links = '';

+			foreach ($post_types as $key => $postobj) {

 

-                if (in_array($key, $show_add_listing_post_types_main_nav)) {

+				if (in_array($key, $show_add_listing_post_types_main_nav)) {

 

-                    if ($add_link = geodir_get_addlisting_link($key)) {

+					if ($add_link = geodir_get_addlisting_link($key)) {

 

-                        $name = $postobj->labels->name;

+						$name = $postobj->labels->name;

 

-                        $selected = '';

-                        if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing'))

-                            $selected = 'selected="selected"';

+						$selected = '';

+						if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing'))

+							$selected = 'selected="selected"';

 

-                        /**

-                         * Filter add listing link.

-                         *

-                         * @since 1.0.0

-                         * @param string $add_link Add listing link.

-                         * @param string $key Add listing array key.

-                         * @param int $current_user->ID Current user ID.

-                         */

-                        $add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);

+						/**

+						 * Filter add listing link.

+						 *

+						 * @since 1.0.0

+						 * @param string $add_link Add listing link.

+						 * @param string $key Add listing array key.

+						 * @param int $current_user->ID Current user ID.

+						 */

+						$add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);

 

-                        $addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';

+						$addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';

 

-                    }

-                }

+					}

+				}

 

-            }

+			}

 

-            if ($addlisting_links != '') { ?>

+			if ($addlisting_links != '') { ?>

 

                 <li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value"

                             option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false"

@@ -2783,42 +2783,42 @@ 
                         <?php echo $addlisting_links; ?>

                     </select></li> <?php

 

-            }

+			}

 

-        }

-        // My Favourites in Dashboard

-        $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');

-        $user_favourite = geodir_user_favourite_listing_count();

-

-        if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {

-            $favourite_links = '';

-

-            foreach ($post_types as $key => $postobj) {

-                if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {

-                    $name = $postobj->labels->name;

-                    $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);

-

-                    $selected = '';

-

-                    if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {

-                        $selected = 'selected="selected"';

-                    }

-                    /**

-                     * Filter favorite listing link.

-                     *

-                     * @since 1.0.0

-                     * @param string $post_type_link Favorite listing link.

-                     * @param string $key Favorite listing array key.

-                     * @param int $current_user->ID Current user ID.

-                     */

-                    $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);

-

-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';

-                }

-            }

-

-            if ($favourite_links != '') {

-                ?>

+		}

+		// My Favourites in Dashboard

+		$show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');

+		$user_favourite = geodir_user_favourite_listing_count();

+

+		if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {

+			$favourite_links = '';

+

+			foreach ($post_types as $key => $postobj) {

+				if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {

+					$name = $postobj->labels->name;

+					$post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);

+

+					$selected = '';

+

+					if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {

+						$selected = 'selected="selected"';

+					}

+					/**

+					 * Filter favorite listing link.

+					 *

+					 * @since 1.0.0

+					 * @param string $post_type_link Favorite listing link.

+					 * @param string $key Favorite listing array key.

+					 * @param int $current_user->ID Current user ID.

+					 */

+					$post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);

+

+					$favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';

+				}

+			}

+

+			if ($favourite_links != '') {

+				?>

                 <li>

                     <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value"

                             option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false"

@@ -2828,42 +2828,42 @@ 
                     </select>

                 </li>

             <?php

-            }

-        }

-

+			}

+		}

 

-        $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');

-        $user_listing = geodir_user_post_listing_count();

 

-        if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {

-            $listing_links = '';

+		$show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');

+		$user_listing = geodir_user_post_listing_count();

 

-            foreach ($post_types as $key => $postobj) {

-                if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {

-                    $name = $postobj->labels->name;

-                    $listing_link = geodir_getlink($author_link, array('stype' => $key), false);

+		if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {

+			$listing_links = '';

 

-                    $selected = '';

-                    if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {

-                        $selected = 'selected="selected"';

-                    }

+			foreach ($post_types as $key => $postobj) {

+				if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {

+					$name = $postobj->labels->name;

+					$listing_link = geodir_getlink($author_link, array('stype' => $key), false);

 

-                    /**

-                     * Filter my listing link.

-                     *

-                     * @since 1.0.0

-                     * @param string $listing_link My listing link.

-                     * @param string $key My listing array key.

-                     * @param int $current_user->ID Current user ID.

-                     */

-                    $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);

+					$selected = '';

+					if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {

+						$selected = 'selected="selected"';

+					}

 

-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';

-                }

-            }

+					/**

+					 * Filter my listing link.

+					 *

+					 * @since 1.0.0

+					 * @param string $listing_link My listing link.

+					 * @param string $key My listing array key.

+					 * @param int $current_user->ID Current user ID.

+					 */

+					$listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);

+

+					$listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>';

+				}

+			}

 

-            if ($listing_links != '') {

-                ?>

+			if ($listing_links != '') {

+				?>

                 <li>

                     <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value"

                             option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false"

@@ -2873,27 +2873,27 @@ 
                     </select>

                 </li>

             <?php

-            }

-        }

+			}

+		}

 

-        $dashboard_link = ob_get_clean();

-        /**

-         * Filter dashboard links HTML.

-         *

-         * @since 1.0.0

-         * @param string $dashboard_link Dashboard links HTML.

-         */

-        echo apply_filters('geodir_dashboard_links', $dashboard_link);

-        echo '</ul>';

-    } else {

-        ?>

+		$dashboard_link = ob_get_clean();

+		/**

+		 * Filter dashboard links HTML.

+		 *

+		 * @since 1.0.0

+		 * @param string $dashboard_link Dashboard links HTML.

+		 */

+		echo apply_filters('geodir_dashboard_links', $dashboard_link);

+		echo '</ul>';

+	} else {

+		?>

         <?php

-        /**

-         * Filter signup form action link.

-         *

-         * @since 1.0.0

-         */

-        ?>

+		/**

+		 * Filter signup form action link.

+		 *

+		 * @since 1.0.0

+		 */

+		?>

         <form name="loginform" class="loginform1"

               action="<?php echo geodir_login_url(); ?>"

               method="post">

@@ -2913,28 +2913,28 @@ 
 

                 <p class="geodir-new-forgot-link">

                     <?php

-                    /**

-                     * Filter signup page register form link.

-                     *

-                     * @since 1.0.0

-                     */

-                    ?>

+					/**

+					 * Filter signup page register form link.

+					 *

+					 * @since 1.0.0

+					 */

+					?>

                     <a href="<?php echo geodir_login_url(array('signup' => true)); ?>"

                        class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a>

 

                     <?php

-                    /**

-                     * Filter signup page forgot password form link.

-                     *

-                     * @since 1.0.0

-                     */

-                    ?>

+					/**

+					 * Filter signup page forgot password form link.

+					 *

+					 * @since 1.0.0

+					 */

+					?>

                     <a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"

                        class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div>

         </form>

     <?php }

 

-    echo $after_widget;

+	echo $after_widget;

 }

 

 

@@ -2953,284 +2953,284 @@ 
  * @param array|string $instance The settings for the particular instance of the widget.

  */

 function geodir_popular_postview_output($args = '', $instance = '') {

-    global $gd_session;

+	global $gd_session;

 	

-    // prints the widget

-    extract($args, EXTR_SKIP);

-

-    echo $before_widget;

-

-    /** This filter is documented in geodirectory_widgets.php */

-    $title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

-    /**

-     * Filter the widget post type.

-     *

-     * @since 1.0.0

-     * @param string $instance['post_type'] Post type of listing.

-     */

-    $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);

-    /**

-     * Filter the widget's term.

-     *

-     * @since 1.0.0

-     * @param string $instance['category'] Filter by term. Can be any valid term.

-     */

-    $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);

-    /**

-     * Filter the widget listings limit.

-     *

-     * @since 1.0.0

-     * @param string $instance['post_number'] Number of listings to display.

-     */

-    $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);

-    /**

-     * Filter widget's "layout" type.

-     *

-     * @since 1.0.0

-     * @param string $instance['layout'] Widget layout type.

-     */

-    $layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);

-    /**

-     * Filter widget's "add_location_filter" value.

-     *

-     * @since 1.0.0

-     * @param string|bool $instance['add_location_filter'] Do you want to add location filter? Can be 1 or 0.

-     */

-    $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);

-    /**

-     * Filter widget's listing width.

-     *

-     * @since 1.0.0

-     * @param string $instance['listing_width'] Listing width.

-     */

-    $listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);

-    /**

-     * Filter widget's "list_sort" type.

-     *

-     * @since 1.0.0

-     * @param string $instance['list_sort'] Listing sort by type.

-     */

-    $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);

-    $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false;

-

-    // set post type to current viewing post type

-    if ($use_viewing_post_type) {

-        $current_post_type = geodir_get_current_posttype();

-        if ($current_post_type != '' && $current_post_type != $post_type) {

-            $post_type = $current_post_type;

-            $category = array(); // old post type category will not work for current changed post type

-        }

-    }

-    // replace widget title dynamically

-    $posttype_plural_label = __(get_post_type_plural_label($post_type), 'geodirectory');

-    $posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory');

-

-    $title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);

-    $title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);

-

-    if (isset($instance['character_count'])) {

-        /**

-         * Filter the widget's excerpt character count.

-         *

-         * @since 1.0.0

-         * @param int $instance['character_count'] Excerpt character count.

-         */

-        $character_count = apply_filters('widget_list_character_count', $instance['character_count']);

-    } else {

-        $character_count = '';

-    }

-

-    if (empty($title) || $title == 'All') {

-        $title .= ' ' . __(get_post_type_plural_label($post_type), 'geodirectory');

-    }

-

-    $location_url = array();

-    $city = get_query_var('gd_city');

-    if (!empty($city)) {

-        $country = get_query_var('gd_country');

-        $region = get_query_var('gd_region');

-

-        $geodir_show_location_url = get_option('geodir_show_location_url');

-

-        if ($geodir_show_location_url == 'all') {

-            if ($country != '') {

-                $location_url[] = $country;

-            }

-

-            if ($region != '') {

-                $location_url[] = $region;

-            }

-        } else if ($geodir_show_location_url == 'country_city') {

-            if ($country != '') {

-                $location_url[] = $country;

-            }

-        } else if ($geodir_show_location_url == 'region_city') {

-            if ($region != '') {

-                $location_url[] = $region;

-            }

-        }

+	// prints the widget

+	extract($args, EXTR_SKIP);

+

+	echo $before_widget;

+

+	/** This filter is documented in geodirectory_widgets.php */

+	$title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+	/**

+	 * Filter the widget post type.

+	 *

+	 * @since 1.0.0

+	 * @param string $instance['post_type'] Post type of listing.

+	 */

+	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);

+	/**

+	 * Filter the widget's term.

+	 *

+	 * @since 1.0.0

+	 * @param string $instance['category'] Filter by term. Can be any valid term.

+	 */

+	$category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);

+	/**

+	 * Filter the widget listings limit.

+	 *

+	 * @since 1.0.0

+	 * @param string $instance['post_number'] Number of listings to display.

+	 */

+	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);

+	/**

+	 * Filter widget's "layout" type.

+	 *

+	 * @since 1.0.0

+	 * @param string $instance['layout'] Widget layout type.

+	 */

+	$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);

+	/**

+	 * Filter widget's "add_location_filter" value.

+	 *

+	 * @since 1.0.0

+	 * @param string|bool $instance['add_location_filter'] Do you want to add location filter? Can be 1 or 0.

+	 */

+	$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);

+	/**

+	 * Filter widget's listing width.

+	 *

+	 * @since 1.0.0

+	 * @param string $instance['listing_width'] Listing width.

+	 */

+	$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);

+	/**

+	 * Filter widget's "list_sort" type.

+	 *

+	 * @since 1.0.0

+	 * @param string $instance['list_sort'] Listing sort by type.

+	 */

+	$list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);

+	$use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false;

+

+	// set post type to current viewing post type

+	if ($use_viewing_post_type) {

+		$current_post_type = geodir_get_current_posttype();

+		if ($current_post_type != '' && $current_post_type != $post_type) {

+			$post_type = $current_post_type;

+			$category = array(); // old post type category will not work for current changed post type

+		}

+	}

+	// replace widget title dynamically

+	$posttype_plural_label = __(get_post_type_plural_label($post_type), 'geodirectory');

+	$posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory');

+

+	$title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);

+	$title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);

+

+	if (isset($instance['character_count'])) {

+		/**

+		 * Filter the widget's excerpt character count.

+		 *

+		 * @since 1.0.0

+		 * @param int $instance['character_count'] Excerpt character count.

+		 */

+		$character_count = apply_filters('widget_list_character_count', $instance['character_count']);

+	} else {

+		$character_count = '';

+	}

 

-        $location_url[] = $city;

-    }

+	if (empty($title) || $title == 'All') {

+		$title .= ' ' . __(get_post_type_plural_label($post_type), 'geodirectory');

+	}

 

-    $location_url = implode('/', $location_url);

-    $skip_location = false;

-    if (!$add_location_filter && $gd_session->get('gd_multi_location')) {

-        $skip_location = true;

-        $gd_session->un_set('gd_multi_location');

-    }

+	$location_url = array();

+	$city = get_query_var('gd_city');

+	if (!empty($city)) {

+		$country = get_query_var('gd_country');

+		$region = get_query_var('gd_region');

 

-    if (get_option('permalink_structure')) {

-        $viewall_url = get_post_type_archive_link($post_type);

-    } else {

-        $viewall_url = get_post_type_archive_link($post_type);

-    }

+		$geodir_show_location_url = get_option('geodir_show_location_url');

 

-    if (!empty($category) && $category[0] != '0') {

-        global $geodir_add_location_url;

+		if ($geodir_show_location_url == 'all') {

+			if ($country != '') {

+				$location_url[] = $country;

+			}

+

+			if ($region != '') {

+				$location_url[] = $region;

+			}

+		} else if ($geodir_show_location_url == 'country_city') {

+			if ($country != '') {

+				$location_url[] = $country;

+			}

+		} else if ($geodir_show_location_url == 'region_city') {

+			if ($region != '') {

+				$location_url[] = $region;

+			}

+		}

 

-        $geodir_add_location_url = '0';

+		$location_url[] = $city;

+	}

 

-        if ($add_location_filter != '0') {

-            $geodir_add_location_url = '1';

-        }

+	$location_url = implode('/', $location_url);

+	$skip_location = false;

+	if (!$add_location_filter && $gd_session->get('gd_multi_location')) {

+		$skip_location = true;

+		$gd_session->un_set('gd_multi_location');

+	}

 

-        $viewall_url = get_term_link((int)$category[0], $post_type . 'category');

+	if (get_option('permalink_structure')) {

+		$viewall_url = get_post_type_archive_link($post_type);

+	} else {

+		$viewall_url = get_post_type_archive_link($post_type);

+	}

 

-        $geodir_add_location_url = NULL;

-    }

-    if ($skip_location) {

-        $gd_session->set('gd_multi_location', 1);

-    }

+	if (!empty($category) && $category[0] != '0') {

+		global $geodir_add_location_url;

 

-    if(is_wp_error( $viewall_url  )){$viewall_url = '';}

+		$geodir_add_location_url = '0';

 

-    $query_args = array(

-        'posts_per_page' => $post_number,

-        'is_geodir_loop' => true,

-        'gd_location' => $add_location_filter ? true : false,

-        'post_type' => $post_type,

-        'order_by' => $list_sort

-    );

+		if ($add_location_filter != '0') {

+			$geodir_add_location_url = '1';

+		}

 

-    if ($character_count) {

-        $query_args['excerpt_length'] = $character_count;

-    }

+		$viewall_url = get_term_link((int)$category[0], $post_type . 'category');

+

+		$geodir_add_location_url = NULL;

+	}

+	if ($skip_location) {

+		$gd_session->set('gd_multi_location', 1);

+	}

 

-    if (!empty($instance['show_featured_only'])) {

-        $query_args['show_featured_only'] = 1;

-    }

+	if(is_wp_error( $viewall_url  )){$viewall_url = '';}

 

-    if (!empty($instance['show_special_only'])) {

-        $query_args['show_special_only'] = 1;

-    }

+	$query_args = array(

+		'posts_per_page' => $post_number,

+		'is_geodir_loop' => true,

+		'gd_location' => $add_location_filter ? true : false,

+		'post_type' => $post_type,

+		'order_by' => $list_sort

+	);

 

-    if (!empty($instance['with_pics_only'])) {

-        $query_args['with_pics_only'] = 0;

-        $query_args['featured_image_only'] = 1;

-    }

+	if ($character_count) {

+		$query_args['excerpt_length'] = $character_count;

+	}

 

-    if (!empty($instance['with_videos_only'])) {

-        $query_args['with_videos_only'] = 1;

-    }

-    $with_no_results = !empty($instance['without_no_results']) ? false : true;

+	if (!empty($instance['show_featured_only'])) {

+		$query_args['show_featured_only'] = 1;

+	}

 

-    if (!empty($category) && $category[0] != '0') {

-        $category_taxonomy = geodir_get_taxonomies($post_type);

+	if (!empty($instance['show_special_only'])) {

+		$query_args['show_special_only'] = 1;

+	}

 

-        ######### WPML #########

-        if (function_exists('icl_object_id')) {

-            $category = gd_lang_object_ids($category, $category_taxonomy[0]);

-        }

-        ######### WPML #########

+	if (!empty($instance['with_pics_only'])) {

+		$query_args['with_pics_only'] = 0;

+		$query_args['featured_image_only'] = 1;

+	}

+

+	if (!empty($instance['with_videos_only'])) {

+		$query_args['with_videos_only'] = 1;

+	}

+	$with_no_results = !empty($instance['without_no_results']) ? false : true;

+

+	if (!empty($category) && $category[0] != '0') {

+		$category_taxonomy = geodir_get_taxonomies($post_type);

+

+		######### WPML #########

+		if (function_exists('icl_object_id')) {

+			$category = gd_lang_object_ids($category, $category_taxonomy[0]);

+		}

+		######### WPML #########

 

-        $tax_query = array(

-            'taxonomy' => $category_taxonomy[0],

-            'field' => 'id',

-            'terms' => $category

-        );

+		$tax_query = array(

+			'taxonomy' => $category_taxonomy[0],

+			'field' => 'id',

+			'terms' => $category

+		);

 

-        $query_args['tax_query'] = array($tax_query);

-    }

+		$query_args['tax_query'] = array($tax_query);

+	}

 

-    global $gridview_columns_widget, $geodir_is_widget_listing;

+	global $gridview_columns_widget, $geodir_is_widget_listing;

 

-    $widget_listings = geodir_get_widget_listings($query_args);

+	$widget_listings = geodir_get_widget_listings($query_args);

 

-    if (!empty($widget_listings) || $with_no_results) {

-        ?>

+	if (!empty($widget_listings) || $with_no_results) {

+		?>

         <div class="geodir_locations geodir_location_listing">

 

             <?php

-            /**

-             * Called before the div containing the title and view all link in popular post view widget.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_before_view_all_link_in_widget'); ?>

+			/**

+			 * Called before the div containing the title and view all link in popular post view widget.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_before_view_all_link_in_widget'); ?>

             <div class="geodir_list_heading clearfix">

                 <?php echo $before_title . $title . $after_title; ?>

                 <a href="<?php echo $viewall_url; ?>"

                    class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>

             </div>

             <?php

-            /**

-             * Called after the div containing the title and view all link in popular post view widget.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_after_view_all_link_in_widget'); ?>

+			/**

+			 * Called after the div containing the title and view all link in popular post view widget.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_after_view_all_link_in_widget'); ?>

             <?php

-            if (strstr($layout, 'gridview')) {

-                $listing_view_exp = explode('_', $layout);

-                $gridview_columns_widget = $layout;

-                $layout = $listing_view_exp[0];

-            } else {

-                $gridview_columns_widget = '';

-            }

-

-            /**

-             * Filter the widget listing listview template path.

-             *

-             * @since 1.0.0

-             */

-            $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));

-            if (!isset($character_count)) {

-                /**

-                 * Filter the widget's excerpt character count.

-                 *

-                 * @since 1.0.0

-                 * @param int $instance['character_count'] Excerpt character count.

-                 */

-                $character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);

-            }

-

-            global $post, $map_jason, $map_canvas_arr;

-

-            $current_post = $post;

-            $current_map_jason = $map_jason;

-            $current_map_canvas_arr = $map_canvas_arr;

-            $geodir_is_widget_listing = true;

-

-            /**

-             * Includes related listing listview template.

-             *

-             * @since 1.0.0

-             */

-            include($template);

-

-            $geodir_is_widget_listing = false;

-

-            $GLOBALS['post'] = $current_post;

-            if (!empty($current_post))

-                setup_postdata($current_post);

-            $map_jason = $current_map_jason;

-            $map_canvas_arr = $current_map_canvas_arr;

-            ?>

+			if (strstr($layout, 'gridview')) {

+				$listing_view_exp = explode('_', $layout);

+				$gridview_columns_widget = $layout;

+				$layout = $listing_view_exp[0];

+			} else {

+				$gridview_columns_widget = '';

+			}

+

+			/**

+			 * Filter the widget listing listview template path.

+			 *

+			 * @since 1.0.0

+			 */

+			$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));

+			if (!isset($character_count)) {

+				/**

+				 * Filter the widget's excerpt character count.

+				 *

+				 * @since 1.0.0

+				 * @param int $instance['character_count'] Excerpt character count.

+				 */

+				$character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);

+			}

+

+			global $post, $map_jason, $map_canvas_arr;

+

+			$current_post = $post;

+			$current_map_jason = $map_jason;

+			$current_map_canvas_arr = $map_canvas_arr;

+			$geodir_is_widget_listing = true;

+

+			/**

+			 * Includes related listing listview template.

+			 *

+			 * @since 1.0.0

+			 */

+			include($template);

+

+			$geodir_is_widget_listing = false;

+

+			$GLOBALS['post'] = $current_post;

+			if (!empty($current_post))

+				setup_postdata($current_post);

+			$map_jason = $current_map_jason;

+			$map_canvas_arr = $current_map_canvas_arr;

+			?>

         </div>

     <?php

-    }

-    echo $after_widget;

+	}

+	echo $after_widget;

 

 }

 

@@ -3253,26 +3253,26 @@ 
  */

 function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type)

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+	$detail_table = $plugin_prefix . $post_type . '_detail';

 

-    $sql = "SELECT COALESCE(SUM(rating_count),0) FROM " . $detail_table . " WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(" . $term_id . ", " . $taxonomy . ")";

+	$sql = "SELECT COALESCE(SUM(rating_count),0) FROM " . $detail_table . " WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(" . $term_id . ", " . $taxonomy . ")";

 

-    /**

-     * Filter count review sql query.

-     *

-     * @since 1.5.1

-     * @param string $sql Database sql query..

-     * @param int $term_id The term ID.

-     * @param int $taxonomy The taxonomy Id.

-     * @param string $post_type The post type.

-     */

-    $sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);

+	/**

+	 * Filter count review sql query.

+	 *

+	 * @since 1.5.1

+	 * @param string $sql Database sql query..

+	 * @param int $term_id The term ID.

+	 * @param int $taxonomy The taxonomy Id.

+	 * @param string $post_type The post type.

+	 */

+	$sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);

 

-    $count = $wpdb->get_var($sql);

+	$count = $wpdb->get_var($sql);

 

-    return $count;

+	return $count;

 }

 

 /**

@@ -3285,53 +3285,53 @@ 
  */

 function geodir_count_reviews_by_terms($force_update = false)

 {

-    /**

-     * Filter review count option data.

-     *

-     * @since 1.0.0

-     * @param bool $force_update Force update option value?. Default.false.

-     */

-    $option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update);

-    if (!empty($option_data)) {

-        return $option_data;

-    }

+	/**

+	 * Filter review count option data.

+	 *

+	 * @since 1.0.0

+	 * @param bool $force_update Force update option value?. Default.false.

+	 */

+	$option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update);

+	if (!empty($option_data)) {

+		return $option_data;

+	}

 

-    $option_data = get_option('geodir_global_review_count');

+	$option_data = get_option('geodir_global_review_count');

 

-    if (!$option_data OR $force_update) {

-        $post_types = geodir_get_posttypes();

-        $term_array = array();

-        foreach ($post_types as $post_type) {

+	if (!$option_data OR $force_update) {

+		$post_types = geodir_get_posttypes();

+		$term_array = array();

+		foreach ($post_types as $post_type) {

 

-            $taxonomy = geodir_get_taxonomies($post_type);

-            $taxonomy = $taxonomy[0];

+			$taxonomy = geodir_get_taxonomies($post_type);

+			$taxonomy = $taxonomy[0];

 

-            $args = array(

-                'hide_empty' => false

-            );

+			$args = array(

+				'hide_empty' => false

+			);

 

-            $terms = get_terms($taxonomy, $args);

+			$terms = get_terms($taxonomy, $args);

 

-            foreach ($terms as $term) {

-                $count = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type);

-                $children = get_term_children($term->term_id, $taxonomy);

-                /*if ( is_array( $children ) ) {

+			foreach ($terms as $term) {

+				$count = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type);

+				$children = get_term_children($term->term_id, $taxonomy);

+				/*if ( is_array( $children ) ) {

 					foreach ( $children as $child_id ) {

 						$child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type);

 						$count = $count + $child_count;

 					}

 				}*/

-                $term_array[$term->term_id] = $count;

-            }

-        }

+				$term_array[$term->term_id] = $count;

+			}

+		}

 

-        update_option('geodir_global_review_count', $term_array);

-        //clear cache

-        wp_cache_delete('geodir_global_review_count');

-        return $term_array;

-    } else {

-        return $option_data;

-    }

+		update_option('geodir_global_review_count', $term_array);

+		//clear cache

+		wp_cache_delete('geodir_global_review_count');

+		return $term_array;

+	} else {

+		return $option_data;

+	}

 }

 

 /**

@@ -3343,15 +3343,15 @@ 
  */

 function geodir_term_review_count_force_update($new_status, $old_status='', $post='')

 {

-    if(isset($_REQUEST['action']) && $_REQUEST['action']=='geodir_import_export'){return;}//do not run if importing listings

-

-    if(isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')){

-        return;

-    }

-    if($new_status!=$old_status) {

-        geodir_count_reviews_by_terms(true);

-    }

-    return true;

+	if(isset($_REQUEST['action']) && $_REQUEST['action']=='geodir_import_export'){return;}//do not run if importing listings

+

+	if(isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')){

+		return;

+	}

+	if($new_status!=$old_status) {

+		geodir_count_reviews_by_terms(true);

+	}

+	return true;

 }

 

 

@@ -3370,15 +3370,15 @@ 
 function geodir_count_posts_by_term($data, $term)

 {

 

-    if ($data) {

-        if (isset($data[$term->term_id])) {

-            return $data[$term->term_id];

-        } else {

-            return 0;

-        }

-    } else {

-        return $term->count;

-    }

+	if ($data) {

+		if (isset($data[$term->term_id])) {

+			return $data[$term->term_id];

+		} else {

+			return 0;

+		}

+	} else {

+		return $term->count;

+	}

 }

 

 /**

@@ -3391,8 +3391,8 @@ 
  */

 function geodir_sort_terms_by_count($terms)

 {

-    usort($terms, "geodir_sort_by_count_obj");

-    return $terms;

+	usort($terms, "geodir_sort_by_count_obj");

+	return $terms;

 }

 

 /**

@@ -3405,8 +3405,8 @@ 
  */

 function geodir_sort_terms_by_review_count($terms)

 {

-    usort($terms, "geodir_sort_by_review_count_obj");

-    return $terms;

+	usort($terms, "geodir_sort_by_review_count_obj");

+	return $terms;

 }

 

 /**

@@ -3420,12 +3420,12 @@ 
  */

 function geodir_sort_terms($terms, $sort = 'count')

 {

-    if ($sort == 'count') {

-        return geodir_sort_terms_by_count($terms);

-    }

-    if ($sort == 'review_count') {

-        return geodir_sort_terms_by_review_count($terms);

-    }

+	if ($sort == 'count') {

+		return geodir_sort_terms_by_count($terms);

+	}

+	if ($sort == 'review_count') {

+		return geodir_sort_terms_by_review_count($terms);

+	}

 }

 

 /*-----------------------------------------------------------------------------------*/

@@ -3442,7 +3442,7 @@ 
  */

 function geodir_sort_by_count($a, $b)

 {

-    return $a['count'] < $b['count'];

+	return $a['count'] < $b['count'];

 }

 

 /**

@@ -3456,7 +3456,7 @@ 
  */

 function geodir_sort_by_count_obj($a, $b)

 {

-    return $a->count < $b->count;

+	return $a->count < $b->count;

 }

 

 /**

@@ -3470,7 +3470,7 @@ 
  */

 function geodir_sort_by_review_count_obj($a, $b)

 {

-    return $a->review_count < $b->review_count;

+	return $a->review_count < $b->review_count;

 }

 

 /**

@@ -3480,43 +3480,43 @@ 
  * @package GeoDirectory

  */

 function geodir_load_textdomain() {

-    /**

-     * Filter the plugin locale.

-     *

-     * @since 1.4.2

-     * @package GeoDirectory

-     */

-    $locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');

-

-    load_textdomain('geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo');

-    load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))) . '/geodirectory-languages');

+	/**

+	 * Filter the plugin locale.

+	 *

+	 * @since 1.4.2

+	 * @package GeoDirectory

+	 */

+	$locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');

+

+	load_textdomain('geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo');

+	load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))) . '/geodirectory-languages');

+

+	/**

+	 * Define language constants.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once(geodir_plugin_path() . '/language.php');

+

+	$language_file = geodir_plugin_path() . '/db-language.php';

+

+	// Load language string file if not created yet

+	if (!file_exists($language_file)) {

+		geodirectory_load_db_language();

+	}

 

-    /**

-     * Define language constants.

-     *

-     * @since 1.0.0

-     */

-    require_once(geodir_plugin_path() . '/language.php');

-

-    $language_file = geodir_plugin_path() . '/db-language.php';

-

-    // Load language string file if not created yet

-    if (!file_exists($language_file)) {

-        geodirectory_load_db_language();

-    }

-

-    if (file_exists($language_file)) {

-        /**

-         * Language strings from database.

-         *

-         * @since 1.4.2

-         */

-        try {

-            require_once($language_file);

-        } catch(Exception $e) {

-            error_log('Language Error: ' . $e->getMessage());

-        }

-    }

+	if (file_exists($language_file)) {

+		/**

+		 * Language strings from database.

+		 *

+		 * @since 1.4.2

+		 */

+		try {

+			require_once($language_file);

+		} catch(Exception $e) {

+			error_log('Language Error: ' . $e->getMessage());

+		}

+	}

 }

 

 /**

@@ -3530,66 +3530,66 @@ 
  * @return bool True if file created otherwise false

  */

 function geodirectory_load_db_language() {

-    global $wp_filesystem;

-    if( empty( $wp_filesystem ) ) {

-        require_once( ABSPATH .'/wp-admin/includes/file.php' );

-        WP_Filesystem();

-        global $wp_filesystem;

-    }

-

-    $language_file = geodir_plugin_path() . '/db-language.php';

-

-    if(is_file($language_file) && !is_writable($language_file))

-        return false; // Not possible to create.

-

-    if(!is_file($language_file) && !is_writable(dirname($language_file)))

-        return false; // Not possible to create.

-

-    $contents_strings = array();

+	global $wp_filesystem;

+	if( empty( $wp_filesystem ) ) {

+		require_once( ABSPATH .'/wp-admin/includes/file.php' );

+		WP_Filesystem();

+		global $wp_filesystem;

+	}

 

-    /**

-     * Filter the language string from database to translate via po editor

-     *

-     * @since 1.4.2

-     *

-     * @param array $contents_strings Array of strings.

-     */

-    $contents_strings = apply_filters('geodir_load_db_language', $contents_strings);

-

-    $contents_strings = array_unique($contents_strings);

-

-    $contents_head = array();

-    $contents_head[] = "<?php";

-    $contents_head[] = "/**";

-    $contents_head[] = " * Translate language string stored in database. Ex: Custom Fields";

-    $contents_head[] = " *";

-    $contents_head[] = " * @package GeoDirectory";

-    $contents_head[] = " * @since 1.4.2";

-    $contents_head[] = " */";

-    $contents_head[] = "";

-    $contents_head[] = "// Language keys";

-

-    $contents_foot = array();

-    $contents_foot[] = "";

-    $contents_foot[] = "";

-

-    $contents = implode(PHP_EOL, $contents_head);

-

-    if (!empty($contents_strings)) {

-        foreach ( $contents_strings as $string ) {

-            if (is_scalar($string) && $string != '') {

-                $string = str_replace("'", "\'", $string);

-                $contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";

-            }

-        }

-    }

+	$language_file = geodir_plugin_path() . '/db-language.php';

+

+	if(is_file($language_file) && !is_writable($language_file))

+		return false; // Not possible to create.

+

+	if(!is_file($language_file) && !is_writable(dirname($language_file)))

+		return false; // Not possible to create.

+

+	$contents_strings = array();

+

+	/**

+	 * Filter the language string from database to translate via po editor

+	 *

+	 * @since 1.4.2

+	 *

+	 * @param array $contents_strings Array of strings.

+	 */

+	$contents_strings = apply_filters('geodir_load_db_language', $contents_strings);

+

+	$contents_strings = array_unique($contents_strings);

+

+	$contents_head = array();

+	$contents_head[] = "<?php";

+	$contents_head[] = "/**";

+	$contents_head[] = " * Translate language string stored in database. Ex: Custom Fields";

+	$contents_head[] = " *";

+	$contents_head[] = " * @package GeoDirectory";

+	$contents_head[] = " * @since 1.4.2";

+	$contents_head[] = " */";

+	$contents_head[] = "";

+	$contents_head[] = "// Language keys";

+

+	$contents_foot = array();

+	$contents_foot[] = "";

+	$contents_foot[] = "";

+

+	$contents = implode(PHP_EOL, $contents_head);

+

+	if (!empty($contents_strings)) {

+		foreach ( $contents_strings as $string ) {

+			if (is_scalar($string) && $string != '') {

+				$string = str_replace("'", "\'", $string);

+				$contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";

+			}

+		}

+	}

 

-    $contents .= implode(PHP_EOL, $contents_foot);

+	$contents .= implode(PHP_EOL, $contents_foot);

 

-    if($wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE))

-        return false; // Failure; could not write file.

+	if($wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE))

+		return false; // Failure; could not write file.

 

-    return true;

+	return true;

 }

 

 /**

@@ -3605,31 +3605,31 @@ 
  * @return array Translation texts.

  */

 function geodir_load_custom_field_translation($translation_texts = array()) {

-    global $wpdb;

+	global $wpdb;

 

-    // Custom fields table

-    $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values FROM " . GEODIR_CUSTOM_FIELDS_TABLE;

-    $rows = $wpdb->get_results($sql);

+	// Custom fields table

+	$sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values FROM " . GEODIR_CUSTOM_FIELDS_TABLE;

+	$rows = $wpdb->get_results($sql);

 

-    if (!empty($rows)) {

-        foreach($rows as $row) {

-            if (!empty($row->admin_title))

-                $translation_texts[] = stripslashes_deep($row->admin_title);

+	if (!empty($rows)) {

+		foreach($rows as $row) {

+			if (!empty($row->admin_title))

+				$translation_texts[] = stripslashes_deep($row->admin_title);

 			

-            if (!empty($row->admin_desc))

-                $translation_texts[] = stripslashes_deep($row->admin_desc);

+			if (!empty($row->admin_desc))

+				$translation_texts[] = stripslashes_deep($row->admin_desc);

 

-            if (!empty($row->site_title))

-                $translation_texts[] = stripslashes_deep($row->site_title);

+			if (!empty($row->site_title))

+				$translation_texts[] = stripslashes_deep($row->site_title);

 

-            if (!empty($row->clabels))

-                $translation_texts[] = stripslashes_deep($row->clabels);

+			if (!empty($row->clabels))

+				$translation_texts[] = stripslashes_deep($row->clabels);

 

-            if (!empty($row->required_msg))

-                $translation_texts[] = stripslashes_deep($row->required_msg);

+			if (!empty($row->required_msg))

+				$translation_texts[] = stripslashes_deep($row->required_msg);

 			

 			if (!empty($row->default_value))

-                $translation_texts[] = stripslashes_deep($row->default_value);

+				$translation_texts[] = stripslashes_deep($row->default_value);

 			

 			if (!empty($row->option_values)) {

 				$option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values));

@@ -3642,25 +3642,25 @@ 
 					}

 				}

 			}

-        }

-    }

+		}

+	}

 	

-    // Custom sorting fields table

-    $sql = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE;

-    $rows = $wpdb->get_results($sql);

+	// Custom sorting fields table

+	$sql = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE;

+	$rows = $wpdb->get_results($sql);

 

-    if (!empty($rows)) {

-        foreach($rows as $row) {

-            if (!empty($row->site_title))

-                $translation_texts[] = stripslashes_deep($row->site_title);

+	if (!empty($rows)) {

+		foreach($rows as $row) {

+			if (!empty($row->site_title))

+				$translation_texts[] = stripslashes_deep($row->site_title);

 

-            if (!empty($row->asc_title))

-                $translation_texts[] = stripslashes_deep($row->asc_title);

+			if (!empty($row->asc_title))

+				$translation_texts[] = stripslashes_deep($row->asc_title);

 

-            if (!empty($row->desc_title))

-                $translation_texts[] = stripslashes_deep($row->desc_title);

-        }

-    }

+			if (!empty($row->desc_title))

+				$translation_texts[] = stripslashes_deep($row->desc_title);

+		}

+	}

 	

 	// Advance search filter fields table

 	if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {

@@ -3681,9 +3681,9 @@ 
 		}

 	}

 

-    $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

-    return $translation_texts;

+	return $translation_texts;

 }

 

 /**

@@ -3695,71 +3695,71 @@ 
  * @return array Array of mime types.

  */

 function geodir_allowed_mime_types() {

-    /**

-     * Filter the list of mime types and file extensions allowed for file upload.

-     *

-     * @since 1.4.7

-     * @package GeoDirectory

-     *

-     * @param array $geodir_allowed_mime_types and file extensions.

-     */

-    return apply_filters( 'geodir_allowed_mime_types', array(

-            'Image' => array( // Image formats.

-                'jpg' => 'image/jpeg',

-                'jpe' => 'image/jpeg',

-                'jpeg' => 'image/jpeg',

-                'gif' => 'image/gif',

-                'png' => 'image/png',

-                'bmp' => 'image/bmp',

-                'ico' => 'image/x-icon',

-            ),

-            'Video' => array( // Video formats.

-                'asf' => 'video/x-ms-asf',

-                'avi' => 'video/avi',

-                'flv' => 'video/x-flv',

-                'mkv' => 'video/x-matroska',

-                'mp4' => 'video/mp4',

-                'mpeg' => 'video/mpeg',

-                'mpg' => 'video/mpeg',

-                'wmv' => 'video/x-ms-wmv',

-                '3gp' => 'video/3gpp',

-            ),

-            'Audio' => array( // Audio formats.

-                'ogg' => 'audio/ogg',

-                'mp3' => 'audio/mpeg',

-                'wav' => 'audio/wav',

-                'wma' => 'audio/x-ms-wma',

-            ),

-            'Text' => array( // Text formats.

-                'css' => 'text/css',

-                'csv' => 'text/csv',

-                'htm' => 'text/html',

-                'html' => 'text/html',

-                'txt' => 'text/plain',

-                'rtx' => 'text/richtext',

-                'vtt' => 'text/vtt',

-            ),

-            'Application' => array( // Application formats.

-                'doc' => 'application/msword',

-                'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',

-                'exe' => 'application/x-msdownload',

-                'js' => 'application/javascript',

-                'odt' => 'application/vnd.oasis.opendocument.text',

-                'pdf' => 'application/pdf',

-                'pot' => 'application/vnd.ms-powerpoint',

-                'ppt' => 'application/vnd.ms-powerpoint',

-                'pptx' => 'application/vnd.ms-powerpoint',

-                'psd' => 'application/octet-stream',

-                'rar' => 'application/rar',

-                'rtf' => 'application/rtf',

-                'swf' => 'application/x-shockwave-flash',

-                'tar' => 'application/x-tar',

-                'xls' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',

-                'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',

-                'zip' => 'application/zip',

-            )

-        )

-    );

+	/**

+	 * Filter the list of mime types and file extensions allowed for file upload.

+	 *

+	 * @since 1.4.7

+	 * @package GeoDirectory

+	 *

+	 * @param array $geodir_allowed_mime_types and file extensions.

+	 */

+	return apply_filters( 'geodir_allowed_mime_types', array(

+			'Image' => array( // Image formats.

+				'jpg' => 'image/jpeg',

+				'jpe' => 'image/jpeg',

+				'jpeg' => 'image/jpeg',

+				'gif' => 'image/gif',

+				'png' => 'image/png',

+				'bmp' => 'image/bmp',

+				'ico' => 'image/x-icon',

+			),

+			'Video' => array( // Video formats.

+				'asf' => 'video/x-ms-asf',

+				'avi' => 'video/avi',

+				'flv' => 'video/x-flv',

+				'mkv' => 'video/x-matroska',

+				'mp4' => 'video/mp4',

+				'mpeg' => 'video/mpeg',

+				'mpg' => 'video/mpeg',

+				'wmv' => 'video/x-ms-wmv',

+				'3gp' => 'video/3gpp',

+			),

+			'Audio' => array( // Audio formats.

+				'ogg' => 'audio/ogg',

+				'mp3' => 'audio/mpeg',

+				'wav' => 'audio/wav',

+				'wma' => 'audio/x-ms-wma',

+			),

+			'Text' => array( // Text formats.

+				'css' => 'text/css',

+				'csv' => 'text/csv',

+				'htm' => 'text/html',

+				'html' => 'text/html',

+				'txt' => 'text/plain',

+				'rtx' => 'text/richtext',

+				'vtt' => 'text/vtt',

+			),

+			'Application' => array( // Application formats.

+				'doc' => 'application/msword',

+				'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',

+				'exe' => 'application/x-msdownload',

+				'js' => 'application/javascript',

+				'odt' => 'application/vnd.oasis.opendocument.text',

+				'pdf' => 'application/pdf',

+				'pot' => 'application/vnd.ms-powerpoint',

+				'ppt' => 'application/vnd.ms-powerpoint',

+				'pptx' => 'application/vnd.ms-powerpoint',

+				'psd' => 'application/octet-stream',

+				'rar' => 'application/rar',

+				'rtf' => 'application/rtf',

+				'swf' => 'application/x-shockwave-flash',

+				'tar' => 'application/x-tar',

+				'xls' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',

+				'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',

+				'zip' => 'application/zip',

+			)

+		)

+	);

 }

 

 /**

@@ -3771,21 +3771,21 @@ 
  * @return string User display name.

  */

 function geodir_get_client_name($user_id) {

-    $client_name = '';

+	$client_name = '';

 

-    $user_data = get_userdata($user_id);

+	$user_data = get_userdata($user_id);

 

-    if (!empty($user_data)) {

-        if (isset($user_data->display_name) && trim($user_data->display_name) != '') {

-            $client_name = trim($user_data->display_name);

-        } else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {

-            $client_name = trim($user_data->user_nicename);

-        } else {

-            $client_name = trim($user_data->user_login);

-        }

-    }

+	if (!empty($user_data)) {

+		if (isset($user_data->display_name) && trim($user_data->display_name) != '') {

+			$client_name = trim($user_data->display_name);

+		} else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {

+			$client_name = trim($user_data->user_nicename);

+		} else {

+			$client_name = trim($user_data->user_login);

+		}

+	}

 

-    return $client_name;

+	return $client_name;

 }

 

 

@@ -3800,125 +3800,125 @@ 
  */

 function geodir_wpseo_replacements($vars){

 

-    global $wp;

-    $title = '';

-    // location variables

-    $gd_post_type = geodir_get_current_posttype();

-    $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);

-    /**

-     * Filter the title variables location variables array

-     *

-     * @since 1.5.5

-     * @package GeoDirectory

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

-     * @param array $vars The page title variables.

-     */

-    $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo',$location_array, $vars);

-    $location_titles = array();

-    if(get_query_var( 'gd_country_full' )){

-        if(get_query_var( 'gd_country_full' )){$location_array['gd_country'] = get_query_var( 'gd_country_full' );}

-        if(get_query_var( 'gd_region_full' )){$location_array['gd_region'] = get_query_var( 'gd_region_full' );}

-        if(get_query_var( 'gd_city_full' )){$location_array['gd_city'] = get_query_var( 'gd_city_full' );}

-    }

-    $location_single = '';

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

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

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

-

-    $gd_country_actual = $gd_region_actual = $gd_city_actual = '';

-

-    if (function_exists('get_actual_location_name')) {

-        $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

-        $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

-        $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

-    }

-

-    if ($gd_city != '') {

-        if ($gd_city_actual != '') {

-            $gd_city = $gd_city_actual;

-        } else {

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

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

-            $gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

-        }

-        $location_single = $gd_city;

-

-    } else if ($gd_region != '') {

-        if ($gd_region_actual != '') {

-            $gd_region = $gd_region_actual;

-        } else {

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

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

-            $gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

-        }

+	global $wp;

+	$title = '';

+	// location variables

+	$gd_post_type = geodir_get_current_posttype();

+	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);

+	/**

+	 * Filter the title variables location variables array

+	 *

+	 * @since 1.5.5

+	 * @package GeoDirectory

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

+	 * @param array $vars The page title variables.

+	 */

+	$location_array = apply_filters('geodir_filter_title_variables_location_arr_seo',$location_array, $vars);

+	$location_titles = array();

+	if(get_query_var( 'gd_country_full' )){

+		if(get_query_var( 'gd_country_full' )){$location_array['gd_country'] = get_query_var( 'gd_country_full' );}

+		if(get_query_var( 'gd_region_full' )){$location_array['gd_region'] = get_query_var( 'gd_region_full' );}

+		if(get_query_var( 'gd_city_full' )){$location_array['gd_city'] = get_query_var( 'gd_city_full' );}

+	}

+	$location_single = '';

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

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

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

 

-        $location_single = $gd_region;

-    } else if ($gd_country != '') {

-        if ($gd_country_actual != '') {

-            $gd_country = $gd_country_actual;

-        } else {

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

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

-            $gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

-        }

+	$gd_country_actual = $gd_region_actual = $gd_city_actual = '';

 

-        $location_single = $gd_country;

-    }

+	if (function_exists('get_actual_location_name')) {

+		$gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

+		$gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

+		$gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

+	}

 

-    if (!empty($location_array)) {

+	if ($gd_city != '') {

+		if ($gd_city_actual != '') {

+			$gd_city = $gd_city_actual;

+		} else {

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

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

+			$gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

+		}

+		$location_single = $gd_city;

+

+	} else if ($gd_region != '') {

+		if ($gd_region_actual != '') {

+			$gd_region = $gd_region_actual;

+		} else {

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

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

+			$gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

+		}

 

-        $actual_location_name = function_exists('get_actual_location_name') ? true : false;

-        $location_array = array_reverse($location_array);

+		$location_single = $gd_region;

+	} else if ($gd_country != '') {

+		if ($gd_country_actual != '') {

+			$gd_country = $gd_country_actual;

+		} else {

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

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

+			$gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

+		}

 

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

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

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

+		$location_single = $gd_country;

+	}

 

-            $location_name = geodir_ucwords($gd_location_link_text);

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

+	if (!empty($location_array)) {

 

-            if ($actual_location_name) {

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

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

-            }

+		$actual_location_name = function_exists('get_actual_location_name') ? true : false;

+		$location_array = array_reverse($location_array);

 

-            $location_titles[] = $location_name;

-        }

-        if (!empty($location_titles)) {

-            $location_titles = array_unique($location_titles);

-        }

-    }

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

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

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

 

+			$location_name = geodir_ucwords($gd_location_link_text);

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

 

-    if(!empty($location_titles)) {

-        $vars['%%location%%'] = implode(", ", $location_titles);

-    }

+			if ($actual_location_name) {

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

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

+			}

+

+			$location_titles[] = $location_name;

+		}

+		if (!empty($location_titles)) {

+			$location_titles = array_unique($location_titles);

+		}

+	}

 

 

-    if(!empty($location_titles)) {

-        $vars['%%in_location%%'] = __('in ', 'geodirectory') . implode(", ", $location_titles);

-    }

+	if(!empty($location_titles)) {

+		$vars['%%location%%'] = implode(", ", $location_titles);

+	}

 

 

+	if(!empty($location_titles)) {

+		$vars['%%in_location%%'] = __('in ', 'geodirectory') . implode(", ", $location_titles);

+	}

 

-    if($location_single) {

-        $vars['%%in_location_single%%'] = __('in', 'geodirectory') . ' ' .$location_single;

-    }

 

 

-    if($location_single) {

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

-    }

+	if($location_single) {

+		$vars['%%in_location_single%%'] = __('in', 'geodirectory') . ' ' .$location_single;

+	}

 

-    /**

-     * Filter the title variables after standard ones have been filtered for wpseo.

-     *

-     * @since 1.5.7

-     * @package GeoDirectory

-     * @param string $vars The title with variables.

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

-     */

-    return apply_filters('geodir_wpseo_replacements_vars',$vars,$location_array);

+

+	if($location_single) {

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

+	}

+

+	/**

+	 * Filter the title variables after standard ones have been filtered for wpseo.

+	 *

+	 * @since 1.5.7

+	 * @package GeoDirectory

+	 * @param string $vars The title with variables.

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

+	 */

+	return apply_filters('geodir_wpseo_replacements_vars',$vars,$location_array);

 }

 

 

@@ -3928,10 +3928,10 @@ 
 function geodir_filter_title_variables($title, $gd_page, $sep=''){

 

 

-    if(!$gd_page || !$title){return $title;}// if no a GD page then bail.

-    global $post;

-    //print_r($post);

-    /*

+	if(!$gd_page || !$title){return $title;}// if no a GD page then bail.

+	global $post;

+	//print_r($post);

+	/*

     %%date%%	                Replaced with the date of the post/page

     %%title%%	                Replaced with the title of the post/page

     %%sitename%%	            The site's name

@@ -3958,134 +3958,134 @@ 
     %%pagenumber%%	            Replaced with the current page number

      */

 

-    if ($sep == '') {

-        /**

-         * Filter the page title separator.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param string $sep The separator, default: `|`.

-         */

-        $sep = apply_filters('geodir_page_title_separator', '|');

-    }

-

-

-    if(strpos($title,'%%title%%') !== false){

-        $title = str_replace("%%title%%",$post->post_title,$title);

-    }

-

-    if(strpos($title,'%%sitename%%') !== false){

-        $title = str_replace("%%sitename%%",get_bloginfo('name'),$title);

-    }

-

-    if(strpos($title,'%%sitedesc%%') !== false){

-        $title = str_replace("%%sitedesc%%",get_bloginfo('description'),$title);

-    }

-

-    if(strpos($title,'%%excerpt%%') !== false){

-        $title = str_replace("%%excerpt%%",strip_tags(get_the_excerpt()),$title);

-    }

-

-    if(strpos($title,'%%pt_single%%') !== false){

-        $single_name = '';

-        if($gd_page=='search' || $gd_page=='author'){

-            $geodir_post_types = get_option('geodir_post_types');

-            $spt = esc_attr($_REQUEST['stype']);

-            if(isset($geodir_post_types[$spt]['labels']['singular_name'])){

-                $single_name = __($geodir_post_types[$spt]['labels']['singular_name'],'geodirectory');

-            }

-        }elseif($gd_page=='add-listing'){

-            $geodir_post_types = get_option('geodir_post_types');

-            $spt = isset($_REQUEST['listing_type']) ? esc_attr($_REQUEST['listing_type']) : '';

-            if(!$spt && isset($_REQUEST['pid'])){

-                $spt = get_post_type( $_REQUEST['pid'] );

-            }

-            if(!$spt){$spt='gd_place';}

-            if(isset($geodir_post_types[$spt]['labels']['singular_name'])){

-                $single_name = __($geodir_post_types[$spt]['labels']['singular_name'],'geodirectory');

-            }

-        }

-        elseif($post->post_type){

-            $geodir_post_types = get_option('geodir_post_types');

-            if(isset($geodir_post_types[$post->post_type]['labels']['singular_name'])){

-                $single_name = __($geodir_post_types[$post->post_type]['labels']['singular_name'],'geodirectory');

-            }

+	if ($sep == '') {

+		/**

+		 * Filter the page title separator.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param string $sep The separator, default: `|`.

+		 */

+		$sep = apply_filters('geodir_page_title_separator', '|');

+	}

 

 

-        }

-        $title = str_replace("%%pt_single%%",$single_name,$title);

-    }

-

-    if(strpos($title,'%%pt_plural%%') !== false){

-        $plural_name = '';

-        if($gd_page=='search' || $gd_page=='author'){

-            $geodir_post_types = get_option('geodir_post_types');

-            $spt = esc_attr($_REQUEST['stype']);

-            if(isset($geodir_post_types[$spt]['labels']['name'])){

-                $plural_name = __($geodir_post_types[$spt]['labels']['name'],'geodirectory');

-            }

-        }elseif($gd_page=='add-listing'){

-            $geodir_post_types = get_option('geodir_post_types');

-            $spt = sanitize_text_field($_REQUEST['listing_type']);

-            if(!$spt){$spt='gd_place';}

-            if(isset($geodir_post_types[$spt]['labels']['name'])){

-                $plural_name = __($geodir_post_types[$spt]['labels']['name'],'geodirectory');

-            }

-        }

-        elseif(isset($post->post_type) && $post->post_type){

-            $geodir_post_types = get_option('geodir_post_types');

-            if(isset($geodir_post_types[$post->post_type]['labels']['name'])){

-                $plural_name = __($geodir_post_types[$post->post_type]['labels']['name'],'geodirectory');

-            }

+	if(strpos($title,'%%title%%') !== false){

+		$title = str_replace("%%title%%",$post->post_title,$title);

+	}

 

-        }

-        $title = str_replace("%%pt_plural%%",$plural_name,$title);

-    }

+	if(strpos($title,'%%sitename%%') !== false){

+		$title = str_replace("%%sitename%%",get_bloginfo('name'),$title);

+	}

+

+	if(strpos($title,'%%sitedesc%%') !== false){

+		$title = str_replace("%%sitedesc%%",get_bloginfo('description'),$title);

+	}

 

+	if(strpos($title,'%%excerpt%%') !== false){

+		$title = str_replace("%%excerpt%%",strip_tags(get_the_excerpt()),$title);

+	}

 

+	if(strpos($title,'%%pt_single%%') !== false){

+		$single_name = '';

+		if($gd_page=='search' || $gd_page=='author'){

+			$geodir_post_types = get_option('geodir_post_types');

+			$spt = esc_attr($_REQUEST['stype']);

+			if(isset($geodir_post_types[$spt]['labels']['singular_name'])){

+				$single_name = __($geodir_post_types[$spt]['labels']['singular_name'],'geodirectory');

+			}

+		}elseif($gd_page=='add-listing'){

+			$geodir_post_types = get_option('geodir_post_types');

+			$spt = isset($_REQUEST['listing_type']) ? esc_attr($_REQUEST['listing_type']) : '';

+			if(!$spt && isset($_REQUEST['pid'])){

+				$spt = get_post_type( $_REQUEST['pid'] );

+			}

+			if(!$spt){$spt='gd_place';}

+			if(isset($geodir_post_types[$spt]['labels']['singular_name'])){

+				$single_name = __($geodir_post_types[$spt]['labels']['singular_name'],'geodirectory');

+			}

+		}

+		elseif($post->post_type){

+			$geodir_post_types = get_option('geodir_post_types');

+			if(isset($geodir_post_types[$post->post_type]['labels']['singular_name'])){

+				$single_name = __($geodir_post_types[$post->post_type]['labels']['singular_name'],'geodirectory');

+			}

 

-    if(strpos($title,'%%category%%') !== false){

-        $cat_name = '';

 

-        if($gd_page=='detail') {

-            if ($post->default_category) {

-                $cat = get_term($post->default_category, $post->post_type . 'category');

-                $cat_name = (isset($cat->name)) ? $cat->name : '';

-            }

-        }elseif($gd_page=='listing'){

-            $queried_object = get_queried_object();

-            if(isset($queried_object->name)){

-                $cat_name = $queried_object->name;

-            }

-        }

-        $title = str_replace("%%category%%",$cat_name,$title);

-    }

-

-    if(strpos($title,'%%tag%%') !== false){

-        $cat_name = '';

-

-        if($gd_page=='detail') {

-            if ($post->default_category) {

-                $cat = get_term($post->default_category, $post->post_type . 'category');

-                $cat_name = (isset($cat->name)) ? $cat->name : '';

-            }

-        }elseif($gd_page=='listing'){

-            $queried_object = get_queried_object();

-            if(isset($queried_object->name)){

-                $cat_name = $queried_object->name;

-            }

-        }

-        $title = str_replace("%%tag%%",$cat_name,$title);

-    }

+		}

+		$title = str_replace("%%pt_single%%",$single_name,$title);

+	}

+

+	if(strpos($title,'%%pt_plural%%') !== false){

+		$plural_name = '';

+		if($gd_page=='search' || $gd_page=='author'){

+			$geodir_post_types = get_option('geodir_post_types');

+			$spt = esc_attr($_REQUEST['stype']);

+			if(isset($geodir_post_types[$spt]['labels']['name'])){

+				$plural_name = __($geodir_post_types[$spt]['labels']['name'],'geodirectory');

+			}

+		}elseif($gd_page=='add-listing'){

+			$geodir_post_types = get_option('geodir_post_types');

+			$spt = sanitize_text_field($_REQUEST['listing_type']);

+			if(!$spt){$spt='gd_place';}

+			if(isset($geodir_post_types[$spt]['labels']['name'])){

+				$plural_name = __($geodir_post_types[$spt]['labels']['name'],'geodirectory');

+			}

+		}

+		elseif(isset($post->post_type) && $post->post_type){

+			$geodir_post_types = get_option('geodir_post_types');

+			if(isset($geodir_post_types[$post->post_type]['labels']['name'])){

+				$plural_name = __($geodir_post_types[$post->post_type]['labels']['name'],'geodirectory');

+			}

+

+		}

+		$title = str_replace("%%pt_plural%%",$plural_name,$title);

+	}

+

+

+

+	if(strpos($title,'%%category%%') !== false){

+		$cat_name = '';

+

+		if($gd_page=='detail') {

+			if ($post->default_category) {

+				$cat = get_term($post->default_category, $post->post_type . 'category');

+				$cat_name = (isset($cat->name)) ? $cat->name : '';

+			}

+		}elseif($gd_page=='listing'){

+			$queried_object = get_queried_object();

+			if(isset($queried_object->name)){

+				$cat_name = $queried_object->name;

+			}

+		}

+		$title = str_replace("%%category%%",$cat_name,$title);

+	}

+

+	if(strpos($title,'%%tag%%') !== false){

+		$cat_name = '';

+

+		if($gd_page=='detail') {

+			if ($post->default_category) {

+				$cat = get_term($post->default_category, $post->post_type . 'category');

+				$cat_name = (isset($cat->name)) ? $cat->name : '';

+			}

+		}elseif($gd_page=='listing'){

+			$queried_object = get_queried_object();

+			if(isset($queried_object->name)){

+				$cat_name = $queried_object->name;

+			}

+		}

+		$title = str_replace("%%tag%%",$cat_name,$title);

+	}

 

 

 

-    if(strpos($title,'%%id%%') !== false){

-        $ID = (isset($post->ID)) ? $post->ID : '';

-        $title = str_replace("%%id%%",$ID,$title);

-    }

+	if(strpos($title,'%%id%%') !== false){

+		$ID = (isset($post->ID)) ? $post->ID : '';

+		$title = str_replace("%%id%%",$ID,$title);

+	}

 

-    /*

+	/*

         if(strpos($title,'') !== false){

             $title = str_replace("",,$title);

         }

@@ -4095,174 +4095,174 @@ 
         }

     */

 

-    if(strpos($title,'%%sep%%') !== false){

-        $title = str_replace("%%sep%%",$sep,$title);

-    }

-

-

-    global $wp;

-    // location variables

-    $gd_post_type = geodir_get_current_posttype();

-    $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);

-    /**

-     * Filter the title variables location variables array

-     *

-     * @since 1.5.5

-     * @package GeoDirectory

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

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

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

-     * @param string $sep The separator, default: `|`.

-     */

-    $location_array = apply_filters('geodir_filter_title_variables_location_arr',$location_array,$title, $gd_page, $sep);

-    $location_titles = array();

-    if($gd_page=='location' && get_query_var( 'gd_country_full' )){

-        if(get_query_var( 'gd_country_full' )){$location_array['gd_country'] = get_query_var( 'gd_country_full' );}

-        if(get_query_var( 'gd_region_full' )){$location_array['gd_region'] = get_query_var( 'gd_region_full' );}

-        if(get_query_var( 'gd_city_full' )){$location_array['gd_city'] = get_query_var( 'gd_city_full' );}

-    }

-    $location_single = '';

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

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

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

-

-    $gd_country_actual = $gd_region_actual = $gd_city_actual = '';

-

-    if (function_exists('get_actual_location_name')) {

-        $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

-        $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

-        $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

-    }

-

-    if ($gd_city != '') {

-        if ($gd_city_actual != '') {

-            $gd_city = $gd_city_actual;

-        } else {

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

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

-            $gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

-        }

-        $location_single = $gd_city;

-

-    } else if ($gd_region != '') {

-        if ($gd_region_actual != '') {

-            $gd_region = $gd_region_actual;

-        } else {

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

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

-            $gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

-        }

+	if(strpos($title,'%%sep%%') !== false){

+		$title = str_replace("%%sep%%",$sep,$title);

+	}

 

-        $location_single = $gd_region;

-    } else if ($gd_country != '') {

-        if ($gd_country_actual != '') {

-            $gd_country = $gd_country_actual;

-        } else {

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

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

-            $gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

-        }

 

-        $location_single = $gd_country;

-    }

+	global $wp;

+	// location variables

+	$gd_post_type = geodir_get_current_posttype();

+	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);

+	/**

+	 * Filter the title variables location variables array

+	 *

+	 * @since 1.5.5

+	 * @package GeoDirectory

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

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

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

+	 * @param string $sep The separator, default: `|`.

+	 */

+	$location_array = apply_filters('geodir_filter_title_variables_location_arr',$location_array,$title, $gd_page, $sep);

+	$location_titles = array();

+	if($gd_page=='location' && get_query_var( 'gd_country_full' )){

+		if(get_query_var( 'gd_country_full' )){$location_array['gd_country'] = get_query_var( 'gd_country_full' );}

+		if(get_query_var( 'gd_region_full' )){$location_array['gd_region'] = get_query_var( 'gd_region_full' );}

+		if(get_query_var( 'gd_city_full' )){$location_array['gd_city'] = get_query_var( 'gd_city_full' );}

+	}

+	$location_single = '';

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

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

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

 

-    if (!empty($location_array)) {

+	$gd_country_actual = $gd_region_actual = $gd_city_actual = '';

 

-        $actual_location_name = function_exists('get_actual_location_name') ? true : false;

-        $location_array = array_reverse($location_array);

+	if (function_exists('get_actual_location_name')) {

+		$gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

+		$gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

+		$gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

+	}

 

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

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

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

+	if ($gd_city != '') {

+		if ($gd_city_actual != '') {

+			$gd_city = $gd_city_actual;

+		} else {

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

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

+			$gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

+		}

+		$location_single = $gd_city;

+

+	} else if ($gd_region != '') {

+		if ($gd_region_actual != '') {

+			$gd_region = $gd_region_actual;

+		} else {

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

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

+			$gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

+		}

 

-            $location_name = geodir_ucwords($gd_location_link_text);

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

+		$location_single = $gd_region;

+	} else if ($gd_country != '') {

+		if ($gd_country_actual != '') {

+			$gd_country = $gd_country_actual;

+		} else {

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

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

+			$gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

+		}

 

-            if ($actual_location_name) {

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

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

-            }

+		$location_single = $gd_country;

+	}

 

-            $location_titles[] = $location_name;

-        }

-        if (!empty($location_titles)) {

-            $location_titles = array_unique($location_titles);

-        }

-    }

+	if (!empty($location_array)) {

 

+		$actual_location_name = function_exists('get_actual_location_name') ? true : false;

+		$location_array = array_reverse($location_array);

 

-    if(strpos($title,'%%location%%') !== false){

-        $location = '';

-        if($location_titles) {

-            $location = implode(", ", $location_titles);

-        }

-        $title = str_replace("%%location%%",$location,$title);

-    }

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

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

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

 

-    if(strpos($title,'%%in_location%%') !== false){

-        $location = '';

-        if($location_titles) {

-            $location = __('in ', 'geodirectory') . implode(", ", $location_titles);

-        }

-        $title = str_replace("%%in_location%%",$location,$title);

-    }

+			$location_name = geodir_ucwords($gd_location_link_text);

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

 

-    if(strpos($title,'%%in_location_single%%') !== false){

-        if($location_single) {

-            $location_single = __('in', 'geodirectory') . ' ' .$location_single;

-        }

-        $title = str_replace("%%in_location_single%%",$location_single,$title);

-    }

+			if ($actual_location_name) {

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

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

+			}

 

-    if(strpos($title,'%%location_single%%') !== false){

-        $title = str_replace("%%location_single%%",$location_single,$title);

-    }

+			$location_titles[] = $location_name;

+		}

+		if (!empty($location_titles)) {

+			$location_titles = array_unique($location_titles);

+		}

+	}

 

 

-    if(strpos($title,'%%search_term%%') !== false){

-        $search_term = '';

-        if(isset($_REQUEST['s'])){

-            $search_term = esc_attr($_REQUEST['s']);

-        }

-        $title = str_replace("%%search_term%%",$search_term,$title);

-    }

+	if(strpos($title,'%%location%%') !== false){

+		$location = '';

+		if($location_titles) {

+			$location = implode(", ", $location_titles);

+		}

+		$title = str_replace("%%location%%",$location,$title);

+	}

 

-    if(strpos($title,'%%search_near%%') !== false){

-        $search_term = '';

-        if(isset($_REQUEST['snear'])){

-            $search_term = esc_attr($_REQUEST['snear']);

-        }

-        $title = str_replace("%%search_near%%",$search_term,$title);

-    }

-

-    if(strpos($title,'%%name%%') !== false){

-        $author_name = '';

-        if($author_name = get_the_author()){}

-        else{

-            $queried_object = get_queried_object();

-            if(isset($queried_object->data->user_nicename)){

-                $author_name = $queried_object->data->user_nicename;

-            }

-        }

-        $title = str_replace("%%name%%",$author_name,$title);

-    }

-

-    $title = wptexturize( $title );

-    $title = convert_chars( $title );

-    $title = esc_html( $title );

-

-    /**

-     * Filter the title variables after standard ones have been filtered.

-     *

-     * @since 1.5.7

-     * @package GeoDirectory

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

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

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

-     * @param string $sep The separator, default: `|`.

-     */

+	if(strpos($title,'%%in_location%%') !== false){

+		$location = '';

+		if($location_titles) {

+			$location = __('in ', 'geodirectory') . implode(", ", $location_titles);

+		}

+		$title = str_replace("%%in_location%%",$location,$title);

+	}

+

+	if(strpos($title,'%%in_location_single%%') !== false){

+		if($location_single) {

+			$location_single = __('in', 'geodirectory') . ' ' .$location_single;

+		}

+		$title = str_replace("%%in_location_single%%",$location_single,$title);

+	}

+

+	if(strpos($title,'%%location_single%%') !== false){

+		$title = str_replace("%%location_single%%",$location_single,$title);

+	}

+

+

+	if(strpos($title,'%%search_term%%') !== false){

+		$search_term = '';

+		if(isset($_REQUEST['s'])){

+			$search_term = esc_attr($_REQUEST['s']);

+		}

+		$title = str_replace("%%search_term%%",$search_term,$title);

+	}

+

+	if(strpos($title,'%%search_near%%') !== false){

+		$search_term = '';

+		if(isset($_REQUEST['snear'])){

+			$search_term = esc_attr($_REQUEST['snear']);

+		}

+		$title = str_replace("%%search_near%%",$search_term,$title);

+	}

+

+	if(strpos($title,'%%name%%') !== false){

+		$author_name = '';

+		if($author_name = get_the_author()){}

+		else{

+			$queried_object = get_queried_object();

+			if(isset($queried_object->data->user_nicename)){

+				$author_name = $queried_object->data->user_nicename;

+			}

+		}

+		$title = str_replace("%%name%%",$author_name,$title);

+	}

 

-    return apply_filters('geodir_filter_title_variables_vars',$title,$location_array, $gd_page, $sep);

+	$title = wptexturize( $title );

+	$title = convert_chars( $title );

+	$title = esc_html( $title );

+

+	/**

+	 * Filter the title variables after standard ones have been filtered.

+	 *

+	 * @since 1.5.7

+	 * @package GeoDirectory

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

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

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

+	 * @param string $sep The separator, default: `|`.

+	 */

+

+	return apply_filters('geodir_filter_title_variables_vars',$title,$location_array, $gd_page, $sep);

 }

 

 /**

@@ -4275,65 +4275,65 @@ 
  * @return array Translation texts.

  */

 function geodir_load_cpt_text_translation($translation_texts = array()) {

-    $gd_post_types = geodir_get_posttypes('array');

-

-    if (!empty($gd_post_types)) {

-        foreach ($gd_post_types as $post_type => $cpt_info) {

-            $labels = isset($cpt_info['labels']) ? $cpt_info['labels'] : '';

-            $description = isset($cpt_info['description']) ? $cpt_info['description'] : '';

-            $seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : '';

-

-            if (!empty($labels)) {

-                if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts))

-                    $translation_texts[] = $labels['name'];

-                if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts))

-                    $translation_texts[] = $labels['singular_name'];

-                if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts))

-                    $translation_texts[] = $labels['add_new'];

-                if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts))

-                    $translation_texts[] = $labels['add_new_item'];

-                if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts))

-                    $translation_texts[] = $labels['edit_item'];

-                if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts))

-                    $translation_texts[] = $labels['new_item'];

-                if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts))

-                    $translation_texts[] = $labels['view_item'];

-                if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts))

-                    $translation_texts[] = $labels['search_items'];

-                if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts))

-                    $translation_texts[] = $labels['not_found'];

-                if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts))

-                    $translation_texts[] = $labels['not_found_in_trash'];

-                if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts))

-                    $translation_texts[] = $labels['label_post_profile'];

-                if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts))

-                    $translation_texts[] = $labels['label_post_info'];

-                if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts))

-                    $translation_texts[] = $labels['label_post_images'];

-                if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts))

-                    $translation_texts[] = $labels['label_post_map'];

-                if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts))

-                    $translation_texts[] = $labels['label_reviews'];

-                if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts))

-                    $translation_texts[] = $labels['label_related_listing'];

-            }

-

-            if ($description != '' && !in_array($description, $translation_texts)) {

-                $translation_texts[] = normalize_whitespace($description);

-            }

-

-            if (!empty($seo)) {

-                if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts))

-                    $translation_texts[] = normalize_whitespace($seo['meta_keyword']);

-

-                if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts))

-                    $translation_texts[] = normalize_whitespace($seo['meta_description']);

-            }

-        }

-    }

-    $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

+	$gd_post_types = geodir_get_posttypes('array');

+

+	if (!empty($gd_post_types)) {

+		foreach ($gd_post_types as $post_type => $cpt_info) {

+			$labels = isset($cpt_info['labels']) ? $cpt_info['labels'] : '';

+			$description = isset($cpt_info['description']) ? $cpt_info['description'] : '';

+			$seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : '';

+

+			if (!empty($labels)) {

+				if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts))

+					$translation_texts[] = $labels['name'];

+				if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts))

+					$translation_texts[] = $labels['singular_name'];

+				if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts))

+					$translation_texts[] = $labels['add_new'];

+				if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts))

+					$translation_texts[] = $labels['add_new_item'];

+				if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts))

+					$translation_texts[] = $labels['edit_item'];

+				if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts))

+					$translation_texts[] = $labels['new_item'];

+				if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts))

+					$translation_texts[] = $labels['view_item'];

+				if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts))

+					$translation_texts[] = $labels['search_items'];

+				if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts))

+					$translation_texts[] = $labels['not_found'];

+				if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts))

+					$translation_texts[] = $labels['not_found_in_trash'];

+				if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts))

+					$translation_texts[] = $labels['label_post_profile'];

+				if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts))

+					$translation_texts[] = $labels['label_post_info'];

+				if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts))

+					$translation_texts[] = $labels['label_post_images'];

+				if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts))

+					$translation_texts[] = $labels['label_post_map'];

+				if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts))

+					$translation_texts[] = $labels['label_reviews'];

+				if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts))

+					$translation_texts[] = $labels['label_related_listing'];

+			}

 

-    return $translation_texts;

+			if ($description != '' && !in_array($description, $translation_texts)) {

+				$translation_texts[] = normalize_whitespace($description);

+			}

+

+			if (!empty($seo)) {

+				if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts))

+					$translation_texts[] = normalize_whitespace($seo['meta_keyword']);

+

+				if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts))

+					$translation_texts[] = normalize_whitespace($seo['meta_description']);

+			}

+		}

+	}

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

+

+	return $translation_texts;

 }

 

 /**

@@ -4346,25 +4346,25 @@ 
  * @return array Location terms.

  */

 function geodir_remove_location_terms($location_terms = array()) {

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

-

-    if (!empty($location_terms) && $location_manager) {

-        $hide_country_part = get_option('geodir_location_hide_country_part');

-        $hide_region_part = get_option('geodir_location_hide_region_part');

-

-        if ($hide_region_part && $hide_country_part) {

-            if (isset($location_terms['gd_country']))

-                unset($location_terms['gd_country']);

-            if (isset($location_terms['gd_region']))

-                unset($location_terms['gd_region']);

-        } else if ($hide_region_part && !$hide_country_part) {

-            if (isset($location_terms['gd_region']))

-                unset($location_terms['gd_region']);

-        } else if (!$hide_region_part && $hide_country_part) {

-            if (isset($location_terms['gd_country']))

-                unset($location_terms['gd_country']);

-        }

-    }

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

+

+	if (!empty($location_terms) && $location_manager) {

+		$hide_country_part = get_option('geodir_location_hide_country_part');

+		$hide_region_part = get_option('geodir_location_hide_region_part');

+

+		if ($hide_region_part && $hide_country_part) {

+			if (isset($location_terms['gd_country']))

+				unset($location_terms['gd_country']);

+			if (isset($location_terms['gd_region']))

+				unset($location_terms['gd_region']);

+		} else if ($hide_region_part && !$hide_country_part) {

+			if (isset($location_terms['gd_region']))

+				unset($location_terms['gd_region']);

+		} else if (!$hide_region_part && $hide_country_part) {

+			if (isset($location_terms['gd_country']))

+				unset($location_terms['gd_country']);

+		}

+	}

 

-    return $location_terms;

+	return $location_terms;

 }
\ No newline at end of file

Spacing +226 added lines, -226 removed lines

@@ -156,7 +156,7 @@ 
 

         $add_listing_link = get_page_link(geodir_add_listing_page_id());

 

-        return esc_url( add_query_arg(array('listing_type' => $post_type), $add_listing_link) );

+        return esc_url(add_query_arg(array('listing_type' => $post_type), $add_listing_link));

     } else

         return get_bloginfo('url');

 }

@@ -248,7 +248,7 @@ 
 function geodir_is_page($gdpage = '')

 {

 

-    global $wp_query, $post,$wp;

+    global $wp_query, $post, $wp;

     //if(!is_admin()):

 

     switch ($gdpage):

@@ -304,8 +304,8 @@ 
             if (is_author() && isset($_REQUEST['geodir_dashbord']))

                 return true;

 			

-			if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int)bp_loggedin_user_id()) {

-				if (((bool)bp_is_current_component('listings') || (bool)bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int)bp_displayed_user_id()) {

+			if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int) bp_loggedin_user_id()) {

+				if (((bool) bp_is_current_component('listings') || (bool) bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int) bp_displayed_user_id()) {

 					return true;

 				}

 			}

@@ -358,7 +358,7 @@ 
         if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array('preview', 'page', 'paged', 'cpage'))) {

             if (get_option('geodir_set_as_home'))

                 $wp->query_vars['gd_is_geodir_page'] = true;

-            if(geodir_is_page('home')){

+            if (geodir_is_page('home')) {

                 $wp->query_vars['gd_is_geodir_page'] = true;

             }

 

@@ -410,7 +410,7 @@ 
 

         if (!isset($wp->query_vars['gd_is_geodir_page'])) {

             $geodir_taxonomis = geodir_get_taxonomies('', true);

-            if(!empty($geodir_taxonomis)){

+            if (!empty($geodir_taxonomis)) {

                 foreach ($geodir_taxonomis as $taxonomy) {

                     if (array_key_exists($taxonomy, $wp->query_vars)) {

                         $wp->query_vars['gd_is_geodir_page'] = true;

@@ -430,10 +430,10 @@ 
 

 

 //check if homepage

-        if(!isset($wp->query_vars['gd_is_geodir_page'])

+        if (!isset($wp->query_vars['gd_is_geodir_page'])

             && !isset($wp->query_vars['page_id'])

             && !isset($wp->query_vars['pagename'])

-            && is_page_geodir_home()){

+            && is_page_geodir_home()) {

             $wp->query_vars['gd_is_geodir_page'] = true;

         }

         //echo $wp->query_vars['gd_is_geodir_page'] ;

@@ -534,7 +534,7 @@ 
     function createRandomString()

     {

         $chars = "abcdefghijkmlnopqrstuvwxyz1023456789";

-        srand((double)microtime() * 1000000);

+        srand((double) microtime() * 1000000);

         $i = 0;

         $rstring = '';

         while ($i <= 25) {

@@ -668,11 +668,11 @@ 
         }

 		

 		if (!empty($subject)) {

-			$subject = __(stripslashes_deep($subject),'geodirectory');

+			$subject = __(stripslashes_deep($subject), 'geodirectory');

 		}

 		

 		if (!empty($message)) {

-			$message = __(stripslashes_deep($message),'geodirectory');

+			$message = __(stripslashes_deep($message), 'geodirectory');

 		}

 

         $to_message = nl2br($to_message);

@@ -707,12 +707,12 @@ 
             $fromEmailName = get_option('site_email_name');

         }

 

-        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]','[#from_email#]','[#user_login#]','[#username#]');

-        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName, $posted_date,$fromEmail, $user_login, $user_login);

+        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]', '[#from_email#]', '[#user_login#]', '[#username#]');

+        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName, $posted_date, $fromEmail, $user_login, $user_login);

         $message = str_replace($search_array, $replace_array, $message);

 

-        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]','[#from_email#]','[#user_login#]','[#username#]');

-        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName, $posted_date,$fromEmail, $user_login, $user_login);

+        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]', '[#from_email#]', '[#user_login#]', '[#username#]');

+        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName, $posted_date, $fromEmail, $user_login, $user_login);

         $subject = str_replace($search_array, $replace_array, $subject);

 

         $headers = 'MIME-Version: 1.0' . "\r\n";

@@ -723,18 +723,18 @@ 
         $to = $toEmail;

         $sent = wp_mail($to, $subject, $message, $headers);

 

-        if( ! $sent ) {

-            if ( is_array( $to ) ) {

-                $to = implode( ',', $to );

+        if (!$sent) {

+            if (is_array($to)) {

+                $to = implode(',', $to);

             }

             $log_message = sprintf(

-                __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+                __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

                 $message_type,

-                date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+                date_i18n('F j Y H:i:s', current_time('timestamp')),

                 $to,

                 $subject

             );

-            geodir_error_log( $log_message );

+            geodir_error_log($log_message);

         }

 

         ///////// ADMIN BCC EMIALS

@@ -746,11 +746,11 @@ 
             $subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');

             $message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');

 

-            $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]','[#user_login#]','[#username#]');

+            $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]', '[#user_login#]', '[#username#]');

             $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName, $posted_date, $user_login, $user_login);

             $message = str_replace($search_array, $replace_array, $message);

 

-            $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]','[#user_login#]','[#username#]');

+            $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]', '[#user_login#]', '[#username#]');

             $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName, $posted_date, $user_login, $user_login);

             $subject = str_replace($search_array, $replace_array, $subject);

 

@@ -775,21 +775,21 @@ 
             $admin_bcc = true;

         }

 

-        if($admin_bcc===true){

+        if ($admin_bcc === true) {

             $sent = wp_mail($to, $subject, $message, $headers);

 

-            if( ! $sent ) {

-                if ( is_array( $to ) ) {

-                    $to = implode( ',', $to );

+            if (!$sent) {

+                if (is_array($to)) {

+                    $to = implode(',', $to);

                 }

                 $log_message = sprintf(

-                    __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+                    __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

                     $message_type,

-                    date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+                    date_i18n('F j Y H:i:s', current_time('timestamp')),

                     $to,

                     $subject

                 );

-                geodir_error_log( $log_message );

+                geodir_error_log($log_message);

             }

         }

 

@@ -884,7 +884,7 @@ 
             $location_manager = defined('POST_LOCATION_TABLE') ? true : false;

 			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

 				

-			if(geodir_is_page('detail') && isset($post->country_slug)){

+			if (geodir_is_page('detail') && isset($post->country_slug)) {

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

@@ -1139,7 +1139,7 @@ 
             $breadcrumb .= stripslashes_deep($page_title);

             $breadcrumb .= '</li>';

         } else if (is_tag()) {

-            $breadcrumb .=  "<li> " . $separator . single_tag_title('',false) . '</li>';

+            $breadcrumb .= "<li> " . $separator . single_tag_title('', false) . '</li>';

         } else if (is_day()) {

             $breadcrumb .= "<li> " . $separator . __(" Archive for", 'geodirectory') . " ";

             the_time('F jS, Y');

@@ -1231,7 +1231,7 @@ 
         return new WP_Error('upload_dir_error', $upload['error']);

 

     // fetch the remote url and write it to the placeholder file

-    $headers = wp_remote_get($url, array('stream' => true,'filename' => $upload['file']));

+    $headers = wp_remote_get($url, array('stream' => true, 'filename' => $upload['file']));

 

     $log_message = '';

     $filesize = filesize($upload['file']);

@@ -1244,16 +1244,16 @@ 
         $log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));

     }

     elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {

-        $log_message =  __('Remote file is incorrect size', 'geodirectory');

+        $log_message = __('Remote file is incorrect size', 'geodirectory');

     }

     elseif (0 == $filesize) {

         $log_message = __('Zero size file downloaded', 'geodirectory');

     }

 

-    if($log_message){

+    if ($log_message) {

         $del = unlink($upload['file']);

-        if(!$del){geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));}

-        return new WP_Error('import_file_error',$log_message );

+        if (!$del) {geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory')); }

+        return new WP_Error('import_file_error', $log_message);

     }

 

 

@@ -1269,10 +1269,10 @@ 
  */

 function geodir_max_upload_size()

 {

-    $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+    $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);

 

     if ($max_filesize > 0 && $max_filesize < 1) {

-        $max_filesize = (int)($max_filesize * 1024) . 'kb';

+        $max_filesize = (int) ($max_filesize * 1024) . 'kb';

     } else {

         $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

     }

@@ -1341,35 +1341,35 @@ 
     {

         global $wpdb;

         if ($message_type == 'expiration') {

-            $subject = stripslashes(__(get_option('renew_email_subject'),'geodirectory'));

-            $client_message = stripslashes(__(get_option('renew_email_content'),'geodirectory'));

+            $subject = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));

+            $client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));

         } elseif ($message_type == 'post_submited') {

-            $subject = __(get_option('post_submited_success_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('post_submited_success_email_content_admin'),'geodirectory');

+            $subject = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');

+            $client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');

         } elseif ($message_type == 'renew') {

-            $subject = __(get_option('post_renew_success_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('post_renew_success_email_content_admin'),'geodirectory');

+            $subject = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');

+            $client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');

         } elseif ($message_type == 'upgrade') {

-            $subject = __(get_option('post_upgrade_success_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('post_upgrade_success_email_content_admin'),'geodirectory');

+            $subject = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');

+            $client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');

         } elseif ($message_type == 'claim_approved') {

-            $subject = __(get_option('claim_approved_email_subject'),'geodirectory');

-            $client_message = __(get_option('claim_approved_email_content'),'geodirectory');

+            $subject = __(get_option('claim_approved_email_subject'), 'geodirectory');

+            $client_message = __(get_option('claim_approved_email_content'), 'geodirectory');

         } elseif ($message_type == 'claim_rejected') {

-            $subject = __(get_option('claim_rejected_email_subject'),'geodirectory');

-            $client_message = __(get_option('claim_rejected_email_content'),'geodirectory');

+            $subject = __(get_option('claim_rejected_email_subject'), 'geodirectory');

+            $client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');

         } elseif ($message_type == 'claim_requested') {

-            $subject = __(get_option('claim_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('claim_email_content_admin'),'geodirectory');

+            $subject = __(get_option('claim_email_subject_admin'), 'geodirectory');

+            $client_message = __(get_option('claim_email_content_admin'), 'geodirectory');

         } elseif ($message_type == 'auto_claim') {

-            $subject = __(get_option('auto_claim_email_subject'),'geodirectory');

-            $client_message = __(get_option('auto_claim_email_content'),'geodirectory');

+            $subject = __(get_option('auto_claim_email_subject'), 'geodirectory');

+            $client_message = __(get_option('auto_claim_email_content'), 'geodirectory');

         } elseif ($message_type == 'payment_success') {

-            $subject = __(get_option('post_payment_success_admin_email_subject'),'geodirectory');

-            $client_message = __(get_option('post_payment_success_admin_email_content'),'geodirectory');

+            $subject = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');

+            $client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');

         } elseif ($message_type == 'payment_fail') {

-            $subject = __(get_option('post_payment_fail_admin_email_subject'),'geodirectory');

-            $client_message = __(get_option('post_payment_fail_admin_email_content'),'geodirectory');

+            $subject = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');

+            $client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');

         }

         $transaction_details = $custom_1;

         $fromEmail = get_option('site_email');

@@ -1410,18 +1410,18 @@ 
         $to = $fromEmail;

         $message = $client_message;

         $sent = wp_mail($to, $subject, $message, $headers);

-        if( ! $sent ) {

-            if ( is_array( $to ) ) {

-                $to = implode( ',', $to );

+        if (!$sent) {

+            if (is_array($to)) {

+                $to = implode(',', $to);

             }

             $log_message = sprintf(

-                __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+                __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

                 $message_type,

-                date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+                date_i18n('F j Y H:i:s', current_time('timestamp')),

                 $to,

                 $subject

             );

-            geodir_error_log( $log_message );

+            geodir_error_log($log_message);

         }

     }

 }

@@ -1447,18 +1447,18 @@ 
     {

         $login_details = '';

         if ($message_type == 'send_friend') {

-            $subject = stripslashes(__(get_option('email_friend_subject'),'geodirectory'));

-            $message = stripslashes(__(get_option('email_friend_content'),'geodirectory'));

+            $subject = stripslashes(__(get_option('email_friend_subject'), 'geodirectory'));

+            $message = stripslashes(__(get_option('email_friend_content'), 'geodirectory'));

         } elseif ($message_type == 'send_enquiry') {

-            $subject = __(get_option('email_enquiry_subject'),'geodirectory');

-            $message = __(get_option('email_enquiry_content'),'geodirectory');

+            $subject = __(get_option('email_enquiry_subject'), 'geodirectory');

+            $message = __(get_option('email_enquiry_content'), 'geodirectory');

         } elseif ($message_type == 'forgot_password') {

-            $subject = __(get_option('forgot_password_subject'),'geodirectory');

-            $message = __(get_option('forgot_password_content'),'geodirectory');

+            $subject = __(get_option('forgot_password_subject'), 'geodirectory');

+            $message = __(get_option('forgot_password_content'), 'geodirectory');

             $login_details = $to_message;

         } elseif ($message_type == 'registration') {

-            $subject = __(get_option('registration_success_email_subject'),'geodirectory');

-            $message = __(get_option('registration_success_email_content'),'geodirectory');

+            $subject = __(get_option('registration_success_email_subject'), 'geodirectory');

+            $message = __(get_option('registration_success_email_content'), 'geodirectory');

             $login_details = $to_message;

         }

         $to_message = nl2br($to_message);

@@ -1492,18 +1492,18 @@ 
         $to = $toEmail;

 

         $sent = wp_mail($to, $subject, $message, $headers);

-        if( ! $sent ) {

-            if ( is_array( $to ) ) {

-                $to = implode( ',', $to );

+        if (!$sent) {

+            if (is_array($to)) {

+                $to = implode(',', $to);

             }

             $log_message = sprintf(

-                __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+                __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

                 $message_type,

-                date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+                date_i18n('F j Y H:i:s', current_time('timestamp')),

                 $to,

                 $subject

             );

-            geodir_error_log( $log_message );

+            geodir_error_log($log_message);

         }

 

         ///////// ADMIN BCC EMIALS

@@ -1529,20 +1529,20 @@ 
             $admin_bcc = true;

         }

 

-        if($admin_bcc === true){

+        if ($admin_bcc === true) {

             $sent = wp_mail($to, $subject, $message, $headers);

-            if( ! $sent ) {

-                if ( is_array( $to ) ) {

-                    $to = implode( ',', $to );

+            if (!$sent) {

+                if (is_array($to)) {

+                    $to = implode(',', $to);

                 }

                 $log_message = sprintf(

-                    __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+                    __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

                     $message_type,

-                    date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+                    date_i18n('F j Y H:i:s', current_time('timestamp')),

                     $to,

                     $subject

                 );

-                geodir_error_log( $log_message );

+                geodir_error_log($log_message);

             }

         }

 

@@ -1590,7 +1590,7 @@ 
 function geodir_custom_posts_body_class($classes) {

     global $wpdb, $wp;

     $post_types = geodir_get_posttypes('object');

-    if (!empty($post_types) && count((array)$post_types) > 1) {

+    if (!empty($post_types) && count((array) $post_types) > 1) {

         $classes[] = 'geodir_custom_posts';

     }

 

@@ -1884,7 +1884,7 @@ 
         $sql = "SELECT COUNT(" . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . "

 			" . $join . "

 			" . $where;

-        $rows = (int)$wpdb->get_var($sql);

+        $rows = (int) $wpdb->get_var($sql);

     } else {

         $orderby = geodir_widget_listings_get_order($query_args);

         /**

@@ -1910,10 +1910,10 @@ 
         $limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);

 

         $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1;

-        if ( !$page )

+        if (!$page)

             $page = 1;

 

-        $limit = (int)$limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int)$limit ) . ", " . (int)$limit : "";

+        $limit = (int) $limit > 0 ? " LIMIT " . absint(($page - 1) * (int) $limit) . ", " . (int) $limit : "";

 

         $sql = "SELECT SQL_CALC_FOUND_ROWS " . $fields . " FROM " . $wpdb->posts . "

 			" . $join . "

@@ -2028,7 +2028,7 @@ 
         }

 

         if (!empty($query_args['post_author'])) {

-            $where .= " AND " . $wpdb->posts . ".post_author = " . (int)$query_args['post_author'];

+            $where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author'];

         }

         

         if (!empty($query_args['show_featured_only'])) {

@@ -2114,7 +2114,7 @@ 
     }

 

     if (!empty($query_args) && !empty($query_args['posts_per_page'])) {

-        $limit = (int)$query_args['posts_per_page'];

+        $limit = (int) $query_args['posts_per_page'];

     }

 

     return $limit;

@@ -2257,9 +2257,9 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

     }

     $home_url = str_replace("www.", "", $home_url);

-    if ( (strpos($home_url, $cur_url) !== false || strpos($home_url . '/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front')==get_option('geodir_home_page')) ) {

+    if ((strpos($home_url, $cur_url) !== false || strpos($home_url . '/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page'))) {

         return true;

-    }elseif(get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front')==get_option('geodir_home_page')){

+    }elseif (get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page')) {

         return true;

     } else {

         return false;

@@ -2342,7 +2342,7 @@ 
 

     $gd_post_type = geodir_get_current_posttype();

 

-    $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int)$instance['category_limit'] : 15;

+    $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15;

     $default_post_type = !empty($gd_post_type) ? $gd_post_type : (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type']) ? $instance['default_post_type'] : '');

 

     $taxonomy = array();

@@ -2375,14 +2375,14 @@ 
             foreach ($b_terms as $key => $val) {

                 $ptype = get_post_type_object(str_replace("category", "", $key));

                 $cpt_name = __($ptype->labels->singular_name, 'geodirectory');

-                $tax_change_output .= "<option value='$key' ". selected($key, $default_taxonomy, false) .">" . sprintf(__('%s Categories', 'geodirectory'),$cpt_name) . "</option>";

+                $tax_change_output .= "<option value='$key' " . selected($key, $default_taxonomy, false) . ">" . sprintf(__('%s Categories', 'geodirectory'), $cpt_name) . "</option>";

             }

             $tax_change_output .= "</select>";

         }

 

         if (!empty($b_terms)) {

-            $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms);// get the first array

-            global $cat_count;//make global so we can change via function

+            $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array

+            global $cat_count; //make global so we can change via function

             $cat_count = 0;

             ?>

             <div class="geodir-category-list-in clearfix">

@@ -2446,7 +2446,7 @@ 
         $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show';

         $total_post = $cat->count;

 

-        $term_link = get_term_link( $cat, $cat->taxonomy );

+        $term_link = get_term_link($cat, $cat->taxonomy);

         /**

          * Filer the category term link.

          *

@@ -2455,7 +2455,7 @@ 
          * @param int    $cat->term_id The term id.

          * @param string $post_type Wordpress post type.

          */

-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type );

+        $term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);

 

         echo '<li class="' . $class_row . '"><a href="' . $term_link . '">';

         echo '<img alt="' . esc_attr($cat->name) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';

@@ -2589,29 +2589,29 @@ 
                 itemWidth: 75,

                 itemMargin: 5,

                 asNavFor: '#geodir_widget_slider',

-                rtl: <?php echo ( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>

+                rtl: <?php echo (is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>

             });

 

             jQuery('#geodir_widget_slider').flexslider({

-                animation: "<?php echo $animation;?>",

+                animation: "<?php echo $animation; ?>",

                 selector: ".geodir-slides > li",

                 namespace: "geodir-",

                 controlNav: true,

-                animationLoop: <?php echo $animationLoop;?>,

-                slideshow: <?php echo $slideshow;?>,

-                slideshowSpeed: <?php echo $slideshowSpeed;?>,

-                animationSpeed: <?php echo $animationSpeed;?>,

-                directionNav: <?php echo $directionNav;?>,

-                maxItems: <?php echo $max_show;?>,

+                animationLoop: <?php echo $animationLoop; ?>,

+                slideshow: <?php echo $slideshow; ?>,

+                slideshowSpeed: <?php echo $slideshowSpeed; ?>,

+                animationSpeed: <?php echo $animationSpeed; ?>,

+                directionNav: <?php echo $directionNav; ?>,

+                maxItems: <?php echo $max_show; ?>,

                 move: 1,

-                <?php if($slide_width){ echo "itemWidth: ".$slide_width.",";}?>

+                <?php if ($slide_width) { echo "itemWidth: " . $slide_width . ","; }?>

                 sync: "#geodir_widget_carousel",

                 start: function (slider) {

                     jQuery('.geodir-listing-flex-loader').hide();

                     jQuery('#geodir_widget_slider').css({'visibility': 'visible'});

                     jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});

                 },

-                rtl: <?php echo ( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>

+                rtl: <?php echo (is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>

             });

         });

     </script>

@@ -2652,7 +2652,7 @@ 
 

         global $post;

 

-        $current_post = $post;// keep current post info

+        $current_post = $post; // keep current post info

 

         $widget_main_slides = '';

         $nav_slides = '';

@@ -3095,7 +3095,7 @@ 
             $geodir_add_location_url = '1';

         }

 

-        $viewall_url = get_term_link((int)$category[0], $post_type . 'category');

+        $viewall_url = get_term_link((int) $category[0], $post_type . 'category');

 

         $geodir_add_location_url = NULL;

     }

@@ -3103,7 +3103,7 @@ 
         $gd_session->set('gd_multi_location', 1);

     }

 

-    if(is_wp_error( $viewall_url  )){$viewall_url = '';}

+    if (is_wp_error($viewall_url)) {$viewall_url = ''; }

 

     $query_args = array(

         'posts_per_page' => $post_number,

@@ -3341,14 +3341,14 @@ 
  * @package GeoDirectory

  * @return bool

  */

-function geodir_term_review_count_force_update($new_status, $old_status='', $post='')

+function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '')

 {

-    if(isset($_REQUEST['action']) && $_REQUEST['action']=='geodir_import_export'){return;}//do not run if importing listings

+    if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {return; }//do not run if importing listings

 

-    if(isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')){

+    if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {

         return;

     }

-    if($new_status!=$old_status) {

+    if ($new_status != $old_status) {

         geodir_count_reviews_by_terms(true);

     }

     return true;

@@ -3513,7 +3513,7 @@ 
          */

         try {

             require_once($language_file);

-        } catch(Exception $e) {

+        } catch (Exception $e) {

             error_log('Language Error: ' . $e->getMessage());

         }

     }

@@ -3531,18 +3531,18 @@ 
  */

 function geodirectory_load_db_language() {

     global $wp_filesystem;

-    if( empty( $wp_filesystem ) ) {

-        require_once( ABSPATH .'/wp-admin/includes/file.php' );

+    if (empty($wp_filesystem)) {

+        require_once(ABSPATH . '/wp-admin/includes/file.php');

         WP_Filesystem();

         global $wp_filesystem;

     }

 

     $language_file = geodir_plugin_path() . '/db-language.php';

 

-    if(is_file($language_file) && !is_writable($language_file))

+    if (is_file($language_file) && !is_writable($language_file))

         return false; // Not possible to create.

 

-    if(!is_file($language_file) && !is_writable(dirname($language_file)))

+    if (!is_file($language_file) && !is_writable(dirname($language_file)))

         return false; // Not possible to create.

 

     $contents_strings = array();

@@ -3576,7 +3576,7 @@ 
     $contents = implode(PHP_EOL, $contents_head);

 

     if (!empty($contents_strings)) {

-        foreach ( $contents_strings as $string ) {

+        foreach ($contents_strings as $string) {

             if (is_scalar($string) && $string != '') {

                 $string = str_replace("'", "\'", $string);

                 $contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";

@@ -3586,7 +3586,7 @@ 
 

     $contents .= implode(PHP_EOL, $contents_foot);

 

-    if($wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE))

+    if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE))

         return false; // Failure; could not write file.

 

     return true;

@@ -3612,7 +3612,7 @@ 
     $rows = $wpdb->get_results($sql);

 

     if (!empty($rows)) {

-        foreach($rows as $row) {

+        foreach ($rows as $row) {

             if (!empty($row->admin_title))

                 $translation_texts[] = stripslashes_deep($row->admin_title);

 			

@@ -3650,7 +3650,7 @@ 
     $rows = $wpdb->get_results($sql);

 

     if (!empty($rows)) {

-        foreach($rows as $row) {

+        foreach ($rows as $row) {

             if (!empty($row->site_title))

                 $translation_texts[] = stripslashes_deep($row->site_title);

 

@@ -3668,7 +3668,7 @@ 
 		$rows = $wpdb->get_results($sql);

 

 		if (!empty($rows)) {

-			foreach($rows as $row) {

+			foreach ($rows as $row) {

 				if (!empty($row->field_site_name))

 					$translation_texts[] = stripslashes_deep($row->field_site_name);

 

@@ -3703,7 +3703,7 @@ 
      *

      * @param array $geodir_allowed_mime_types and file extensions.

      */

-    return apply_filters( 'geodir_allowed_mime_types', array(

+    return apply_filters('geodir_allowed_mime_types', array(

             'Image' => array( // Image formats.

                 'jpg' => 'image/jpeg',

                 'jpe' => 'image/jpeg',

@@ -3792,13 +3792,13 @@ 
 

 

 

-add_filter('wpseo_replacements','geodir_wpseo_replacements',10,1);

+add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);

 /*

  * Add location variables to wpseo replacements.

  *

  * @since 1.5.4

  */

-function geodir_wpseo_replacements($vars){

+function geodir_wpseo_replacements($vars) {

 

     global $wp;

     $title = '';

@@ -3813,12 +3813,12 @@ 
      * @param array $location_array The array of location variables.

      * @param array $vars The page title variables.

      */

-    $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo',$location_array, $vars);

+    $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);

     $location_titles = array();

-    if(get_query_var( 'gd_country_full' )){

-        if(get_query_var( 'gd_country_full' )){$location_array['gd_country'] = get_query_var( 'gd_country_full' );}

-        if(get_query_var( 'gd_region_full' )){$location_array['gd_region'] = get_query_var( 'gd_region_full' );}

-        if(get_query_var( 'gd_city_full' )){$location_array['gd_city'] = get_query_var( 'gd_city_full' );}

+    if (get_query_var('gd_country_full')) {

+        if (get_query_var('gd_country_full')) {$location_array['gd_country'] = get_query_var('gd_country_full'); }

+        if (get_query_var('gd_region_full')) {$location_array['gd_region'] = get_query_var('gd_region_full'); }

+        if (get_query_var('gd_city_full')) {$location_array['gd_city'] = get_query_var('gd_city_full'); }

     }

     $location_single = '';

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

@@ -3890,23 +3890,23 @@ 
     }

 

 

-    if(!empty($location_titles)) {

+    if (!empty($location_titles)) {

         $vars['%%location%%'] = implode(", ", $location_titles);

     }

 

 

-    if(!empty($location_titles)) {

+    if (!empty($location_titles)) {

         $vars['%%in_location%%'] = __('in ', 'geodirectory') . implode(", ", $location_titles);

     }

 

 

 

-    if($location_single) {

-        $vars['%%in_location_single%%'] = __('in', 'geodirectory') . ' ' .$location_single;

+    if ($location_single) {

+        $vars['%%in_location_single%%'] = __('in', 'geodirectory') . ' ' . $location_single;

     }

 

 

-    if($location_single) {

+    if ($location_single) {

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

     }

 

@@ -3918,17 +3918,17 @@ 
      * @param string $vars The title with variables.

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

      */

-    return apply_filters('geodir_wpseo_replacements_vars',$vars,$location_array);

+    return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);

 }

 

 

-add_filter('geodir_seo_meta_title','geodir_filter_title_variables',10,3);

-add_filter('geodir_seo_page_title','geodir_filter_title_variables',10,2);

-add_filter('geodir_seo_meta_description_pre','geodir_filter_title_variables',10,3);

-function geodir_filter_title_variables($title, $gd_page, $sep=''){

+add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);

+add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);

+add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);

+function geodir_filter_title_variables($title, $gd_page, $sep = '') {

 

 

-    if(!$gd_page || !$title){return $title;}// if no a GD page then bail.

+    if (!$gd_page || !$title) {return $title; }// if no a GD page then bail.

     global $post;

     //print_r($post);

     /*

@@ -3970,119 +3970,119 @@ 
     }

 

 

-    if(strpos($title,'%%title%%') !== false){

-        $title = str_replace("%%title%%",$post->post_title,$title);

+    if (strpos($title, '%%title%%') !== false) {

+        $title = str_replace("%%title%%", $post->post_title, $title);

     }

 

-    if(strpos($title,'%%sitename%%') !== false){

-        $title = str_replace("%%sitename%%",get_bloginfo('name'),$title);

+    if (strpos($title, '%%sitename%%') !== false) {

+        $title = str_replace("%%sitename%%", get_bloginfo('name'), $title);

     }

 

-    if(strpos($title,'%%sitedesc%%') !== false){

-        $title = str_replace("%%sitedesc%%",get_bloginfo('description'),$title);

+    if (strpos($title, '%%sitedesc%%') !== false) {

+        $title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);

     }

 

-    if(strpos($title,'%%excerpt%%') !== false){

-        $title = str_replace("%%excerpt%%",strip_tags(get_the_excerpt()),$title);

+    if (strpos($title, '%%excerpt%%') !== false) {

+        $title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);

     }

 

-    if(strpos($title,'%%pt_single%%') !== false){

+    if (strpos($title, '%%pt_single%%') !== false) {

         $single_name = '';

-        if($gd_page=='search' || $gd_page=='author'){

+        if ($gd_page == 'search' || $gd_page == 'author') {

             $geodir_post_types = get_option('geodir_post_types');

             $spt = esc_attr($_REQUEST['stype']);

-            if(isset($geodir_post_types[$spt]['labels']['singular_name'])){

-                $single_name = __($geodir_post_types[$spt]['labels']['singular_name'],'geodirectory');

+            if (isset($geodir_post_types[$spt]['labels']['singular_name'])) {

+                $single_name = __($geodir_post_types[$spt]['labels']['singular_name'], 'geodirectory');

             }

-        }elseif($gd_page=='add-listing'){

+        }elseif ($gd_page == 'add-listing') {

             $geodir_post_types = get_option('geodir_post_types');

             $spt = isset($_REQUEST['listing_type']) ? esc_attr($_REQUEST['listing_type']) : '';

-            if(!$spt && isset($_REQUEST['pid'])){

-                $spt = get_post_type( $_REQUEST['pid'] );

+            if (!$spt && isset($_REQUEST['pid'])) {

+                $spt = get_post_type($_REQUEST['pid']);

             }

-            if(!$spt){$spt='gd_place';}

-            if(isset($geodir_post_types[$spt]['labels']['singular_name'])){

-                $single_name = __($geodir_post_types[$spt]['labels']['singular_name'],'geodirectory');

+            if (!$spt) {$spt = 'gd_place'; }

+            if (isset($geodir_post_types[$spt]['labels']['singular_name'])) {

+                $single_name = __($geodir_post_types[$spt]['labels']['singular_name'], 'geodirectory');

             }

         }

-        elseif($post->post_type){

+        elseif ($post->post_type) {

             $geodir_post_types = get_option('geodir_post_types');

-            if(isset($geodir_post_types[$post->post_type]['labels']['singular_name'])){

-                $single_name = __($geodir_post_types[$post->post_type]['labels']['singular_name'],'geodirectory');

+            if (isset($geodir_post_types[$post->post_type]['labels']['singular_name'])) {

+                $single_name = __($geodir_post_types[$post->post_type]['labels']['singular_name'], 'geodirectory');

             }

 

 

         }

-        $title = str_replace("%%pt_single%%",$single_name,$title);

+        $title = str_replace("%%pt_single%%", $single_name, $title);

     }

 

-    if(strpos($title,'%%pt_plural%%') !== false){

+    if (strpos($title, '%%pt_plural%%') !== false) {

         $plural_name = '';

-        if($gd_page=='search' || $gd_page=='author'){

+        if ($gd_page == 'search' || $gd_page == 'author') {

             $geodir_post_types = get_option('geodir_post_types');

             $spt = esc_attr($_REQUEST['stype']);

-            if(isset($geodir_post_types[$spt]['labels']['name'])){

-                $plural_name = __($geodir_post_types[$spt]['labels']['name'],'geodirectory');

+            if (isset($geodir_post_types[$spt]['labels']['name'])) {

+                $plural_name = __($geodir_post_types[$spt]['labels']['name'], 'geodirectory');

             }

-        }elseif($gd_page=='add-listing'){

+        }elseif ($gd_page == 'add-listing') {

             $geodir_post_types = get_option('geodir_post_types');

             $spt = sanitize_text_field($_REQUEST['listing_type']);

-            if(!$spt){$spt='gd_place';}

-            if(isset($geodir_post_types[$spt]['labels']['name'])){

-                $plural_name = __($geodir_post_types[$spt]['labels']['name'],'geodirectory');

+            if (!$spt) {$spt = 'gd_place'; }

+            if (isset($geodir_post_types[$spt]['labels']['name'])) {

+                $plural_name = __($geodir_post_types[$spt]['labels']['name'], 'geodirectory');

             }

         }

-        elseif(isset($post->post_type) && $post->post_type){

+        elseif (isset($post->post_type) && $post->post_type) {

             $geodir_post_types = get_option('geodir_post_types');

-            if(isset($geodir_post_types[$post->post_type]['labels']['name'])){

-                $plural_name = __($geodir_post_types[$post->post_type]['labels']['name'],'geodirectory');

+            if (isset($geodir_post_types[$post->post_type]['labels']['name'])) {

+                $plural_name = __($geodir_post_types[$post->post_type]['labels']['name'], 'geodirectory');

             }

 

         }

-        $title = str_replace("%%pt_plural%%",$plural_name,$title);

+        $title = str_replace("%%pt_plural%%", $plural_name, $title);

     }

 

 

 

-    if(strpos($title,'%%category%%') !== false){

+    if (strpos($title, '%%category%%') !== false) {

         $cat_name = '';

 

-        if($gd_page=='detail') {

+        if ($gd_page == 'detail') {

             if ($post->default_category) {

                 $cat = get_term($post->default_category, $post->post_type . 'category');

                 $cat_name = (isset($cat->name)) ? $cat->name : '';

             }

-        }elseif($gd_page=='listing'){

+        }elseif ($gd_page == 'listing') {

             $queried_object = get_queried_object();

-            if(isset($queried_object->name)){

+            if (isset($queried_object->name)) {

                 $cat_name = $queried_object->name;

             }

         }

-        $title = str_replace("%%category%%",$cat_name,$title);

+        $title = str_replace("%%category%%", $cat_name, $title);

     }

 

-    if(strpos($title,'%%tag%%') !== false){

+    if (strpos($title, '%%tag%%') !== false) {

         $cat_name = '';

 

-        if($gd_page=='detail') {

+        if ($gd_page == 'detail') {

             if ($post->default_category) {

                 $cat = get_term($post->default_category, $post->post_type . 'category');

                 $cat_name = (isset($cat->name)) ? $cat->name : '';

             }

-        }elseif($gd_page=='listing'){

+        }elseif ($gd_page == 'listing') {

             $queried_object = get_queried_object();

-            if(isset($queried_object->name)){

+            if (isset($queried_object->name)) {

                 $cat_name = $queried_object->name;

             }

         }

-        $title = str_replace("%%tag%%",$cat_name,$title);

+        $title = str_replace("%%tag%%", $cat_name, $title);

     }

 

 

 

-    if(strpos($title,'%%id%%') !== false){

+    if (strpos($title, '%%id%%') !== false) {

         $ID = (isset($post->ID)) ? $post->ID : '';

-        $title = str_replace("%%id%%",$ID,$title);

+        $title = str_replace("%%id%%", $ID, $title);

     }

 

     /*

@@ -4095,8 +4095,8 @@ 
         }

     */

 

-    if(strpos($title,'%%sep%%') !== false){

-        $title = str_replace("%%sep%%",$sep,$title);

+    if (strpos($title, '%%sep%%') !== false) {

+        $title = str_replace("%%sep%%", $sep, $title);

     }

 

 

@@ -4114,12 +4114,12 @@ 
      * @param string $gd_page The page being filtered.

      * @param string $sep The separator, default: `|`.

      */

-    $location_array = apply_filters('geodir_filter_title_variables_location_arr',$location_array,$title, $gd_page, $sep);

+    $location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);

     $location_titles = array();

-    if($gd_page=='location' && get_query_var( 'gd_country_full' )){

-        if(get_query_var( 'gd_country_full' )){$location_array['gd_country'] = get_query_var( 'gd_country_full' );}

-        if(get_query_var( 'gd_region_full' )){$location_array['gd_region'] = get_query_var( 'gd_region_full' );}

-        if(get_query_var( 'gd_city_full' )){$location_array['gd_city'] = get_query_var( 'gd_city_full' );}

+    if ($gd_page == 'location' && get_query_var('gd_country_full')) {

+        if (get_query_var('gd_country_full')) {$location_array['gd_country'] = get_query_var('gd_country_full'); }

+        if (get_query_var('gd_region_full')) {$location_array['gd_region'] = get_query_var('gd_region_full'); }

+        if (get_query_var('gd_city_full')) {$location_array['gd_city'] = get_query_var('gd_city_full'); }

     }

     $location_single = '';

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

@@ -4191,65 +4191,65 @@ 
     }

 

 

-    if(strpos($title,'%%location%%') !== false){

+    if (strpos($title, '%%location%%') !== false) {

         $location = '';

-        if($location_titles) {

+        if ($location_titles) {

             $location = implode(", ", $location_titles);

         }

-        $title = str_replace("%%location%%",$location,$title);

+        $title = str_replace("%%location%%", $location, $title);

     }

 

-    if(strpos($title,'%%in_location%%') !== false){

+    if (strpos($title, '%%in_location%%') !== false) {

         $location = '';

-        if($location_titles) {

+        if ($location_titles) {

             $location = __('in ', 'geodirectory') . implode(", ", $location_titles);

         }

-        $title = str_replace("%%in_location%%",$location,$title);

+        $title = str_replace("%%in_location%%", $location, $title);

     }

 

-    if(strpos($title,'%%in_location_single%%') !== false){

-        if($location_single) {

-            $location_single = __('in', 'geodirectory') . ' ' .$location_single;

+    if (strpos($title, '%%in_location_single%%') !== false) {

+        if ($location_single) {

+            $location_single = __('in', 'geodirectory') . ' ' . $location_single;

         }

-        $title = str_replace("%%in_location_single%%",$location_single,$title);

+        $title = str_replace("%%in_location_single%%", $location_single, $title);

     }

 

-    if(strpos($title,'%%location_single%%') !== false){

-        $title = str_replace("%%location_single%%",$location_single,$title);

+    if (strpos($title, '%%location_single%%') !== false) {

+        $title = str_replace("%%location_single%%", $location_single, $title);

     }

 

 

-    if(strpos($title,'%%search_term%%') !== false){

+    if (strpos($title, '%%search_term%%') !== false) {

         $search_term = '';

-        if(isset($_REQUEST['s'])){

+        if (isset($_REQUEST['s'])) {

             $search_term = esc_attr($_REQUEST['s']);

         }

-        $title = str_replace("%%search_term%%",$search_term,$title);

+        $title = str_replace("%%search_term%%", $search_term, $title);

     }

 

-    if(strpos($title,'%%search_near%%') !== false){

+    if (strpos($title, '%%search_near%%') !== false) {

         $search_term = '';

-        if(isset($_REQUEST['snear'])){

+        if (isset($_REQUEST['snear'])) {

             $search_term = esc_attr($_REQUEST['snear']);

         }

-        $title = str_replace("%%search_near%%",$search_term,$title);

+        $title = str_replace("%%search_near%%", $search_term, $title);

     }

 

-    if(strpos($title,'%%name%%') !== false){

+    if (strpos($title, '%%name%%') !== false) {

         $author_name = '';

-        if($author_name = get_the_author()){}

-        else{

+        if ($author_name = get_the_author()) {}

+        else {

             $queried_object = get_queried_object();

-            if(isset($queried_object->data->user_nicename)){

+            if (isset($queried_object->data->user_nicename)) {

                 $author_name = $queried_object->data->user_nicename;

             }

         }

-        $title = str_replace("%%name%%",$author_name,$title);

+        $title = str_replace("%%name%%", $author_name, $title);

     }

 

-    $title = wptexturize( $title );

-    $title = convert_chars( $title );

-    $title = esc_html( $title );

+    $title = wptexturize($title);

+    $title = convert_chars($title);

+    $title = esc_html($title);

 

     /**

      * Filter the title variables after standard ones have been filtered.

@@ -4262,7 +4262,7 @@ 
      * @param string $sep The separator, default: `|`.

      */

 

-    return apply_filters('geodir_filter_title_variables_vars',$title,$location_array, $gd_page, $sep);

+    return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);

 }

 

 /**

geodirectory-functions/shortcode_functions.php

Indentation +358 added lines, -358 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 /**
- * All shortcode related functions
- *
- * @since 1.0.0
- *
- * @package GeoDirectory
- */
+	 * All shortcode related functions
+	 *
+	 * @since 1.0.0
+	 *
+	 * @package GeoDirectory
+	 */
  
 // If this file is called directly, abort.
 if (!defined('WPINC')) {
-    die;
+	die;
 }
 
 /**
@@ -22,22 +22,22 @@ 
  */
 function gdsc_validate_measurements($value)
 {
-    if ((strlen($value) - 1) == strpos(trim($value), '%')) {
-        // $value is entered as a percent, so it can't be less than 0 or more than 100
-        $value = preg_replace('/\D/', '', $value);
-        if (100 < $value) {
-            $value = 100;
-        }
-        // Re-add the percent symbol
-        $value = $value . '%';
-    } elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
-        // Get the absint & re-add the 'px'
-        $value = preg_replace('/\D/', '', $value) . 'px';
-    } else {
-        $value = preg_replace('/\D/', '', $value);
-    }
-
-    return $value;
+	if ((strlen($value) - 1) == strpos(trim($value), '%')) {
+		// $value is entered as a percent, so it can't be less than 0 or more than 100
+		$value = preg_replace('/\D/', '', $value);
+		if (100 < $value) {
+			$value = 100;
+		}
+		// Re-add the percent symbol
+		$value = $value . '%';
+	} elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
+		// Get the absint & re-add the 'px'
+		$value = preg_replace('/\D/', '', $value) . 'px';
+	} else {
+		$value = preg_replace('/\D/', '', $value);
+	}
+
+	return $value;
 }
 
 /**
@@ -52,35 +52,35 @@ 
 function gdsc_validate_map_args($params)
 {
 
-    $params['width'] = gdsc_validate_measurements($params['width']);
-    $params['height'] = gdsc_validate_measurements($params['height']);
+	$params['width'] = gdsc_validate_measurements($params['width']);
+	$params['height'] = gdsc_validate_measurements($params['height']);
 
-    // Only accept our 4 maptypes. Otherwise, revert to the default.
-    if (!(in_array(geodir_strtoupper($params['maptype']), array('HYBRID', 'SATELLITE', 'ROADMAP', 'TERRAIN')))) {
-        $params['maptype'] = 'ROADMAP';
-    } else {
-        $params['maptype'] = geodir_strtoupper($params['maptype']);
-    }
+	// Only accept our 4 maptypes. Otherwise, revert to the default.
+	if (!(in_array(geodir_strtoupper($params['maptype']), array('HYBRID', 'SATELLITE', 'ROADMAP', 'TERRAIN')))) {
+		$params['maptype'] = 'ROADMAP';
+	} else {
+		$params['maptype'] = geodir_strtoupper($params['maptype']);
+	}
 
-    // Zoom accepts a value between 1 and 19
-    $params['zoom'] = absint($params['zoom']);
-    if (19 < $params['zoom']) {
-        $params['zoom'] = '19';
-    }
-    if (0 == $params['zoom']) {
-        $params['zoom'] = '1';
-    }
+	// Zoom accepts a value between 1 and 19
+	$params['zoom'] = absint($params['zoom']);
+	if (19 < $params['zoom']) {
+		$params['zoom'] = '19';
+	}
+	if (0 == $params['zoom']) {
+		$params['zoom'] = '1';
+	}
 
-    // Child_collapse must be boolean
-    $params['child_collapse'] = gdsc_to_bool_val($params['child_collapse']);
+	// Child_collapse must be boolean
+	$params['child_collapse'] = gdsc_to_bool_val($params['child_collapse']);
 
-    // Scrollwheel must be boolean
-    $params['scrollwheel'] = gdsc_to_bool_val($params['scrollwheel']);
+	// Scrollwheel must be boolean
+	$params['scrollwheel'] = gdsc_to_bool_val($params['scrollwheel']);
 
-    // Scrollwheel must be boolean
-    $params['autozoom'] = gdsc_to_bool_val($params['autozoom']);
+	// Scrollwheel must be boolean
+	$params['autozoom'] = gdsc_to_bool_val($params['autozoom']);
 
-    return $params;
+	return $params;
 }
 
 /**
@@ -99,52 +99,52 @@ 
  */
 function gdsc_to_bool_val($in, $strict = false)
 {
-    $out = null;
-
-    // if not strict, we only have to check if something is false
-    if (in_array($in, array(
-        'false',
-        'False',
-        'FALSE',
-        'no',
-        'No',
-        'n',
-        'N',
-        '0',
-        'off',
-        'Off',
-        'OFF',
-        false,
-        0,
-        null
-    ), true)) {
-        $out = false;
-    } else if ($strict) {
-        // if strict, check the equivalent true values
-        if (in_array($in, array(
-            'true',
-            'True',
-            'TRUE',
-            'yes',
-            'Yes',
-            'y',
-            'Y',
-            '1',
-            'on',
-            'On',
-            'ON',
-            true,
-            1
-        ), true)) {
-            $out = true;
-        }
-    } else {
-        // not strict? let the regular php bool check figure it out (will
-        //     largely default to true)
-        $out = ($in ? true : false);
-    }
-
-    return $out;
+	$out = null;
+
+	// if not strict, we only have to check if something is false
+	if (in_array($in, array(
+		'false',
+		'False',
+		'FALSE',
+		'no',
+		'No',
+		'n',
+		'N',
+		'0',
+		'off',
+		'Off',
+		'OFF',
+		false,
+		0,
+		null
+	), true)) {
+		$out = false;
+	} else if ($strict) {
+		// if strict, check the equivalent true values
+		if (in_array($in, array(
+			'true',
+			'True',
+			'TRUE',
+			'yes',
+			'Yes',
+			'y',
+			'Y',
+			'1',
+			'on',
+			'On',
+			'ON',
+			true,
+			1
+		), true)) {
+			$out = true;
+		}
+	} else {
+		// not strict? let the regular php bool check figure it out (will
+		//     largely default to true)
+		$out = ($in ? true : false);
+	}
+
+	return $out;
 }
 
 /**
@@ -157,16 +157,16 @@ 
  */
 function gdsc_is_post_type_valid($incoming_post_type)
 {
-    $post_types = geodir_get_posttypes();
-    $post_types = array_map('geodir_strtolower', $post_types);
-    $post_type_found = false;
-    foreach ($post_types as $type) {
-        if (geodir_strtolower($incoming_post_type) == geodir_strtolower($type)) {
-            $post_type_found = true;
-        }
-    }
-
-    return $post_type_found;
+	$post_types = geodir_get_posttypes();
+	$post_types = array_map('geodir_strtolower', $post_types);
+	$post_type_found = false;
+	foreach ($post_types as $type) {
+		if (geodir_strtolower($incoming_post_type) == geodir_strtolower($type)) {
+			$post_type_found = true;
+		}
+	}
+
+	return $post_type_found;
 }
 
 /**
@@ -186,52 +186,52 @@ 
  */
 function gdsc_listing_loop_filter($query)
 {
-    global $wp_query, $geodir_post_type, $table, $plugin_prefix, $term;
-
-    $geodir_post_type = geodir_get_current_posttype();
-
-    if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
-        $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');
-
-        if (isset($wp_query->query[$taxonomies[0]])) {
-            $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
-            $request_term = end($request_term);
-            if (!term_exists($request_term)) {
-                $args = array('number' => '1',);
-                $terms_arr = get_terms($taxonomies[0], $args);
-                foreach ($terms_arr as $location_term) {
-                    $term_arr = $location_term;
-                    $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
-                }
-                $wp_query->queried_object_id = 1;
-                $wp_query->queried_object = $term_arr;
-            }
-        }
+	global $wp_query, $geodir_post_type, $table, $plugin_prefix, $term;
+
+	$geodir_post_type = geodir_get_current_posttype();
+
+	if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
+		$taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');
+
+		if (isset($wp_query->query[$taxonomies[0]])) {
+			$request_term = explode("/", $wp_query->query[$taxonomies[0]]);
+			$request_term = end($request_term);
+			if (!term_exists($request_term)) {
+				$args = array('number' => '1',);
+				$terms_arr = get_terms($taxonomies[0], $args);
+				foreach ($terms_arr as $location_term) {
+					$term_arr = $location_term;
+					$term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
+				}
+				$wp_query->queried_object_id = 1;
+				$wp_query->queried_object = $term_arr;
+			}
+		}
 
-    }
-    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
+	}
+	if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
+		$table = $plugin_prefix . $geodir_post_type . '_detail';
 
-        add_filter('posts_fields', 'geodir_posts_fields', 1);
-        add_filter('posts_join', 'geodir_posts_join', 1);
-        geodir_post_where();
-        if (!is_admin()) {
-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);
-        }
+		add_filter('posts_fields', 'geodir_posts_fields', 1);
+		add_filter('posts_join', 'geodir_posts_join', 1);
+		geodir_post_where();
+		if (!is_admin()) {
+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);
+		}
 
-        // advanced filter for popular post view widget
-        global $wp_query;
-        if (!is_admin()) {
-            if (!empty($wp_query->query['with_pics_only'])) {
-                add_filter('posts_join', 'geodir_filter_widget_join', 1000);
-            }
-            add_filter('posts_where', 'geodir_filter_widget_where', 1000);
-        }
+		// advanced filter for popular post view widget
+		global $wp_query;
+		if (!is_admin()) {
+			if (!empty($wp_query->query['with_pics_only'])) {
+				add_filter('posts_join', 'geodir_filter_widget_join', 1000);
+			}
+			add_filter('posts_where', 'geodir_filter_widget_where', 1000);
+		}
 
-    }
+	}
 
-    return $query;
+	return $query;
 }
 
 /**
@@ -245,40 +245,40 @@ 
  */
 function gdsc_manage_category_choice($post_type, $category)
 {
-    if (0 == $category || '' == $category) {
-        return '';
-    }
+	if (0 == $category || '' == $category) {
+		return '';
+	}
 
-    if (!(gdsc_is_post_type_valid($post_type))) {
-        return '';
-    }
+	if (!(gdsc_is_post_type_valid($post_type))) {
+		return '';
+	}
 
-    $taxonomies = geodir_get_taxonomies($post_type);
+	$taxonomies = geodir_get_taxonomies($post_type);
 
-    $categories = get_terms(array('taxonomy' => $taxonomies[0]));
+	$categories = get_terms(array('taxonomy' => $taxonomies[0]));
 
-    $cat_id = 0;
+	$cat_id = 0;
 
-    foreach ($categories as $cat) {
-        if (is_numeric($category)) {
-            if (absint($category) == $cat->term_id) {
-                $cat_id = $cat->term_id;
-                break;
-            }
-        } else {
-            if ($category == $cat->slug) {
-                $cat_id = $cat->term_id;
-                break;
-            }
+	foreach ($categories as $cat) {
+		if (is_numeric($category)) {
+			if (absint($category) == $cat->term_id) {
+				$cat_id = $cat->term_id;
+				break;
+			}
+		} else {
+			if ($category == $cat->slug) {
+				$cat_id = $cat->term_id;
+				break;
+			}
 
-            if ($category == $cat->name) {
-                $cat_id = $cat->term_id;
-                break;
-            }
-        }
-    }
+			if ($category == $cat->name) {
+				$cat_id = $cat->term_id;
+				break;
+			}
+		}
+	}
 
-    return $cat_id;
+	return $cat_id;
 }
 
 // @todo: Extract this
@@ -288,11 +288,11 @@ 
 	 * Adds the script in the page footer for the home page google map.
 	 *
 	 * @since 1.0.0
-     * @return string Print the script in page footer.
+	 * @return string Print the script in page footer.
 	 */
 	function geodir_home_map_add_script()
-    {
-        ?>
+	{
+		?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
                 geoDirMapSlide();
@@ -365,7 +365,7 @@ 
             }
         </script>
     <?php
-    }
+	}
 }
 
 /**
@@ -376,7 +376,7 @@ 
  */
 function geodir_popular_category_add_scripts()
 {
-    ?>
+	?>
     <script type="text/javascript">
         jQuery(function ($) {
             $('.geodir-showcat').click(function () {
@@ -406,56 +406,56 @@ 
  */
 function gdsc_validate_layout_choice($layout_choice)
 {
-    switch (geodir_strtolower($layout_choice)) {
-        case 'list';
-        case 'one';
-        case 'one_column';
-        case 'onecolumn';
-        case '1';
-            $layout_choice = 'list';
-            break;
-        case 'gridview_onehalf';
-        case 'two';
-        case 'two_column';
-        case 'two_columns';
-        case 'twocolumn';
-        case 'twocolumns';
-        case '2';
-            $layout_choice = 'gridview_onehalf';
-            break;
-        case 'gridview_onethird';
-        case 'three';
-        case 'three_column';
-        case 'three_columns';
-        case 'threecolumn';
-        case 'threecolumns';
-        case '3';
-            $layout_choice = 'gridview_onethird';
-            break;
-        case 'gridview_onefourth';
-        case 'four';
-        case 'four_column';
-        case 'four_columns';
-        case 'fourcolumn';
-        case 'fourcolumns';
-        case '4';
-            $layout_choice = 'gridview_onefourth';
-            break;
-        case 'gridview_onefifth';
-        case 'five';
-        case 'five_column';
-        case 'five_columns';
-        case 'fivecolumn';
-        case 'fivecolumns';
-        case '5';
-            $layout_choice = 'gridview_onefifth';
-            break;
-        default:
-            $layout_choice = 'gridview_onehalf';
-            break;
-    }
-
-    return $layout_choice;
+	switch (geodir_strtolower($layout_choice)) {
+		case 'list';
+		case 'one';
+		case 'one_column';
+		case 'onecolumn';
+		case '1';
+			$layout_choice = 'list';
+			break;
+		case 'gridview_onehalf';
+		case 'two';
+		case 'two_column';
+		case 'two_columns';
+		case 'twocolumn';
+		case 'twocolumns';
+		case '2';
+			$layout_choice = 'gridview_onehalf';
+			break;
+		case 'gridview_onethird';
+		case 'three';
+		case 'three_column';
+		case 'three_columns';
+		case 'threecolumn';
+		case 'threecolumns';
+		case '3';
+			$layout_choice = 'gridview_onethird';
+			break;
+		case 'gridview_onefourth';
+		case 'four';
+		case 'four_column';
+		case 'four_columns';
+		case 'fourcolumn';
+		case 'fourcolumns';
+		case '4';
+			$layout_choice = 'gridview_onefourth';
+			break;
+		case 'gridview_onefifth';
+		case 'five';
+		case 'five_column';
+		case 'five_columns';
+		case 'fivecolumn';
+		case 'fivecolumns';
+		case '5';
+			$layout_choice = 'gridview_onefifth';
+			break;
+		default:
+			$layout_choice = 'gridview_onehalf';
+			break;
+	}
+
+	return $layout_choice;
 }
 
 /**
@@ -468,20 +468,20 @@ 
  */
 function gdsc_validate_sort_choice($sort_choice)
 {
-    $sorts = array(
-        'az',
-        'latest',
-        'featured',
-        'high_review',
-        'high_rating',
-        'random',
-    );
-
-    if (!(in_array($sort_choice, $sorts))) {
-        $sort_choice = 'latest';
-    }
-
-    return $sort_choice;
+	$sorts = array(
+		'az',
+		'latest',
+		'featured',
+		'high_review',
+		'high_rating',
+		'random',
+	);
+
+	if (!(in_array($sort_choice, $sorts))) {
+		$sort_choice = 'latest';
+	}
+
+	return $sort_choice;
 }
 
 /**
@@ -494,22 +494,22 @@ 
  */
 function gdsc_validate_listing_width($width_choice)
 {
-    if (!(empty($width_choice))) {
-        $width_choice = absint($width_choice);
-    } else {
-        return '';
-    }
-
-    if (100 < $width_choice) {
-        $width_choice = 100;
-    }
-
-    // If listing_width is too narrow, it won't work, arbitrarily set to 10% here
-    if (10 > $width_choice) {
-        $width_choice = 10;
-    }
-
-    return $width_choice;
+	if (!(empty($width_choice))) {
+		$width_choice = absint($width_choice);
+	} else {
+		return '';
+	}
+
+	if (100 < $width_choice) {
+		$width_choice = 100;
+	}
+
+	// If listing_width is too narrow, it won't work, arbitrarily set to 10% here
+	if (10 > $width_choice) {
+		$width_choice = 10;
+	}
+
+	return $width_choice;
 }
 
 /**
@@ -522,18 +522,18 @@ 
  */
 function gdsc_validate_list_filter_choice($filter_choice)
 {
-    $filters = array(
-        'all',
-        'today',
-        'upcoming',
-        'past',
-    );
-
-    if (!(in_array($filter_choice, $filters))) {
-        $filter_choice = 'all';
-    }
-
-    return $filter_choice;
+	$filters = array(
+		'all',
+		'today',
+		'upcoming',
+		'past',
+	);
+
+	if (!(in_array($filter_choice, $filters))) {
+		$filter_choice = 'all';
+	}
+
+	return $filter_choice;
 }
 
 /**
@@ -553,7 +553,7 @@ 
  * @return string Listings HTML content.
  */
 function geodir_sc_gd_listings_output($args = array()) {
-    $title				 = !empty($args['title']) ? __($args['title'], 'geodirectory') : '';
+	$title				 = !empty($args['title']) ? __($args['title'], 'geodirectory') : '';
 	$post_type 			 = !empty($args['post_type']) ? $args['post_type'] : 'gd_place';
 	$category 			 = !empty($args['category']) ? $args['category'] : '0';
 	$post_number		 = !empty($args['post_number']) ? $args['post_number'] : 10;
@@ -574,61 +574,61 @@ 
 	$pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
 	
 	$query_args = array(
-        'posts_per_page' => $post_number,
-        'is_geodir_loop' => true,
-        'gd_location' => $add_location_filter,
-        'post_type' => $post_type,
-        'order_by' => $list_sort,
+		'posts_per_page' => $post_number,
+		'is_geodir_loop' => true,
+		'gd_location' => $add_location_filter,
+		'post_type' => $post_type,
+		'order_by' => $list_sort,
 		'pageno' => $pageno
-    );
+	);
 
-    if ($character_count >= 0) {
-        $query_args['excerpt_length'] = $character_count;
-    }
+	if ($character_count >= 0) {
+		$query_args['excerpt_length'] = $character_count;
+	}
     
-    if (!empty($args['post_author'])) {
-        $query_args['post_author'] = $args['post_author'];
-    }
+	if (!empty($args['post_author'])) {
+		$query_args['post_author'] = $args['post_author'];
+	}
 
-    if (!empty($args['show_featured_only'])) {
-        $query_args['show_featured_only'] = 1;
-    }
+	if (!empty($args['show_featured_only'])) {
+		$query_args['show_featured_only'] = 1;
+	}
 
-    if (!empty($args['show_special_only'])) {
-        $query_args['show_special_only'] = 1;
-    }
+	if (!empty($args['show_special_only'])) {
+		$query_args['show_special_only'] = 1;
+	}
 
-    if (!empty($args['with_pics_only'])) {
-        $query_args['with_pics_only'] = 0;
-        $query_args['featured_image_only'] = 1;
-    }
+	if (!empty($args['with_pics_only'])) {
+		$query_args['with_pics_only'] = 0;
+		$query_args['featured_image_only'] = 1;
+	}
 
-    if (!empty($args['with_videos_only'])) {
-        $query_args['with_videos_only'] = 1;
-    }
-    $with_no_results = !empty($args['without_no_results']) ? false : true;
+	if (!empty($args['with_videos_only'])) {
+		$query_args['with_videos_only'] = 1;
+	}
+	$with_no_results = !empty($args['without_no_results']) ? false : true;
 
-    if (!empty($category) && isset($category[0]) && $category[0] != '0') {
-        $category_taxonomy = geodir_get_taxonomies($post_type);
+	if (!empty($category) && isset($category[0]) && $category[0] != '0') {
+		$category_taxonomy = geodir_get_taxonomies($post_type);
 
-        ######### WPML #########
-        if (function_exists('icl_object_id')) {
-            $category = gd_lang_object_ids($category, $category_taxonomy[0]);
-        }
-        ######### WPML #########
+		######### WPML #########
+		if (function_exists('icl_object_id')) {
+			$category = gd_lang_object_ids($category, $category_taxonomy[0]);
+		}
+		######### WPML #########
 
-        $tax_query = array(
-            'taxonomy' => $category_taxonomy[0],
-            'field' => 'id',
-            'terms' => $category
-        );
+		$tax_query = array(
+			'taxonomy' => $category_taxonomy[0],
+			'field' => 'id',
+			'terms' => $category
+		);
 
-        $query_args['tax_query'] = array($tax_query);
-    }
+		$query_args['tax_query'] = array($tax_query);
+	}
 
-    global $gridview_columns_widget, $geodir_is_widget_listing;
+	global $gridview_columns_widget, $geodir_is_widget_listing;
 
-    if ($post_type == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
+	if ($post_type == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
 		global $geodir_event_widget_listview;
 		$geodir_event_widget_listview = true;
 		
@@ -645,15 +645,15 @@ 
 	}
 	$current_gridview_columns_widget = $gridview_columns_widget;
 
-    ob_start();
+	ob_start();
 	if (!empty($widget_listings) || $with_no_results) {
 		if (!$geodir_ajax) {
-        /**
-         * Called before the shortcode [gd_listings] content is output.
-         *
-         * @since 1.0.0
-         */
-        do_action('geodir_before_sc_gd_listings');
+		/**
+		 * Called before the shortcode [gd_listings] content is output.
+		 *
+		 * @since 1.0.0
+		 */
+		do_action('geodir_before_sc_gd_listings');
 		?>
         <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings">
 		<?php } ?>
@@ -663,15 +663,15 @@ 
             </div>
 			<?php } ?>
             <?php
-            if (strstr($layout, 'gridview')) {
-                $listing_view_exp = explode('_', $layout);
-                $gridview_columns_widget = $layout;
-                $layout = $listing_view_exp[0];
-            } else {
-                $gridview_columns_widget = '';
-            }
+			if (strstr($layout, 'gridview')) {
+				$listing_view_exp = explode('_', $layout);
+				$gridview_columns_widget = $layout;
+				$layout = $listing_view_exp[0];
+			} else {
+				$gridview_columns_widget = '';
+			}
 
-            /**
+			/**
 			 * Filter the widget listing listview template.
 			 *
 			 * @since 1.0.0
@@ -680,43 +680,43 @@ 
 			 */
 			$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
             			
-            global $post, $map_jason, $map_canvas_arr, $gd_session;
+			global $post, $map_jason, $map_canvas_arr, $gd_session;
 
-            $current_post = $post;
-            $current_map_jason = $map_jason;
-            $current_map_canvas_arr = $map_canvas_arr;
-            $geodir_is_widget_listing = true;
+			$current_post = $post;
+			$current_map_jason = $map_jason;
+			$current_map_canvas_arr = $map_canvas_arr;
+			$geodir_is_widget_listing = true;
 			$gd_session->un_set('gd_listing_view');
 
-            if ($with_pagination && $top_pagination) {				
+			if ($with_pagination && $top_pagination) {				
 				echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
 			}
 
-            /**
-             * Includes listing listview template.
-             *
-             * @since 1.0.0
-             */
+			/**
+			 * Includes listing listview template.
+			 *
+			 * @since 1.0.0
+			 */
 			include($template);
 			
 			if ($with_pagination && $bottom_pagination) {				
 				echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
 			}
 
-            $geodir_is_widget_listing = false;
+			$geodir_is_widget_listing = false;
 
-            $GLOBALS['post'] = $current_post;
+			$GLOBALS['post'] = $current_post;
 			if (!empty($current_post)) {
-            	setup_postdata($current_post);
+				setup_postdata($current_post);
 			}
-            $map_jason = $current_map_jason;
-            $map_canvas_arr = $current_map_canvas_arr;
+			$map_jason = $current_map_jason;
+			$map_canvas_arr = $current_map_canvas_arr;
 			global $gridview_columns_widget;
 			$gridview_columns_widget = $current_gridview_columns_widget;
 			?>
 			<p class="geodir-sclisting-loading" style="display:none;"><i class="fa fa-cog fa-spin"></i></p>
 			<?php
-            if (!$geodir_ajax) { 
+			if (!$geodir_ajax) { 
 			?>
         </div>
 		<script type="text/javascript">
@@ -753,11 +753,11 @@ 
 		</script>
 		<?php } ?>
     <?php
-    }
+	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -784,15 +784,15 @@ 
  * @return string Listings pagination HTML content.
  */
 function geodir_sc_listings_pagination($total_posts, $posts_per_page, $pageno, $before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {
-    if (empty($prelabel)) {
-        $prelabel = '<strong>&laquo;</strong>';
-    }
+	if (empty($prelabel)) {
+		$prelabel = '<strong>&laquo;</strong>';
+	}
 
-    if (empty($nxtlabel)) {
-        $nxtlabel = '<strong>&raquo;</strong>';
-    }
+	if (empty($nxtlabel)) {
+		$nxtlabel = '<strong>&raquo;</strong>';
+	}
 
-    $half_pages_to_show = round($pages_to_show / 2);
+	$half_pages_to_show = round($pages_to_show / 2);
 
 	$numposts = $total_posts;
 
@@ -848,9 +848,9 @@ 
 		echo "</div> $after";
 	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -861,10 +861,10 @@ 
  * @return string Listings HTML content.
  */
 function geodir_sclistings_callback() {
-    check_ajax_referer('geodir-sclistings-nonce', 'geodir_sclistings_nonce');
-    //set variables
-    $scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
-    $pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
+	check_ajax_referer('geodir-sclistings-nonce', 'geodir_sclistings_nonce');
+	//set variables
+	$scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
+	$pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
 	
 	$shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
 	
@@ -876,7 +876,7 @@ 
 	} else {
 		echo 0;
 	}
-    wp_die();
+	wp_die();
 }
 add_action('wp_ajax_geodir_sclistings', 'geodir_sclistings_callback');
 add_action('wp_ajax_nopriv_geodir_sclistings', 'geodir_sclistings_callback');
\ No newline at end of file