GeoDirectory / geodirectory

geodirectory_shortcodes.php

Indentation +676 added lines, -676 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';
+	}
+
+	// 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;
+	}
 
-    geodir_popular_postview_output($params, $params);
+	// 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']);
 
-    $output = ob_get_contents();
+	// 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
+	 */
 
-    ob_end_clean();
+	geodir_popular_postview_output($params, $params);
 
-    return $output;
+
+	$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_advance_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');
 
@@ -1043,127 +1043,127 @@ 
  * @return string HTML content to display geodirectory listings.
  */
 function geodir_sc_gd_listings($atts, $content = '') {
-    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',
-        'without_no_results'    => 0,
-        'tags'                  => ''
-    );
-    $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;
+	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',
+		'without_no_results'    => 0,
+		'tags'                  => ''
+	);
+	$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']);
-
-    // Clean tags
-    if (!empty($params['tags'])) {
-        if (!is_array($params['tags'])) {
-            $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
-                $params['tags'] = str_replace($comma, ',', $params['tags']);
-            }
-            $params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
-            $params['tags'] = array_map('trim', $params['tags']);
-        }
-    } else {
-        $params['tags'] = array();
-    }
-
-    /**
-     * 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']);
-    }
-
-    if ( !empty($atts['shortcode_content']) ) {
-        $content = $atts['shortcode_content'];
-    }
-    $params['shortcode_content'] = trim($content);
-    $atts['shortcode_content'] = trim($content);
+	// 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']);
+
+	// Clean tags
+	if (!empty($params['tags'])) {
+		if (!is_array($params['tags'])) {
+			$comma = _x(',', 'tag delimiter');
+			if ( ',' !== $comma ) {
+				$params['tags'] = str_replace($comma, ',', $params['tags']);
+			}
+			$params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,"));
+			$params['tags'] = array_map('trim', $params['tags']);
+		}
+	} else {
+		$params['tags'] = array();
+	}
+
+	/**
+	 * 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']);
+	}
+
+	if ( !empty($atts['shortcode_content']) ) {
+		$content = $atts['shortcode_content'];
+	}
+	$params['shortcode_content'] = trim($content);
+	$atts['shortcode_content'] = trim($content);
     
-    $params['shortcode_atts']       = $atts;
+	$params['shortcode_atts']       = $atts;
 
-    $output = geodir_sc_gd_listings_output($params);
+	$output = geodir_sc_gd_listings_output($params);
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_listings', 'geodir_sc_gd_listings');
 
@@ -1211,23 +1211,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']);
@@ -1241,10 +1241,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

geodirectory-functions/shortcode_functions.php

Indentation +427 added lines, -427 removed lines

@@ -9,7 +9,7 @@ 
  
 // 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;
 }
 
 /**
@@ -554,7 +554,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;
@@ -564,17 +564,17 @@ 
 	$layout 			 = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
 	$with_pagination 	 = !empty($args['with_pagination']) ? true : false;
 	$event_type 	 	 = !empty($args['event_type']) ? $args['event_type'] : '';
-    $shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
-    $tags                = !empty($args['tags']) ? $args['tags'] : array();
-    /**
-     * Filter the content text displayed when no listings found.
-     *
-     * @since 1.6.0
-     *
-     * @param string $shortcode_content The shortcode content text.
-     * @param array $args Array of arguements to filter listings.
-     */
-    $shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
+	$shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
+	$tags                = !empty($args['tags']) ? $args['tags'] : array();
+	/**
+	 * Filter the content text displayed when no listings found.
+	 *
+	 * @since 1.6.0
+	 *
+	 * @param string $shortcode_content The shortcode content text.
+	 * @param array $args Array of arguements to filter listings.
+	 */
+	$shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
 		
 	$top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
 	$bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
@@ -586,87 +586,87 @@ 
 	$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['show_featured_only'])) {
-        $query_args['show_featured_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_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);
-
-        ######### 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
-        );
-
-        $query_args['tax_query'] = array($tax_query);
-    }
+	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_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_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);
+
+		######### 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
+		);
+
+		$query_args['tax_query'] = array($tax_query);
+	}
     
-    if (!empty($tags)) {
-        // Clean tags
-        if (!is_array($tags)) {
-            $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
-                $tags = str_replace($comma, ',', $tags);
-            }
-            $tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
-            $tags = array_map('trim', $tags);
-        }
+	if (!empty($tags)) {
+		// Clean tags
+		if (!is_array($tags)) {
+			$comma = _x(',', 'tag delimiter');
+			if ( ',' !== $comma ) {
+				$tags = str_replace($comma, ',', $tags);
+			}
+			$tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
+			$tags = array_map('trim', $tags);
+		}
         
-        if (!empty($tags)) {
-            $tag_query = array(
-                'taxonomy' => $post_type . '_tags',
-                'field' => 'name',
-                'terms' => $tags
-            );
-
-            if (!empty($query_args['tax_query'])) {
-                $query_args['tax_query'][] = $tag_query;
-            } else {
-                $query_args['tax_query'] = array($tag_query);
-            }
-        }
-    }
+		if (!empty($tags)) {
+			$tag_query = array(
+				'taxonomy' => $post_type . '_tags',
+				'field' => 'name',
+				'terms' => $tags
+			);
+
+			if (!empty($query_args['tax_query'])) {
+				$query_args['tax_query'][] = $tag_query;
+			} else {
+				$query_args['tax_query'] = array($tag_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;
 		
@@ -683,15 +683,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 } ?>
@@ -701,64 +701,64 @@ 
             </div>
 			<?php } ?>
             <?php
-            if (!(empty($widget_listings) && !empty($shortcode_content))) {
-                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
-                 *
-                 * @param string The template file to display listing.
-                 */
-                $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
+			if (!(empty($widget_listings) && !empty($shortcode_content))) {
+				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
+				 *
+				 * @param string The template file to display listing.
+				 */
+				$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
                             
-                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;
-                $gd_session->un_set('gd_listing_view');
-
-                if ($with_pagination && $top_pagination) {				
-                    echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
-                }
-
-                /**
-                 * Includes listing listview template.
-                 *
-                 * @since 1.0.0
-                 */
-                include($template);
+				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;
+				$gd_session->un_set('gd_listing_view');
+
+				if ($with_pagination && $top_pagination) {				
+					echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+				}
+
+				/**
+				 * 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;
-
-                $GLOBALS['post'] = $current_post;
-                if (!empty($current_post)) {
-                    setup_postdata($current_post);
-                }
-                $map_jason = $current_map_jason;
-                $map_canvas_arr = $current_map_canvas_arr;
-                global $gridview_columns_widget;
-                $gridview_columns_widget = $current_gridview_columns_widget;
-            } else {
-                echo $shortcode_content;
-            }
+				if ($with_pagination && $bottom_pagination) {				
+					echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+				}
+
+				$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;
+				global $gridview_columns_widget;
+				$gridview_columns_widget = $current_gridview_columns_widget;
+			} else {
+				echo $shortcode_content;
+			}
 			?>
 			<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">
@@ -790,10 +790,10 @@ 
 			  if(response && response != '0') {
 				jQuery(container).html(response);
                   <?php
-                  /**
-                   * if lazyload images enabled then refresh them once ajax page changed.
-                   */
-                  if(get_option('geodir_lazy_load',1)){?>
+				  /**
+				   * if lazyload images enabled then refresh them once ajax page changed.
+				   */
+				  if(get_option('geodir_lazy_load',1)){?>
                   geodir_init_lazy_load();
                   <?php }?>
 
@@ -803,11 +803,11 @@ 
 		</script>
 		<?php } ?>
     <?php
-    }
+	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -834,15 +834,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;
 
@@ -898,9 +898,9 @@ 
 		echo "</div> $after";
 	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -911,10 +911,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;
 	
@@ -926,7 +926,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

geodirectory-admin/admin_functions.php

Indentation +2911 added lines, -2911 removed lines

@@ -15,11 +15,11 @@ 
 function geodir_deactivation()

 {

 

-    // Update installed variable

-    update_option("geodir_installed", 0);

+	// Update installed variable

+	update_option("geodir_installed", 0);

 

-    // Remove rewrite rules and then recreate rewrite rules.

-    flush_rewrite_rules();

+	// Remove rewrite rules and then recreate rewrite rules.

+	flush_rewrite_rules();

 }

 

 

@@ -32,125 +32,125 @@ 
 function geodir_uninstall()

 {

 

-    delete_option('geodir_default_data_installed');

+	delete_option('geodir_default_data_installed');

 

 }

 

 if (!function_exists('geodir_admin_styles')) {

-    /**

-     * Enqueue Admin Styles.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles()

-    {

+	/**

+	 * Enqueue Admin Styles.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles()

+	{

 

-        wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-admin-css');

+		wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-admin-css');

 

-        wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-frontend-style');

+		wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-frontend-style');

 

-        wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-chosen-style');

+		wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-chosen-style');

 

-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

+		wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

 

-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-jquery-ui-css');

+		wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-jquery-ui-css');

 

-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-custom-fields-css');

+		wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-custom-fields-css');

 

-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-pluplodar-css');

+		wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-pluplodar-css');

 

-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-rating-style');

+		wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-rating-style');

 

-        wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-rtl-style');

+		wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-rtl-style');

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_styles_req')) {

-    /**

-     * Loads stylesheets from CDN.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles_req()

-    {

+	/**

+	 * Loads stylesheets from CDN.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles_req()

+	{

 

-        wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('font-awesome');

+		wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('font-awesome');

 

-        wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-admin');

+		wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-admin');

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_scripts')) {

-    /**

-     * Enqueue Admin Scripts.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_scripts()

-    {

-        $geodir_map_name = geodir_map_name();

+	/**

+	 * Enqueue Admin Scripts.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_scripts()

+	{

+		$geodir_map_name = geodir_map_name();

         

-        wp_enqueue_script('jquery');

+		wp_enqueue_script('jquery');

 

-        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

+		wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

 

-        wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

-        wp_enqueue_script('chosen');

+		wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

+		wp_enqueue_script('chosen');

 

-        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-choose-ajax');

+		wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-choose-ajax');

 

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

-            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

-        }

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

+			wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

+		}

 

-        wp_enqueue_script('geodirectory-custom-fields-script');

-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

+		wp_enqueue_script('geodirectory-custom-fields-script');

+		$plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

 

-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

+		wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

 

-        if (in_array($geodir_map_name, array('auto', 'google'))) {

-            $map_lang = "&language=" . geodir_get_map_default_language();

-            $map_key = "&key=" . geodir_get_map_api_key();

-            /** This filter is documented in geodirectory_template_tags.php */

-            $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-            wp_enqueue_script('geodirectory-googlemap-script', '//maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);

-        }

+		if (in_array($geodir_map_name, array('auto', 'google'))) {

+			$map_lang = "&language=" . geodir_get_map_default_language();

+			$map_key = "&key=" . geodir_get_map_api_key();

+			/** This filter is documented in geodirectory_template_tags.php */

+			$map_extra = apply_filters('geodir_googlemap_script_extra', '');

+			wp_enqueue_script('geodirectory-googlemap-script', '//maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);

+		}

         

-        if ($geodir_map_name == 'osm') {

-            // Leaflet OpenStreetMap

-            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_style('geodirectory-leaflet-style');

+		if ($geodir_map_name == 'osm') {

+			// Leaflet OpenStreetMap

+			wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_style('geodirectory-leaflet-style');

                 

-            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_script('geodirectory-leaflet-script');

+			wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_script('geodirectory-leaflet-script');

             

-            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

-            wp_enqueue_script('geodirectory-leaflet-geo-script');

-        }

-        wp_enqueue_script( 'jquery-ui-autocomplete' );

+			wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

+			wp_enqueue_script('geodirectory-leaflet-geo-script');

+		}

+		wp_enqueue_script( 'jquery-ui-autocomplete' );

         

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

-        wp_enqueue_script('geodirectory-goMap-script');

+		wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+		wp_enqueue_script('geodirectory-goMap-script');

 

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-goMap-script');

+		wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

@@ -161,167 +161,167 @@ 
 			wp_enqueue_script('geodir-jRating-js');

 		}

 

-        wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodir-on-document-load');

-

-

-        // SCRIPT FOR UPLOAD

-        wp_enqueue_script('plupload-all');

-        wp_enqueue_script('jquery-ui-sortable');

-

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-plupload-script');

-

-        // SCRIPT FOR UPLOAD END

-

-

-        // place js config array for plupload

-        $plupload_init = array(

-            'runtimes' => 'html5,silverlight,flash,html4',

-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

-            'container' => 'plupload-upload-ui', // will be adjusted per uploader

-            'drop_element' => 'dropbox', // will be adjusted per uploader

-            'file_data_name' => 'async-upload', // will be adjusted per uploader

-            'multiple_queues' => true,

-            'max_file_size' => geodir_max_upload_size(),

-            'url' => admin_url('admin-ajax.php'),

-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

-            'multipart' => true,

-            'urlstream_upload' => true,

-            'multi_selection' => false, // will be added per uploader

-            // additional post data to send to our ajax hook

-            'multipart_params' => array(

-                '_ajax_nonce' => "", // will be added per uploader

-                'action' => 'plupload_action', // the ajax action name

-                'imgid' => 0 // will be added per uploader

-            )

-        );

-        $base_plupload_config = json_encode($plupload_init);

-

-

-        $thumb_img_arr = array();

-

-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

-

-        $totImg = '';

-        $image_limit = '';

-        if (!empty($thumb_img_arr)) {

-            $totImg = count($thumb_img_arr);

-        }

+		wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodir-on-document-load');

+

+

+		// SCRIPT FOR UPLOAD

+		wp_enqueue_script('plupload-all');

+		wp_enqueue_script('jquery-ui-sortable');

+

+		wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-plupload-script');

+

+		// SCRIPT FOR UPLOAD END

+

+

+		// place js config array for plupload

+		$plupload_init = array(

+			'runtimes' => 'html5,silverlight,flash,html4',

+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

+			'container' => 'plupload-upload-ui', // will be adjusted per uploader

+			'drop_element' => 'dropbox', // will be adjusted per uploader

+			'file_data_name' => 'async-upload', // will be adjusted per uploader

+			'multiple_queues' => true,

+			'max_file_size' => geodir_max_upload_size(),

+			'url' => admin_url('admin-ajax.php'),

+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

+			'multipart' => true,

+			'urlstream_upload' => true,

+			'multi_selection' => false, // will be added per uploader

+			// additional post data to send to our ajax hook

+			'multipart_params' => array(

+				'_ajax_nonce' => "", // will be added per uploader

+				'action' => 'plupload_action', // the ajax action name

+				'imgid' => 0 // will be added per uploader

+			)

+		);

+		$base_plupload_config = json_encode($plupload_init);

+

+

+		$thumb_img_arr = array();

+

+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

+			$thumb_img_arr = geodir_get_images($_REQUEST['pid']);

+

+		$totImg = '';

+		$image_limit = '';

+		if (!empty($thumb_img_arr)) {

+			$totImg = count($thumb_img_arr);

+		}

 

-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

-            'totalImg' => $totImg,

-            'image_limit' => $image_limit,

-            'upload_img_size' => geodir_max_upload_size());

+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

+			'totalImg' => $totImg,

+			'image_limit' => $image_limit,

+			'upload_img_size' => geodir_max_upload_size());

 

-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

 

-        $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

-        wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

+		$ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

+		wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

 

 

-        wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-admin-script');

+		wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-admin-script');

 

-        wp_enqueue_style('farbtastic');

-        wp_enqueue_script('farbtastic');

+		wp_enqueue_style('farbtastic');

+		wp_enqueue_script('farbtastic');

 

-        $screen = get_current_screen();

-        if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

-        }

+		$screen = get_current_screen();

+		if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

+			wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

+		}

 

-        $ajax_cons_data = array('url' => __(get_option('siteurl') . '?geodir_ajax=true'));

-        wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

+		$ajax_cons_data = array('url' => __(get_option('siteurl') . '?geodir_ajax=true'));

+		wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu')) {

-    /**

-     * Admin Menus

-     *

-     * Sets up the admin menus in wordpress.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global array $menu Menu array.

-     * @global object $geodirectory GeoDirectory plugin object.

-     */

-    function geodir_admin_menu()

-    {

-        global $menu, $geodirectory;

+	/**

+	 * Admin Menus

+	 *

+	 * Sets up the admin menus in wordpress.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global array $menu Menu array.

+	 * @global object $geodirectory GeoDirectory plugin object.

+	 */

+	function geodir_admin_menu()

+	{

+		global $menu, $geodirectory;

 

-        if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

+		if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

 

-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

+		add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

 

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu_order')) {

-    /**

-     * Order admin menus.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $menu_order Menu order array.

-     * @return array Modified menu order array.

-     */

-    function geodir_admin_menu_order($menu_order)

-    {

-

-        // Initialize our custom order array

-        $geodir_menu_order = array();

-

-        // Get the index of our custom separator

-        $geodir_separator = array_search('separator-geodirectory', $menu_order);

-

-        // Get index of posttype menu

-        $post_types = geodir_get_posttypes();

-

-        // Loop through menu order and do some rearranging

-        foreach ($menu_order as $index => $item) :

-

-            if ((('geodirectory') == $item)) :

-                $geodir_menu_order[] = 'separator-geodirectory';

-                if (!empty($post_types)) {

-                    foreach ($post_types as $post_type) {

-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

-                    }

-                }

-                $geodir_menu_order[] = $item;

+	/**

+	 * Order admin menus.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $menu_order Menu order array.

+	 * @return array Modified menu order array.

+	 */

+	function geodir_admin_menu_order($menu_order)

+	{

 

-                unset($menu_order[$geodir_separator]);

-            //unset( $menu_order[$geodir_places] );

-            elseif (!in_array($item, array('separator-geodirectory'))) :

-                $geodir_menu_order[] = $item;

-            endif;

+		// Initialize our custom order array

+		$geodir_menu_order = array();

 

-        endforeach;

+		// Get the index of our custom separator

+		$geodir_separator = array_search('separator-geodirectory', $menu_order);

 

-        // Return order

-        return $geodir_menu_order;

-    }

+		// Get index of posttype menu

+		$post_types = geodir_get_posttypes();

+

+		// Loop through menu order and do some rearranging

+		foreach ($menu_order as $index => $item) :

+

+			if ((('geodirectory') == $item)) :

+				$geodir_menu_order[] = 'separator-geodirectory';

+				if (!empty($post_types)) {

+					foreach ($post_types as $post_type) {

+						$geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

+					}

+				}

+				$geodir_menu_order[] = $item;

+

+				unset($menu_order[$geodir_separator]);

+			//unset( $menu_order[$geodir_places] );

+			elseif (!in_array($item, array('separator-geodirectory'))) :

+				$geodir_menu_order[] = $item;

+			endif;

+

+		endforeach;

+

+		// Return order

+		return $geodir_menu_order;

+	}

 }

 

 if (!function_exists('geodir_admin_custom_menu_order')) {

-    /**

-     * Enables custom menu order.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return bool

-     */

-    function geodir_admin_custom_menu_order()

-    {

-        if (!current_user_can('manage_options')) return false;

-        return true;

-    }

+	/**

+	 * Enables custom menu order.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return bool

+	 */

+	function geodir_admin_custom_menu_order()

+	{

+		if (!current_user_can('manage_options')) return false;

+		return true;

+	}

 }

 

 /**

@@ -332,51 +332,51 @@ 
  */

 function geodir_before_admin_panel()

 {

-    if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {

-        echo '<div id="message" class="updated fade">

+	if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {

+		echo '<div id="message" class="updated fade">

                         <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>

                         <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>

                 </div>';

 

-    }

+	}

 

-    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {

-        switch ($_REQUEST['msg']) {

-            case 'success':

-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

-                flush_rewrite_rules(false);

+	if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {

+		switch ($_REQUEST['msg']) {

+			case 'success':

+				echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

+				flush_rewrite_rules(false);

 

-                break;

+				break;

 			case 'fail':

 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

 				

 				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

+					echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

 				else

 					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

-                break;

-        }

-    }

+				break;

+		}

+	}

 

-    $geodir_load_map = get_option('geodir_load_map');

-    $need_map_key = false;

-    if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

-        $need_map_key = true;

-    }

+	$geodir_load_map = get_option('geodir_load_map');

+	$need_map_key = false;

+	if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

+		$need_map_key = true;

+	}

 

-    if (!geodir_get_map_api_key() && $need_map_key) {

-        echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

-    }

+	if (!geodir_get_map_api_key() && $need_map_key) {

+		echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

+	}

 

-    if (!geodir_is_default_location_set()) {

-        echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+	if (!geodir_is_default_location_set()) {

+		echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

 

-    }

+	}

 

-    if (!function_exists('curl_init')) {

-        echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

+	if (!function_exists('curl_init')) {

+		echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

 

-    }

+	}

 

 

 

@@ -393,19 +393,19 @@ 
  */

 function geodir_handle_option_form_submit($current_tab)

 {

-    global $geodir_settings;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

-        /**

-         * Contains settings array for current tab.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('option-pages/' . $current_tab . '_array.php');

-    }

-    if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+	global $geodir_settings;

+	if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

+		/**

+		 * Contains settings array for current tab.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('option-pages/' . $current_tab . '_array.php');

+	}

+	if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

+		if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+		if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -417,98 +417,98 @@ 
 		 */

 		do_action('geodir_before_update_options', $current_tab, $geodir_settings);		

 		

-        if (!empty($geodir_settings[$current_tab]))

-            geodir_update_options($geodir_settings[$current_tab]);

+		if (!empty($geodir_settings[$current_tab]))

+			geodir_update_options($geodir_settings[$current_tab]);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * @since 1.0.0

-         * @param array $geodir_settings The array of GeoDirectory settings.

-         * @see 'geodir_before_update_options'

-         */

-        do_action('geodir_update_options', $geodir_settings);

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * @since 1.0.0

+		 * @param array $geodir_settings The array of GeoDirectory settings.

+		 * @see 'geodir_before_update_options'

+		 */

+		do_action('geodir_update_options', $geodir_settings);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * Provides tab specific settings.

-         *

-         * @since 1.0.0

-         * @param string $current_tab The current settings tab name.

-         * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

-         */

-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * Provides tab specific settings.

+		 *

+		 * @since 1.0.0

+		 * @param string $current_tab The current settings tab name.

+		 * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

+		 */

+		do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

 

-        flush_rewrite_rules(false);

+		flush_rewrite_rules(false);

 

-        $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

+		$current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

 

-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

+		$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

 

-        wp_redirect($redirect_url);

-        exit();

-    endif;

+		wp_redirect($redirect_url);

+		exit();

+	endif;

 

 

 }

 

 

 if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {

-    /**

-     * GeoDirectory dummy data installation.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param string $post_type The post type.

-     */

-    function geodir_autoinstall_admin_header($post_type = 'gd_place')

-    {

+	/**

+	 * GeoDirectory dummy data installation.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param string $post_type The post type.

+	 */

+	function geodir_autoinstall_admin_header($post_type = 'gd_place')

+	{

 

-        global $wpdb, $plugin_prefix;

+		global $wpdb, $plugin_prefix;

 

-        if (!geodir_is_default_location_set()) {

-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

-        } else {

+		if (!geodir_is_default_location_set()) {

+			echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+		} else {

 

-            $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=';

+			$geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=';

 

-            $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");

+			$post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");

 

-            if ($post_counts > 0) {

-                $nonce = wp_create_nonce('geodir_dummy_posts_delete_noncename');

+			if ($post_counts > 0) {

+				$nonce = wp_create_nonce('geodir_dummy_posts_delete_noncename');

 

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . SAMPLE_DATA_SHOW_MSG . '</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\'' . $nonce . '\',\'' . $post_type . '\')" href="javascript:void(0);" redirect_to="' . $geodir_url . '"  >' . DELETE_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_DELETE_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

-            } else {

-                $options_list = '';

-                for ($option = 1; $option <= 30; $option++) {

-                    $selected = '';

-                    if ($option == 10)

-                        $selected = 'selected="selected"';

+				$dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . SAMPLE_DATA_SHOW_MSG . '</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\'' . $nonce . '\',\'' . $post_type . '\')" href="javascript:void(0);" redirect_to="' . $geodir_url . '"  >' . DELETE_BTN_SAMPLE_MSG . '</a></p></div>';

+				$dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_DELETE_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

+			} else {

+				$options_list = '';

+				for ($option = 1; $option <= 30; $option++) {

+					$selected = '';

+					if ($option == 10)

+						$selected = 'selected="selected"';

 

-                    $options_list .= '<option ' . $selected . ' value="' . $option . '">' . $option . '</option>';

-                }

+					$options_list .= '<option ' . $selected . ' value="' . $option . '">' . $option . '</option>';

+				}

 

-                $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');

+				$nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');

 

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . AUTO_INSATALL_MSG . '</b><br /><select class="selected_sample_data">' . $options_list . '</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\'' . $nonce . '\',\'' . $post_type . '\')"   redirect_to="' . $geodir_url . '" >' . INSERT_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_IMPORT_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

+				$dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . AUTO_INSATALL_MSG . '</b><br /><select class="selected_sample_data">' . $options_list . '</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\'' . $nonce . '\',\'' . $post_type . '\')"   redirect_to="' . $geodir_url . '" >' . INSERT_BTN_SAMPLE_MSG . '</a></p></div>';

+				$dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_IMPORT_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

 

-            }

-            echo $dummy_msg;

-            ?>

+			}

+			echo $dummy_msg;

+			?>

             <script>

                 <?php

-                  $default_location = geodir_get_default_location();

-                  $city =  isset($default_location->city) ? $default_location->city : '';

-                  $region =isset($default_location->region) ? $default_location->region : '';

-                  $country =isset($default_location->country) ? $default_location->country : '';

-                  $city_latitude =isset($default_location->city_latitude) ? $default_location->city_latitude : '';

-                  $city_longitude =isset($default_location->city_longitude) ? $default_location->city_longitude : '';

-                ?>

+				  $default_location = geodir_get_default_location();

+				  $city =  isset($default_location->city) ? $default_location->city : '';

+				  $region =isset($default_location->region) ? $default_location->region : '';

+				  $country =isset($default_location->country) ? $default_location->country : '';

+				  $city_latitude =isset($default_location->city_latitude) ? $default_location->city_latitude : '';

+				  $city_longitude =isset($default_location->city_longitude) ? $default_location->city_longitude : '';

+				?>

                 var geocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;

                 var CITY_ADDRESS = '<?php echo $city.','.$region.','.$country;?>';

                 var bound_lat_lng;

@@ -599,8 +599,8 @@ 
                 }

             </script>

         <?php

-        }

-    }

+		}

+	}

 }

 

 /**

@@ -613,20 +613,20 @@ 
  */

 function geodir_insert_dummy_posts()

 {

-    geodir_default_taxonomies();

+	geodir_default_taxonomies();

 

-    ini_set('max_execution_time', 999999); //300 seconds = 5 minutes

+	ini_set('max_execution_time', 999999); //300 seconds = 5 minutes

 

-    global $wpdb, $current_user;

+	global $wpdb, $current_user;

 

-    /**

-     * Contains dummy post content.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once('place_dummy_post.php');

-    delete_transient( 'cached_dummy_images' );

+	/**

+	 * Contains dummy post content.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once('place_dummy_post.php');

+	delete_transient( 'cached_dummy_images' );

 

 }

 

@@ -640,18 +640,18 @@ 
  */

 function geodir_delete_dummy_posts()

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

 

-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+	$post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

 

 

-    foreach ($post_ids as $post_ids_obj) {

-        wp_delete_post($post_ids_obj->post_id);

-    }

+	foreach ($post_ids as $post_ids_obj) {

+		wp_delete_post($post_ids_obj->post_id);

+	}

 

-    //double check posts are deleted

-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+	//double check posts are deleted

+	$wpdb->get_results("DELETE FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

 }

 

 /**

@@ -665,114 +665,114 @@ 
  * @global string $dummy_image_path The dummy image path.

  */

 function geodir_default_taxonomies() {

-    global $wpdb, $dummy_image_path;

+	global $wpdb, $dummy_image_path;

 

-    $category_array = array('Attractions', 'Hotels', 'Restaurants', 'Food Nightlife', 'Festival', 'Videos', 'Feature');

+	$category_array = array('Attractions', 'Hotels', 'Restaurants', 'Food Nightlife', 'Festival', 'Videos', 'Feature');

 

-    $last_catid = '';

+	$last_catid = '';

 

-    $uploads = wp_upload_dir(); // Array of key => value pairs

+	$uploads = wp_upload_dir(); // Array of key => value pairs

 

-    for ($i = 0; $i < count($category_array); $i++) {

-        $parent_catid = 0;

-        if (is_array($category_array[$i])) {

-            $cat_name_arr = $category_array[$i];

-            for ($j = 0; $j < count($cat_name_arr); $j++) {

-                $catname = $cat_name_arr[$j];

+	for ($i = 0; $i < count($category_array); $i++) {

+		$parent_catid = 0;

+		if (is_array($category_array[$i])) {

+			$cat_name_arr = $category_array[$i];

+			for ($j = 0; $j < count($cat_name_arr); $j++) {

+				$catname = $cat_name_arr[$j];

 

-                if (!term_exists($catname, 'gd_placecategory')) {

-                    $last_catid = wp_insert_term($catname, 'gd_placecategory', $args = array('parent' => $parent_catid));

+				if (!term_exists($catname, 'gd_placecategory')) {

+					$last_catid = wp_insert_term($catname, 'gd_placecategory', $args = array('parent' => $parent_catid));

 

-                    if ($j == 0) {

-                        $parent_catid = $last_catid;

-                    }

+					if ($j == 0) {

+						$parent_catid = $last_catid;

+					}

 

 

-                    if (geodir_dummy_folder_exists())

-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

-                    else

-                        $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

+					if (geodir_dummy_folder_exists())

+						$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

+					else

+						$dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

 

-                    $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

+					$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

-                    $catname = str_replace(' ', '_', $catname);

-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

+					$catname = str_replace(' ', '_', $catname);

+					$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

 

-                    if (empty($uploaded['error'])) {

-                        $new_path = $uploaded['file'];

-                        $new_url = $uploaded['url'];

-                    }

+					if (empty($uploaded['error'])) {

+						$new_path = $uploaded['file'];

+						$new_url = $uploaded['url'];

+					}

 

-                    $wp_filetype = wp_check_filetype(basename($new_path), null);

-

-                    $attachment = array(

-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),

-                        'post_mime_type' => $wp_filetype['type'],

-                        'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

-                        'post_content' => '',

-                        'post_status' => 'inherit'

-                    );

-                    $attach_id = wp_insert_attachment($attachment, $new_path);

-

-                    // you must first include the image.php file

-                    // for the function wp_generate_attachment_metadata() to work

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

-                    $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

-                    wp_update_attachment_metadata($attach_id, $attach_data);

-

-                    if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

-                        update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), 'gd_place');

-                    }

-                }

-            }

+					$wp_filetype = wp_check_filetype(basename($new_path), null);

+

+					$attachment = array(

+						'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+						'post_mime_type' => $wp_filetype['type'],

+						'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

+						'post_content' => '',

+						'post_status' => 'inherit'

+					);

+					$attach_id = wp_insert_attachment($attachment, $new_path);

+

+					// you must first include the image.php file

+					// for the function wp_generate_attachment_metadata() to work

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

+					$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

+					wp_update_attachment_metadata($attach_id, $attach_data);

+

+					if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

+						update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), 'gd_place');

+					}

+				}

+			}

 

-        } else {

-            $catname = $category_array[$i];

+		} else {

+			$catname = $category_array[$i];

 

-            if (!term_exists($catname, 'gd_placecategory')) {

-                $last_catid = wp_insert_term($catname, 'gd_placecategory');

+			if (!term_exists($catname, 'gd_placecategory')) {

+				$last_catid = wp_insert_term($catname, 'gd_placecategory');

 

-                if (geodir_dummy_folder_exists())

-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

-                else

-                    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

+				if (geodir_dummy_folder_exists())

+					$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

+				else

+					$dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

 

-                $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

+				$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

-                $catname = str_replace(' ', '_', $catname);

-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

+				$catname = str_replace(' ', '_', $catname);

+				$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

 

-                if (empty($uploaded['error'])) {

-                    $new_path = $uploaded['file'];

-                    $new_url = $uploaded['url'];

-                }

+				if (empty($uploaded['error'])) {

+					$new_path = $uploaded['file'];

+					$new_url = $uploaded['url'];

+				}

 

-                $wp_filetype = wp_check_filetype(basename($new_path), null);

+				$wp_filetype = wp_check_filetype(basename($new_path), null);

 

-                $attachment = array(

-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),

-                    'post_mime_type' => $wp_filetype['type'],

-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

-                    'post_content' => '',

-                    'post_status' => 'inherit'

-                );

+				$attachment = array(

+					'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+					'post_mime_type' => $wp_filetype['type'],

+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

+					'post_content' => '',

+					'post_status' => 'inherit'

+				);

 

-                $attach_id = wp_insert_attachment($attachment, $new_path);

+				$attach_id = wp_insert_attachment($attachment, $new_path);

 

 

-                // you must first include the image.php file

-                // for the function wp_generate_attachment_metadata() to work

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

-                $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

-                wp_update_attachment_metadata($attach_id, $attach_data);

+				// you must first include the image.php file

+				// for the function wp_generate_attachment_metadata() to work

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

+				$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

+				wp_update_attachment_metadata($attach_id, $attach_data);

 

-                if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

-                    update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), 'gd_place');

-                }

-            }

-        }

+				if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

+					update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), 'gd_place');

+				}

+			}

+		}

 

-    }

+	}

 }

 

 /**

@@ -787,144 +787,144 @@ 
  * @return bool Returns true if saved.

  */

 function geodir_update_options($options, $dummy = false) {

-    if ((!isset($_POST) || !$_POST) && !$dummy) return false;

+	if ((!isset($_POST) || !$_POST) && !$dummy) return false;

 

-    foreach ($options as $value) {

-        if ($dummy && isset($value['std']))

-            $_POST[$value['id']] = $value['std'];

+	foreach ($options as $value) {

+		if ($dummy && isset($value['std']))

+			$_POST[$value['id']] = $value['std'];

 

 

-        if (isset($value['type']) && $value['type'] == 'checkbox') :

+		if (isset($value['type']) && $value['type'] == 'checkbox') :

 

-            if (isset($value['id']) && isset($_POST[$value['id']])) {

-                update_option($value['id'], $_POST[$value['id']]);

-            } else {

-                update_option($value['id'], 0);

-            }

+			if (isset($value['id']) && isset($_POST[$value['id']])) {

+				update_option($value['id'], $_POST[$value['id']]);

+			} else {

+				update_option($value['id'], 0);

+			}

 

-        elseif (isset($value['type']) && $value['type'] == 'image_width') :

+		elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

-                if (isset($_POST[$value['id'] . '_crop'])) :

-                    update_option($value['id'] . '_crop', 1);

-                else :

-                    update_option($value['id'] . '_crop', 0);

-                endif;

-            } else {

-                update_option($value['id'] . '_width', $value['std']);

-                update_option($value['id'] . '_height', $value['std']);

-                update_option($value['id'] . '_crop', 1);

-            }

+			if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

+				update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

+				update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

+				if (isset($_POST[$value['id'] . '_crop'])) :

+					update_option($value['id'] . '_crop', 1);

+				else :

+					update_option($value['id'] . '_crop', 0);

+				endif;

+			} else {

+				update_option($value['id'] . '_width', $value['std']);

+				update_option($value['id'] . '_height', $value['std']);

+				update_option($value['id'] . '_crop', 1);

+			}

 

-        elseif (isset($value['type']) && $value['type'] == 'map') :

-            $post_types = array();

-            $categories = array();

+		elseif (isset($value['type']) && $value['type'] == 'map') :

+			$post_types = array();

+			$categories = array();

 

-            if (!empty($_POST['home_map_post_types'])) :

-                foreach ($_POST['home_map_post_types'] as $post_type) :

-                    $post_types[] = $post_type;

-                endforeach;

-            endif;

+			if (!empty($_POST['home_map_post_types'])) :

+				foreach ($_POST['home_map_post_types'] as $post_type) :

+					$post_types[] = $post_type;

+				endforeach;

+			endif;

 

-            update_option('geodir_exclude_post_type_on_map', $post_types);

+			update_option('geodir_exclude_post_type_on_map', $post_types);

 

-            if (!empty($_POST['post_category'])) :

-                foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

-                    $categories[$texonomy] = array();

-                    foreach ($cat_arr as $category) :

-                        $categories[$texonomy][] = $category;

-                    endforeach;

-                    $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

-                endforeach;

-            endif;

-            update_option('geodir_exclude_cat_on_map', $categories);

-            update_option('geodir_exclude_cat_on_map_upgrade', 1);

-        elseif (isset($value['type']) && $value['type'] == 'map_default_settings') :

+			if (!empty($_POST['post_category'])) :

+				foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

+					$categories[$texonomy] = array();

+					foreach ($cat_arr as $category) :

+						$categories[$texonomy][] = $category;

+					endforeach;

+					$categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

+				endforeach;

+			endif;

+			update_option('geodir_exclude_cat_on_map', $categories);

+			update_option('geodir_exclude_cat_on_map_upgrade', 1);

+		elseif (isset($value['type']) && $value['type'] == 'map_default_settings') :

 

 

-            if (!empty($_POST['geodir_default_map_language'])):

-                update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

-            endif;

+			if (!empty($_POST['geodir_default_map_language'])):

+				update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

+			endif;

 

 

-            if (!empty($_POST['geodir_default_map_search_pt'])):

-                update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

-            endif;

+			if (!empty($_POST['geodir_default_map_search_pt'])):

+				update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

+			endif;

 

 

-        elseif (isset($value['type']) && $value['type'] == 'file') :

+		elseif (isset($value['type']) && $value['type'] == 'file') :

 

 

-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

+			if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

 

-                if (get_option($value['id'])) {

-                    $image_name_arr = explode('/', get_option($value['id']));

-                    $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

+				if (get_option($value['id'])) {

+					$image_name_arr = explode('/', get_option($value['id']));

+					$noimg_name = end($image_name_arr);

+					$img_path = $uploads['path'] . '/' . $noimg_name;

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

-                update_option($value['id'], '');

-            }

+				update_option($value['id'], '');

+			}

 

-            $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

-            $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

-

-            if (!empty($filename)):

-                $ext = pathinfo($filename, PATHINFO_EXTENSION);

-                $uplaods = array();

-

-                foreach ($uploadedfile as $key => $uplaod):

-                    if ($key == 'name'):

-                        $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

-                    endif;

-                endforeach;

-

-                $uploads = wp_upload_dir();

-

-                if (get_option($value['id'])) {

-                    $image_name_arr = explode('/', get_option($value['id']));

-                    $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

+			$uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

+			$filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

+

+			if (!empty($filename)):

+				$ext = pathinfo($filename, PATHINFO_EXTENSION);

+				$uplaods = array();

+

+				foreach ($uploadedfile as $key => $uplaod):

+					if ($key == 'name'):

+						$uplaods[$key] = $filename;

+					else :

+						$uplaods[$key] = $uplaod;

+					endif;

+				endforeach;

+

+				$uploads = wp_upload_dir();

+

+				if (get_option($value['id'])) {

+					$image_name_arr = explode('/', get_option($value['id']));

+					$noimg_name = end($image_name_arr);

+					$img_path = $uploads['path'] . '/' . $noimg_name;

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

-                $upload_overrides = array('test_form' => false);

-                $movefile = wp_handle_upload($uplaods, $upload_overrides);

+				$upload_overrides = array('test_form' => false);

+				$movefile = wp_handle_upload($uplaods, $upload_overrides);

 

-                update_option($value['id'], $movefile['url']);

+				update_option($value['id'], $movefile['url']);

 

-            endif;

+			endif;

 

-            if (!get_option($value['id']) && isset($value['value'])):

-                update_option($value['id'], $value['value']);

-            endif;

+			if (!get_option($value['id']) && isset($value['value'])):

+				update_option($value['id'], $value['value']);

+			endif;

 

 

-        else :

-            // same menu setting per theme.

-            if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

-                $theme = wp_get_theme();

-                update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

-            }

+		else :

+			// same menu setting per theme.

+			if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

+				$theme = wp_get_theme();

+				update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

+			}

 

-            if (isset($value['id']) && isset($_POST[$value['id']])) {

-                update_option($value['id'], $_POST[$value['id']]);

-            } else {

-                delete_option($value['id']);

-            }

+			if (isset($value['id']) && isset($_POST[$value['id']])) {

+				update_option($value['id'], $_POST[$value['id']]);

+			} else {

+				delete_option($value['id']);

+			}

 

-        endif;

-    }

-    if ($dummy)

-        $_POST = array();

-    return true;

+		endif;

+	}

+	if ($dummy)

+		$_POST = array();

+	return true;

 

 }

 

@@ -973,33 +973,33 @@ 
 function places_custom_fields_tab($tabs)

 {

 

-    $geodir_post_types = get_option('geodir_post_types');

+	$geodir_post_types = get_option('geodir_post_types');

 

-    if (!empty($geodir_post_types)) {

+	if (!empty($geodir_post_types)) {

 

-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

 

-            $listing_slug = $geodir_posttype_info['labels']['singular_name'];

+			$listing_slug = $geodir_posttype_info['labels']['singular_name'];

 

-            $tabs[$geodir_post_type . '_fields_settings'] = array(

-                'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

-                'subtabs' => array(

-                    array('subtab' => 'custom_fields',

-                        'label' => __('Custom Fields', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                    array('subtab' => 'sorting_options',

-                        'label' => __('Sorting Options', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                ),

-                'tab_index' => 9,

-                'request' => array('listing_type' => $geodir_post_type)

-            );

+			$tabs[$geodir_post_type . '_fields_settings'] = array(

+				'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

+				'subtabs' => array(

+					array('subtab' => 'custom_fields',

+						'label' => __('Custom Fields', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+					array('subtab' => 'sorting_options',

+						'label' => __('Sorting Options', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+				),

+				'tab_index' => 9,

+				'request' => array('listing_type' => $geodir_post_type)

+			);

 

-        endforeach;

+		endforeach;

 

-    }

+	}

 

-    return $tabs;

+	return $tabs;

 }

 

 

@@ -1015,9 +1015,9 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

-    wp_enqueue_script( 'jquery-ui-progressbar' );

-    $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

-    return $tabs;

+	wp_enqueue_script( 'jquery-ui-progressbar' );

+	$tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

+	return $tabs;

 }

 

 /**

@@ -1032,8 +1032,8 @@ 
  */

 function geodir_compatibility_setting_tab($tabs)

 {

-    $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

-    return $tabs;

+	$tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

+	return $tabs;

 }

 

 

@@ -1049,144 +1049,144 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

-    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'http://wpgeodirectory.com', 'target' => '_blank');

-    return $tabs;

+	$tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'http://wpgeodirectory.com', 'target' => '_blank');

+	return $tabs;

 }

 

 

 if (!function_exists('geodir_edit_post_columns')) {

-    /**

-     * Modify admin post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_edit_post_columns($columns)

-    {

-

-        $new_columns = array('location' => __('Location (ID)', 'geodirectory'),

-            'categorys' => __('Categories', 'geodirectory'));

-

-        if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

-        {

-            $offset = 0; // should we prepend $array with $data?

-            $offset = count($columns); // or should we append $array with $data? lets pick this one...

-        }

+	/**

+	 * Modify admin post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_edit_post_columns($columns)

+	{

+

+		$new_columns = array('location' => __('Location (ID)', 'geodirectory'),

+			'categorys' => __('Categories', 'geodirectory'));

 

-        $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

+		if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

+		{

+			$offset = 0; // should we prepend $array with $data?

+			$offset = count($columns); // or should we append $array with $data? lets pick this one...

+		}

 

-        $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+		$columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

 

-        return $columns;

-    }

+		$columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+

+		return $columns;

+	}

 }

 

 

 if (!function_exists('geodir_manage_post_columns')) {

-    /**

-     * Adds content to our custom post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post WordPress Post object.

-     * @param string $column The column name.

-     * @param int $post_id The post ID.

-     */

-    function geodir_manage_post_columns($column, $post_id)

-    {

-        global $post, $wpdb;

-

-        switch ($column):

-            /* If displaying the 'city' column. */

-            case 'location' :

-                $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

-                $location = geodir_get_location($location_id);

-                /* If no city is found, output a default message. */

-                if (empty($location)) {

-                    _e('Unknown', 'geodirectory');

-                } else {

-                    /* If there is a city id, append 'city name' to the text string. */

-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

-                }

-                break;

-

-            /* If displaying the 'expire' column. */

-            case 'expire' :

-                $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true);

-                $d1 = $expire_date; // get expire_date

-                $d2 = date('Y-m-d'); // get current date

-                $state = __('days left', 'geodirectory');

-                $date_diff_text = '';

-                $expire_class = 'expire_left';

-                if ($expire_date != 'Never') {

-                    if (strtotime($d1) < strtotime($d2)) {

-                        $state = __('days overdue', 'geodirectory');

-                        $expire_class = 'expire_over';

-                    }

-                    $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

-                }

-                /* If no expire_date is found, output a default message. */

-                if (empty($expire_date))

-                    echo __('Unknown', 'geodirectory');

-                /* If there is a expire_date, append 'days left' to the text string. */

-                else

-                    echo $expire_date . $date_diff_text;

-                break;

-

-            /* If displaying the 'categorys' column. */

-            case 'categorys' :

-

-                /* Get the categorys for the post. */

-

-

-                $terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

-

-                /* If terms were found. */

-                if (!empty($terms)) {

-                    $out = array();

-                    /* Loop through each term, linking to the 'edit posts' page for the specific term. */

-                    foreach ($terms as $term) {

-                        if (!strstr($term->taxonomy, 'tag')) {

-                            $out[] = sprintf('<a href="%s">%s</a>',

-                                esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

-                                esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

-                            );

-                        }

-                    }

-                    /* Join the terms, separating them with a comma. */

-                    echo(join(', ', $out));

-                } /* If no terms were found, output a default message. */

-                else {

-                    _e('No Categories', 'geodirectory');

-                }

-                break;

+	/**

+	 * Adds content to our custom post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post WordPress Post object.

+	 * @param string $column The column name.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_manage_post_columns($column, $post_id)

+	{

+		global $post, $wpdb;

+

+		switch ($column):

+			/* If displaying the 'city' column. */

+			case 'location' :

+				$location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

+				$location = geodir_get_location($location_id);

+				/* If no city is found, output a default message. */

+				if (empty($location)) {

+					_e('Unknown', 'geodirectory');

+				} else {

+					/* If there is a city id, append 'city name' to the text string. */

+					$add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

+					echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

+				}

+				break;

+

+			/* If displaying the 'expire' column. */

+			case 'expire' :

+				$expire_date = geodir_get_post_meta($post->ID, 'expire_date', true);

+				$d1 = $expire_date; // get expire_date

+				$d2 = date('Y-m-d'); // get current date

+				$state = __('days left', 'geodirectory');

+				$date_diff_text = '';

+				$expire_class = 'expire_left';

+				if ($expire_date != 'Never') {

+					if (strtotime($d1) < strtotime($d2)) {

+						$state = __('days overdue', 'geodirectory');

+						$expire_class = 'expire_over';

+					}

+					$date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

+					$date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

+				}

+				/* If no expire_date is found, output a default message. */

+				if (empty($expire_date))

+					echo __('Unknown', 'geodirectory');

+				/* If there is a expire_date, append 'days left' to the text string. */

+				else

+					echo $expire_date . $date_diff_text;

+				break;

 

-        endswitch;

-    }

+			/* If displaying the 'categorys' column. */

+			case 'categorys' :

+

+				/* Get the categorys for the post. */

+

+

+				$terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

+

+				/* If terms were found. */

+				if (!empty($terms)) {

+					$out = array();

+					/* Loop through each term, linking to the 'edit posts' page for the specific term. */

+					foreach ($terms as $term) {

+						if (!strstr($term->taxonomy, 'tag')) {

+							$out[] = sprintf('<a href="%s">%s</a>',

+								esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

+								esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

+							);

+						}

+					}

+					/* Join the terms, separating them with a comma. */

+					echo(join(', ', $out));

+				} /* If no terms were found, output a default message. */

+				else {

+					_e('No Categories', 'geodirectory');

+				}

+				break;

+

+		endswitch;

+	}

 }

 

 

 if (!function_exists('geodir_post_sortable_columns')) {

-    /**

-     * Makes admin post listing page columns sortable.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_post_sortable_columns($columns)

-    {

-

-        $columns['expire'] = 'expire';

-

-        return $columns;

-    }

+	/**

+	 * Makes admin post listing page columns sortable.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_post_sortable_columns($columns)

+	{

+

+		$columns['expire'] = 'expire';

+

+		return $columns;

+	}

 }

 

 /**

@@ -1200,32 +1200,32 @@ 
  * @param int $post_id The post ID.

  */

 function geodir_post_information_save($post_id, $post) {

-    global $wpdb, $current_user;

+	global $wpdb, $current_user;

 

-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

-        return;

-    }

+	if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

+		return;

+	}

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

-    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

-        return;

+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

+		return;

 

-    if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

-        if (isset($_REQUEST['_status']))

-            geodir_change_post_status($post_id, $_REQUEST['_status']);

+	if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

+		if (isset($_REQUEST['_status']))

+			geodir_change_post_status($post_id, $_REQUEST['_status']);

 

-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

-            return;

+		if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

+			return;

 

-        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

-            return;

+		if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

+			return;

 

-        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

-            return;

+		if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

+			return;

 

-        geodir_save_listing($_REQUEST);

-    }

+		geodir_save_listing($_REQUEST);

+	}

 }

 

 /**

@@ -1241,102 +1241,102 @@ 
  */

 function geodir_admin_fields($options)

 {

-    global $geodirectory;

-

-    $first_title = true;

-    $tab_id = '';

-    $i = 0;

-    foreach ($options as $value) :

-        if (!isset($value['name'])) $value['name'] = '';

-        if (!isset($value['class'])) $value['class'] = '';

-        if (!isset($value['css'])) $value['css'] = '';

-        if (!isset($value['std'])) $value['std'] = '';

-        $desc = '';

-        switch ($value['type']) :

-            case 'dummy_installer':

-                $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

-                geodir_autoinstall_admin_header($post_type);

-                break;

-            case 'title':

-

-                if ($i == 0) {

-                    echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

-                    echo '<div class="inner_content_tab_main">';

-                }

+	global $geodirectory;

+

+	$first_title = true;

+	$tab_id = '';

+	$i = 0;

+	foreach ($options as $value) :

+		if (!isset($value['name'])) $value['name'] = '';

+		if (!isset($value['class'])) $value['class'] = '';

+		if (!isset($value['css'])) $value['css'] = '';

+		if (!isset($value['std'])) $value['std'] = '';

+		$desc = '';

+		switch ($value['type']) :

+			case 'dummy_installer':

+				$post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

+				geodir_autoinstall_admin_header($post_type);

+				break;

+			case 'title':

+

+				if ($i == 0) {

+					echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

+					echo '<div class="inner_content_tab_main">';

+				}

 

-                $i++;

+				$i++;

 

-                if (isset($value['id']) && $value['id'])

-                    $tab_id = $value['id'];

+				if (isset($value['id']) && $value['id'])

+					$tab_id = $value['id'];

 

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+				if (isset($value['desc']) && $value['desc'])

+					$desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

 

-                if (isset($value['name']) && $value['name']) {

-                    if ($first_title === true) {

-                        $first_title = false;

-                    } else {

-                        echo '</div>';

-                    }

-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

+				if (isset($value['name']) && $value['name']) {

+					if ($first_title === true) {

+						$first_title = false;

+					} else {

+						echo '</div>';

+					}

+					echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

 

-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

-                }

+					echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+				}

 

-                /**

-                 * Called after a GeoDirectory settings title is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id'].

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_settings_' . sanitize_title($value['id']));

-                break;

-

-            case 'no_tabs':

-

-                echo '<div class="inner_content_tab_main">';

-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

-

-                break;

-

-            case 'sectionstart':

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

-                if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

-                /**

-                 * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_start.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

-                echo '<table class="form-table">' . "\n\n";

-

-                break;

-            case 'sectionend':

-                /**

-                 * Called before a GeoDirectory settings sectionend is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

-                echo '</table>';

-                /**

-                 * Called after a GeoDirectory settings sectionend is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

-                break;

-            case 'text':

-                ?>

+				/**

+				 * Called after a GeoDirectory settings title is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id'].

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_settings_' . sanitize_title($value['id']));

+				break;

+

+			case 'no_tabs':

+

+				echo '<div class="inner_content_tab_main">';

+				echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+

+				break;

+

+			case 'sectionstart':

+				if (isset($value['desc']) && $value['desc'])

+					$desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

+				if (isset($value['name']) && $value['name'])

+					echo '<h3>' . $value['name'] . $desc . '</h3>';

+				/**

+				 * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_start.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

+				echo '<table class="form-table">' . "\n\n";

+

+				break;

+			case 'sectionend':

+				/**

+				 * Called before a GeoDirectory settings sectionend is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+				echo '</table>';

+				/**

+				 * Called after a GeoDirectory settings sectionend is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+				break;

+			case 'text':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1345,15 +1345,15 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style=" <?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'password':

-                ?>

+			case 'password':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1362,42 +1362,42 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'html_content':

-                ?>

+			case 'html_content':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'color' :

-                ?>

+			case 'color' :

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>" type="text"

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>" class="colorpick"/> <span

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>" class="colorpick"/> <span

                         class="description"><?php echo $value['desc']; ?></span>

 

                     <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv"

                          style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div>

                 </td>

                 </tr><?php

-                break;

-            case 'image_width' :

-                ?>

+				break;

+			case 'image_width' :

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1419,11 +1419,11 @@ 
 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

-                break;

-            case 'select':

-                $option_value = get_option($value['id']);

-                $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value;

-                ?>

+				break;

+			case 'select':

+				$option_value = get_option($value['id']);

+				$option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value;

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -1432,33 +1432,33 @@ 
                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"

                                             option-ajaxchosen="false">

                         <?php

-                        foreach ($value['options'] as $key => $val) {

-                            $geodir_select_value = '';

-                            if ($option_value != '') {

-                                if ($option_value != '' && $option_value == $key)

-                                    $geodir_select_value = ' selected="selected" ';

-                            } else {

-                                if ($value['std'] == $key)

-                                    $geodir_select_value = ' selected="selected" ';

-                            }

-                            ?>

+						foreach ($value['options'] as $key => $val) {

+							$geodir_select_value = '';

+							if ($option_value != '') {

+								if ($option_value != '' && $option_value == $key)

+									$geodir_select_value = ' selected="selected" ';

+							} else {

+								if ($value['std'] == $key)

+									$geodir_select_value = ' selected="selected" ';

+							}

+							?>

                             <option

                                 value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo ucfirst($val) ?></option>

                         <?php

-                        }

-                        ?>

+						}

+						?>

                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'multiselect':

-                $option_values = get_option($value['id']);

-                if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {

-                   $option_values = $value['std'];

-                }

-                $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values;

-                ?>

+			case 'multiselect':

+				$option_values = get_option($value['id']);

+				if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {

+				   $option_values = $value['std'];

+				}

+				$option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values;

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

@@ -1468,25 +1468,25 @@ 
                                             data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

                                             option-ajaxchosen="false">

                         <?php

-                        foreach ($value['options'] as $key => $val) {

-                            if (strpos($key, 'optgroup_start-') === 0) {

-                                ?><optgroup label="<?php echo ucfirst($val); ?>"><?php

-                            } else if (strpos($key, 'optgroup_end-') === 0) {

-                                ?></optgroup><?php

-                            } else {

-                                ?>

+						foreach ($value['options'] as $key => $val) {

+							if (strpos($key, 'optgroup_start-') === 0) {

+								?><optgroup label="<?php echo ucfirst($val); ?>"><?php

+							} else if (strpos($key, 'optgroup_end-') === 0) {

+								?></optgroup><?php

+							} else {

+								?>

                                 <option

                                     value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>><?php echo ucfirst($val) ?></option>

                             <?php

-                            }

-                        }

-                        ?>

+							}

+						}

+						?>

                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

-            case 'file':

-                ?>

+				break;

+			case 'file':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp">

@@ -1506,87 +1506,87 @@ 
                     <?php } ?>

                 </td>

                 </tr><?php

-                break;

-            case 'map_default_settings' :

-                ?>

+				break;

+			case 'map_default_settings' :

+				?>

 

                 <tr valign="top">

                     <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>

                     <td width="60%">

                         <select name="geodir_default_map_language" style="width:60%">

                             <?php

-                            $arr_map_langages = array(

-                                'ar' => __('ARABIC', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'bg' => __('BULGARIAN', 'geodirectory'),

-                                'bn' => __('BENGALI', 'geodirectory'),

-                                'ca' => __('CATALAN', 'geodirectory'),

-                                'cs' => __('CZECH', 'geodirectory'),

-                                'da' => __('DANISH', 'geodirectory'),

-                                'de' => __('GERMAN', 'geodirectory'),

-                                'el' => __('GREEK', 'geodirectory'),

-                                'en' => __('ENGLISH', 'geodirectory'),

-                                'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

-                                'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

-                                'es' => __('SPANISH', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'fa' => __('FARSI', 'geodirectory'),

-                                'fi' => __('FINNISH', 'geodirectory'),

-                                'fil' => __('FILIPINO', 'geodirectory'),

-                                'fr' => __('FRENCH', 'geodirectory'),

-                                'gl' => __('GALICIAN', 'geodirectory'),

-                                'gu' => __('GUJARATI', 'geodirectory'),

-                                'hi' => __('HINDI', 'geodirectory'),

-                                'hr' => __('CROATIAN', 'geodirectory'),

-                                'hu' => __('HUNGARIAN', 'geodirectory'),

-                                'id' => __('INDONESIAN', 'geodirectory'),

-                                'it' => __('ITALIAN', 'geodirectory'),

-                                'iw' => __('HEBREW', 'geodirectory'),

-                                'ja' => __('JAPANESE', 'geodirectory'),

-                                'kn' => __('KANNADA', 'geodirectory'),

-                                'ko' => __('KOREAN', 'geodirectory'),

-                                'lt' => __('LITHUANIAN', 'geodirectory'),

-                                'lv' => __('LATVIAN', 'geodirectory'),

-                                'ml' => __('MALAYALAM', 'geodirectory'),

-                                'mr' => __('MARATHI', 'geodirectory'),

-                                'nl' => __('DUTCH', 'geodirectory'),

-                                'no' => __('NORWEGIAN', 'geodirectory'),

-                                'pl' => __('POLISH', 'geodirectory'),

-                                'pt' => __('PORTUGUESE', 'geodirectory'),

-                                'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

-                                'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

-                                'ro' => __('ROMANIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'sk' => __('SLOVAK', 'geodirectory'),

-                                'sl' => __('SLOVENIAN', 'geodirectory'),

-                                'sr' => __('SERBIAN', 'geodirectory'),

-                                'sv' => __('	SWEDISH', 'geodirectory'),

-                                'tl' => __('TAGALOG', 'geodirectory'),

-                                'ta' => __('TAMIL', 'geodirectory'),

-                                'te' => __('TELUGU', 'geodirectory'),

-                                'th' => __('THAI', 'geodirectory'),

-                                'tr' => __('TURKISH', 'geodirectory'),

-                                'uk' => __('UKRAINIAN', 'geodirectory'),

-                                'vi' => __('VIETNAMESE', 'geodirectory'),

-                                'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

-                                'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

-                            );

-                            $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

-                            foreach ($arr_map_langages as $language_key => $language_txt) {

-                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

-                                    $geodir_default_language_selected = "selected='selected'";

-                                else

-                                    $geodir_default_language_selected = '';

-

-                                ?>

+							$arr_map_langages = array(

+								'ar' => __('ARABIC', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'bg' => __('BULGARIAN', 'geodirectory'),

+								'bn' => __('BENGALI', 'geodirectory'),

+								'ca' => __('CATALAN', 'geodirectory'),

+								'cs' => __('CZECH', 'geodirectory'),

+								'da' => __('DANISH', 'geodirectory'),

+								'de' => __('GERMAN', 'geodirectory'),

+								'el' => __('GREEK', 'geodirectory'),

+								'en' => __('ENGLISH', 'geodirectory'),

+								'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

+								'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

+								'es' => __('SPANISH', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'fa' => __('FARSI', 'geodirectory'),

+								'fi' => __('FINNISH', 'geodirectory'),

+								'fil' => __('FILIPINO', 'geodirectory'),

+								'fr' => __('FRENCH', 'geodirectory'),

+								'gl' => __('GALICIAN', 'geodirectory'),

+								'gu' => __('GUJARATI', 'geodirectory'),

+								'hi' => __('HINDI', 'geodirectory'),

+								'hr' => __('CROATIAN', 'geodirectory'),

+								'hu' => __('HUNGARIAN', 'geodirectory'),

+								'id' => __('INDONESIAN', 'geodirectory'),

+								'it' => __('ITALIAN', 'geodirectory'),

+								'iw' => __('HEBREW', 'geodirectory'),

+								'ja' => __('JAPANESE', 'geodirectory'),

+								'kn' => __('KANNADA', 'geodirectory'),

+								'ko' => __('KOREAN', 'geodirectory'),

+								'lt' => __('LITHUANIAN', 'geodirectory'),

+								'lv' => __('LATVIAN', 'geodirectory'),

+								'ml' => __('MALAYALAM', 'geodirectory'),

+								'mr' => __('MARATHI', 'geodirectory'),

+								'nl' => __('DUTCH', 'geodirectory'),

+								'no' => __('NORWEGIAN', 'geodirectory'),

+								'pl' => __('POLISH', 'geodirectory'),

+								'pt' => __('PORTUGUESE', 'geodirectory'),

+								'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

+								'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

+								'ro' => __('ROMANIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'sk' => __('SLOVAK', 'geodirectory'),

+								'sl' => __('SLOVENIAN', 'geodirectory'),

+								'sr' => __('SERBIAN', 'geodirectory'),

+								'sv' => __('	SWEDISH', 'geodirectory'),

+								'tl' => __('TAGALOG', 'geodirectory'),

+								'ta' => __('TAMIL', 'geodirectory'),

+								'te' => __('TELUGU', 'geodirectory'),

+								'th' => __('THAI', 'geodirectory'),

+								'tr' => __('TURKISH', 'geodirectory'),

+								'uk' => __('UKRAINIAN', 'geodirectory'),

+								'vi' => __('VIETNAMESE', 'geodirectory'),

+								'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

+								'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

+							);

+							$geodir_default_map_language = get_option('geodir_default_map_language');

+							if (empty($geodir_default_map_language))

+								$geodir_default_map_language = 'en';

+							foreach ($arr_map_langages as $language_key => $language_txt) {

+								if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

+									$geodir_default_language_selected = "selected='selected'";

+								else

+									$geodir_default_language_selected = '';

+

+								?>

                                 <option

                                     value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option>

 

                             <?php }

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

@@ -1597,46 +1597,46 @@ 
                     <td width="60%">

                         <select name="geodir_default_map_search_pt" style="width:60%">

                             <?php

-                            $post_types = geodir_get_posttypes('array');

-                            $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-                            if (empty($geodir_default_map_search_pt))

-                                $geodir_default_map_search_pt = 'gd_place';

-                            if (is_array($post_types)) {

-                                foreach ($post_types as $key => $post_types_obj) {

-                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

-                                        $geodir_search_pt_selected = "selected='selected'";

-                                    else

-                                        $geodir_search_pt_selected = '';

-

-                                    ?>

+							$post_types = geodir_get_posttypes('array');

+							$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

+							if (empty($geodir_default_map_search_pt))

+								$geodir_default_map_search_pt = 'gd_place';

+							if (is_array($post_types)) {

+								foreach ($post_types as $key => $post_types_obj) {

+									if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

+										$geodir_search_pt_selected = "selected='selected'";

+									else

+										$geodir_search_pt_selected = '';

+

+									?>

                                     <option

                                         value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo $post_types_obj['labels']['singular_name']; ?></option>

 

                                 <?php }

 

-                            }

+							}

 

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

 

                 <?php

-                break;

+				break;

 

-            case 'map':

-                ?>

+			case 'map':

+				?>

                 <tr valign="top">

                     <td class="forminp">

                         <?php

-                        global $post_cat, $cat_display;

-                        $post_types = geodir_get_posttypes('object');

-                        $cat_display = 'checkbox';

-                        $gd_post_types = get_option('geodir_exclude_post_type_on_map');

-                        $gd_cats = get_option('geodir_exclude_cat_on_map');

-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

-                        $count = 1;

-                        ?>

+						global $post_cat, $cat_display;

+						$post_types = geodir_get_posttypes('object');

+						$cat_display = 'checkbox';

+						$gd_post_types = get_option('geodir_exclude_post_type_on_map');

+						$gd_cats = get_option('geodir_exclude_cat_on_map');

+						$gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

+						$count = 1;

+						?>

                         <table width="70%" class="widefat">

                             <thead>

                             <tr>

@@ -1645,18 +1645,18 @@ 
                                 <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th>

                             </tr>

                             <?php

-                            $gd_categs = $gd_cats;

-                            foreach ($post_types as $key => $post_types_obj) :

-                                $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

-                                $gd_taxonomy = geodir_get_taxonomies($key);

-                                if ($gd_cats_upgrade) {

-                                    $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';

-                                    $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

-                                    $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();

-                                }

-                                $post_cat = implode(',', $gd_cats);

-                                $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

-                                ?>

+							$gd_categs = $gd_cats;

+							foreach ($post_types as $key => $post_types_obj) :

+								$checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

+								$gd_taxonomy = geodir_get_taxonomies($key);

+								if ($gd_cats_upgrade) {

+									$gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';

+									$gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

+									$gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();

+								}

+								$post_cat = implode(',', $gd_cats);

+								$gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

+								?>

                                 <tr>

                                     <td valign="top" width="5%"><?php echo $count; ?></td>

                                     <td valign="top" width="25%" id="td_post_types"><input type="checkbox"

@@ -1677,19 +1677,19 @@ 
                     </td>

                 </tr>

                 <?php

-                break;

+				break;

 

-            case 'checkbox' :

+			case 'checkbox' :

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

+					?>

                     <tr valign="top">

                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

                     <label for="<?php echo $value['id'] ?>">

@@ -1699,49 +1699,49 @@ 
                 </fieldset>

                 <?php

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'radio' :

+			case 'radio' :

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

+					?>

                     <tr valign="top">

                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

                     <label for="<?php echo $value['id'];?>">

                         <input name="<?php echo esc_attr($value['id']); ?>"

                                id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

-                            echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+							echo 'checked="checked"';

+						}elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'textarea':

-                ?>

+			case 'textarea':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1754,30 +1754,30 @@ 
 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'editor':

-                ?>

+			case 'editor':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><?php

-                    if (get_option($value['id']))

-                        $content = stripslashes(get_option($value['id']));

-                    else

-                        $content = $value['std'];

+					if (get_option($value['id']))

+						$content = stripslashes(get_option($value['id']));

+					else

+						$content = $value['std'];

 

-                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

+					$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

 

-                    wp_editor($content, esc_attr($value['id']), $editor_settings);

+					wp_editor($content, esc_attr($value['id']), $editor_settings);

 

-                    ?> <span class="description"><?php echo $value['desc'] ?></span>

+					?> <span class="description"><?php echo $value['desc'] ?></span>

 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'single_select_page' :

-                // WPML

+			case 'single_select_page' :

+				// WPML

 				$switch_lang = false;

 				$disabled = '';

 				if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

@@ -1795,18 +1795,18 @@ 
 				//

 				$page_setting = (int)get_option($value['id']);

 

-                $args = array('name' => $value['id'],

-                    'id' => $value['id'],

-                    'sort_column' => 'menu_order',

-                    'sort_order' => 'ASC',

-                    'show_option_none' => ' ',

-                    'class' => $value['class'],

-                    'echo' => false,

-                    'selected' => $page_setting);

+				$args = array('name' => $value['id'],

+					'id' => $value['id'],

+					'sort_column' => 'menu_order',

+					'sort_order' => 'ASC',

+					'show_option_none' => ' ',

+					'class' => $value['class'],

+					'echo' => false,

+					'selected' => $page_setting);

 

-                if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

+				if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

 

-                ?>

+				?>

                 <tr valign="top" class="single_select_page">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1817,17 +1817,17 @@ 
 				if ($switch_lang) {

 					$sitepress->switch_lang($switch_lang, true);

 				}

-                break;

-            case 'single_select_country' :

-                $country_setting = (string)get_option($value['id']);

-                if (strstr($country_setting, ':')) :

-                    $country = current(explode(':', $country_setting));

-                    $state = end(explode(':', $country_setting));

-                else :

-                    $country = $country_setting;

-                    $state = '*';

-                endif;

-                ?>

+				break;

+			case 'single_select_country' :

+				$country_setting = (string)get_option($value['id']);

+				if (strstr($country_setting, ':')) :

+					$country = current(explode(':', $country_setting));

+					$state = end(explode(':', $country_setting));

+				else :

+					$country = $country_setting;

+					$state = '*';

+				endif;

+				?>

                 <tr valign="top">

                 <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -1838,12 +1838,12 @@ 
                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

-            case 'multi_select_countries' :

-                $countries = $geodirectory->countries->countries;

-                asort($countries);

-                $selections = (array)get_option($value['id']);

-                ?>

+				break;

+			case 'multi_select_countries' :

+				$countries = $geodirectory->countries->countries;

+				asort($countries);

+				$selections = (array)get_option($value['id']);

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1851,22 +1851,22 @@ 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"

                             title="Country" class="chosen_select">

                         <?php

-                        if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

-                        endforeach;

-                        ?>

+						if ($countries) foreach ($countries as $key => $val) :

+							echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+						endforeach;

+						?>

                     </select>

                 </td>

                 </tr>

 

                 <?php

 

-                break;

+				break;

 

-            case 'google_analytics' :

-                $selections = (array)get_option($value['id']);

-                if(get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret') ) {

-                    ?>

+			case 'google_analytics' :

+				$selections = (array)get_option($value['id']);

+				if(get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret') ) {

+					?>

                     <tr valign="top">

                         <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                         <td class="forminp">

@@ -1874,19 +1874,19 @@ 
 

                             <?php

 

-                            $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

-                            $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

-                            $state = "&state=123";//any string

-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

-                            $response_type = "&response_type=code";

-                            $client_id = "&client_id=".get_option('geodir_ga_client_id');

-                            $access_type = "&access_type=offline";

-                            $approval_prompt = "&approval_prompt=force";

+							$oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

+							$scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

+							$state = "&state=123";//any string

+							$redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+							$response_type = "&response_type=code";

+							$client_id = "&client_id=".get_option('geodir_ga_client_id');

+							$access_type = "&access_type=offline";

+							$approval_prompt = "&approval_prompt=force";

 

-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

+							$auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

 

 

-                            ?>

+							?>

                             <script>

                                 function gd_ga_popup() {

                                     var win = window.open("<?php echo $auth_url;?>", "Google Analytics", "");

@@ -1901,47 +1901,47 @@ 
                             </script>

 

                             <?php

-                            if (get_option('gd_ga_refresh_token')) {

-                                ?>

+							if (get_option('gd_ga_refresh_token')) {

+								?>

                                 <span class="button-primary"

                                       onclick="gd_ga_popup();"><?php _e('Re-authorize', 'geodirectory'); ?></span>

                                 <span

                                     style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>

                             <?php

-                            } else {

-                                ?>

+							} else {

+								?>

                                 <span class="button-primary"

                                       onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory');?></span>

                             <?php

-                            }

-                            ?>

+							}

+							?>

                         </td>

                     </tr>

 

                 <?php

-                }

+				}

 

-                break;

+				break;

 

-            case 'field_seperator' :

+			case 'field_seperator' :

 

-                ?>

+				?>

                 <tr valign="top">

                     <td colspan="2" class="forminp geodir_line_seperator"></td>

                 </tr>

                 <?php

 

-                break;

+				break;

 

-        endswitch;

+		endswitch;

 

-    endforeach;

+	endforeach;

 

-    if ($first_title === false) {

-        echo "</div>";

-    }

+	if ($first_title === false) {

+		echo "</div>";

+	}

 

-    ?>

+	?>

 

     <script type="text/javascript">

 

@@ -2001,33 +2001,33 @@ 
  */

 function geodir_post_info_setting()

 {

-    global $post, $post_id;

-

-    $post_type = get_post_type();

-

-    $package_info = array();

-

-    $package_info = geodir_post_package_info($package_info, $post, $post_type);

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

-    echo '<div id="geodir_wrapper">';

-    /**

-     * Called before the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_after_default_field_in_meta_box'

-     */

-    do_action('geodir_before_default_field_in_meta_box');

-    //geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

-    // to display all fields in one information box

-    geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

-    /**

-     * Called after the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_before_default_field_in_meta_box'

-     */

-    do_action('geodir_after_default_field_in_meta_box');

-    echo '</div>';

+	global $post, $post_id;

+

+	$post_type = get_post_type();

+

+	$package_info = array();

+

+	$package_info = geodir_post_package_info($package_info, $post, $post_type);

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

+	echo '<div id="geodir_wrapper">';

+	/**

+	 * Called before the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_after_default_field_in_meta_box'

+	 */

+	do_action('geodir_before_default_field_in_meta_box');

+	//geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

+	// to display all fields in one information box

+	geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

+	/**

+	 * Called after the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_before_default_field_in_meta_box'

+	 */

+	do_action('geodir_after_default_field_in_meta_box');

+	echo '</div>';

 }

 

 /**

@@ -2040,18 +2040,18 @@ 
  */

 function geodir_post_addinfo_setting()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    $post_type = get_post_type();

+	$post_type = get_post_type();

 

-    $package_info = array();

+	$package_info = array();

 

-    $package_info = geodir_post_package_info($package_info, $post, $post_type);

+	$package_info = geodir_post_package_info($package_info, $post, $post_type);

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

-    echo '<div id="geodir_wrapper">';

-    geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

-    echo '</div>';

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

+	echo '<div id="geodir_wrapper">';

+	geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

+	echo '</div>';

 

 }

 

@@ -2065,60 +2065,60 @@ 
  */

 function geodir_post_attachments()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

-    if (geodir_get_featured_image($post_id, 'thumbnail')) {

-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

-        geodir_show_featured_image($post_id, 'thumbnail');

-    }

+	if (geodir_get_featured_image($post_id, 'thumbnail')) {

+		echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

+		geodir_show_featured_image($post_id, 'thumbnail');

+	}

 

-    $image_limit = 0;

+	$image_limit = 0;

 

-    ?>

+	?>

 

 

     <h5 class="form_title">

         <?php if ($image_limit != 0 && $image_limit == 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+		} ?>

         <?php if ($image_limit != 0 && $image_limit > 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+		} ?>

         <?php if ($image_limit == 0) {

-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+		} ?>

     </h5>

 

 

     <?php

 

-    $curImages = geodir_get_images($post_id);

-    $place_img_array = array();

+	$curImages = geodir_get_images($post_id);

+	$place_img_array = array();

 

-    if (!empty($curImages)):

-        foreach ($curImages as $p_img):

-            $place_img_array[] = $p_img->src;

-        endforeach;

-    endif;

+	if (!empty($curImages)):

+		foreach ($curImages as $p_img):

+			$place_img_array[] = $p_img->src;

+		endforeach;

+	endif;

 

-    if (!empty($place_img_array))

-        $curImages = implode(',', $place_img_array);

+	if (!empty($place_img_array))

+		$curImages = implode(',', $place_img_array);

 

 

-    // adjust values here

-    $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

+	// adjust values here

+	$id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

 

-    $svalue = $curImages; // this will be initial value of the above form field. Image urls.

+	$svalue = $curImages; // this will be initial value of the above form field. Image urls.

 

-    $multiple = true; // allow multiple files upload

+	$multiple = true; // allow multiple files upload

 

-    $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

+	$width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

-    $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

+	$height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

 

-    ?>

+	?>

 

     <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;">

         <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/>

@@ -2160,13 +2160,13 @@ 
  */

 function geodir_action_post_updated($post_ID, $post_after, $post_before)

 {

-    $post_type = get_post_type($post_ID);

+	$post_type = get_post_type($post_ID);

 

-    if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

-        if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

-            geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

-        }

-    }

+	if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

+		if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

+			geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

+		}

+	}

 }

 

 /**

@@ -2181,39 +2181,39 @@ 
  */

 function geodir_notification_add_bcc_option($settings)

 {

-    if (!empty($settings)) {

-        $new_settings = array();

-        foreach ($settings as $setting) {

-            if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {

-                $geodir_bcc_listing_published_yes = array(

-                    'name' => __('Listing published', 'geodirectory'),

-                    'desc' => __('Yes', 'geodirectory'),

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '1',

-                    'radiogroup' => 'start'

-                );

-

-                $geodir_bcc_listing_published_no = array(

-                    'name' => __('Listing published', 'geodirectory'),

-                    'desc' => __('No', 'geodirectory'),

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '0',

-                    'radiogroup' => 'end'

-                );

-

-                $new_settings[] = $geodir_bcc_listing_published_yes;

-                $new_settings[] = $geodir_bcc_listing_published_no;

-            }

-            $new_settings[] = $setting;

-        }

-        $settings = $new_settings;

-    }

+	if (!empty($settings)) {

+		$new_settings = array();

+		foreach ($settings as $setting) {

+			if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {

+				$geodir_bcc_listing_published_yes = array(

+					'name' => __('Listing published', 'geodirectory'),

+					'desc' => __('Yes', 'geodirectory'),

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '1',

+					'radiogroup' => 'start'

+				);

+

+				$geodir_bcc_listing_published_no = array(

+					'name' => __('Listing published', 'geodirectory'),

+					'desc' => __('No', 'geodirectory'),

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '0',

+					'radiogroup' => 'end'

+				);

+

+				$new_settings[] = $geodir_bcc_listing_published_yes;

+				$new_settings[] = $geodir_bcc_listing_published_no;

+			}

+			$new_settings[] = $setting;

+		}

+		$settings = $new_settings;

+	}

 

-    return $settings;

+	return $settings;

 }

 

 

@@ -2228,19 +2228,19 @@ 
  */

 function get_gd_theme_compat_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-

-    if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

-        if (isset($_POST['export'])) {

-            echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

-        } else {

-            echo json_encode($themes[$_POST['theme']]);

-        }

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

 

-    }

+	if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

+		if (isset($_POST['export'])) {

+			echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

+		} else {

+			echo json_encode($themes[$_POST['theme']]);

+		}

 

-    die();

+	}

+

+	die();

 }

 

 add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');

@@ -2254,20 +2254,20 @@ 
  */

 function get_gd_theme_compat_import_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-    if (isset($_POST['theme']) && !empty($_POST['theme'])) {

-        $json = json_decode(stripslashes($_POST['theme']), true);

-        if (!empty($json) && is_array($json)) {

-            $key = sanitize_text_field(key($json));

-            $themes[$key] = $json[$key];

-            update_option('gd_theme_compats', $themes);

-            echo $key;

-            die();

-        }

-    }

-    echo '0';

-    die();

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

+	if (isset($_POST['theme']) && !empty($_POST['theme'])) {

+		$json = json_decode(stripslashes($_POST['theme']), true);

+		if (!empty($json) && is_array($json)) {

+			$key = sanitize_text_field(key($json));

+			$themes[$key] = $json[$key];

+			update_option('gd_theme_compats', $themes);

+			echo $key;

+			die();

+		}

+	}

+	echo '0';

+	die();

 }

 

 

@@ -2280,39 +2280,39 @@ 
  */

 function gd_set_theme_compat()

 {

-    global $wpdb;

-    $theme = wp_get_theme();

+	global $wpdb;

+	$theme = wp_get_theme();

 

-    if ($theme->parent()) {

-        $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

-    } else {

-        $theme_name = str_replace(" ", "_", $theme->get('Name'));

-    }

+	if ($theme->parent()) {

+		$theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

+	} else {

+		$theme_name = str_replace(" ", "_", $theme->get('Name'));

+	}

 

-    $theme_compats = get_option('gd_theme_compats');

-    $current_compat = get_option('gd_theme_compat');

-    $current_compat = str_replace("_custom", "", $current_compat);

+	$theme_compats = get_option('gd_theme_compats');

+	$current_compat = get_option('gd_theme_compat');

+	$current_compat = str_replace("_custom", "", $current_compat);

 

-    if ($current_compat == $theme_name && strpos("_custom", get_option('gd_theme_compat')) !== false) {

-        return;

-    }// if already running correct compat then bail

+	if ($current_compat == $theme_name && strpos("_custom", get_option('gd_theme_compat')) !== false) {

+		return;

+	}// if already running correct compat then bail

 

-    if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

-        update_option('gd_theme_compat', $theme_name);

-        update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

+	if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

+		update_option('gd_theme_compat', $theme_name);

+		update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

 

-        // if there are default options to set then set them

-        if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

+		// if there are default options to set then set them

+		if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

 

-            foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

-                update_option($key, $val);

-            }

-        }

+			foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

+				update_option($key, $val);

+			}

+		}

 

-    } else {

-        update_option('gd_theme_compat', '');

-        update_option('theme_compatibility_setting', '');

-    }

+	} else {

+		update_option('gd_theme_compat', '');

+		update_option('theme_compatibility_setting', '');

+	}

 

 

 }

@@ -2327,9 +2327,9 @@ 
  */

 function gd_check_avada_compat()

 {

-    if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

-        add_action('admin_notices', 'gd_avada_compat_warning');

-    }

+	if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

+		add_action('admin_notices', 'gd_avada_compat_warning');

+	}

 }

 

 

@@ -2342,22 +2342,22 @@ 
 function gd_avada_compat_warning()

 {

 

-    /*

+	/*

     $msg_type = error

     $msg_type = updated fade

     $msg_type = update-nag

     */

 

-    $plugin = 'avada-nag';

-    $timestamp = 'avada-nag1234';

-    $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

-    echo '<div id="' . $timestamp . '"  class="error">';

-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

-    echo "<p>$message</p>";

-    echo "</div>";

+	$plugin = 'avada-nag';

+	$timestamp = 'avada-nag1234';

+	$message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

+	echo '<div id="' . $timestamp . '"  class="error">';

+	echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

+	echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

+	echo "<p>$message</p>";

+	echo "</div>";

 

-    ?>

+	?>

     <script>

         function gdRemoveANotification($plugin, $timestamp) {

 

@@ -2425,10 +2425,10 @@ 
  */

 function geodir_avada_remove_notification()

 {

-    update_option('avada_nag', TRUE);

+	update_option('avada_nag', TRUE);

 

-    // Always die in functions echoing ajax content

-    die();

+	// Always die in functions echoing ajax content

+	die();

 }

 

 

@@ -2450,9 +2450,9 @@ 
 	global $post, $typenow, $current_screen;

 	

 	$post_type = NULL;

-    if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

+	if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

 		$post_type = get_post_type($_REQUEST['post']);

-    elseif ($post && isset($post->post_type))

+	elseif ($post && isset($post->post_type))

 		$post_type = $post->post_type;

 	elseif ($typenow)

 		$post_type = $typenow;

@@ -2487,7 +2487,7 @@ 
 		// Don't allow same slug url for listing and location

 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

 			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

-        	wp_redirect($redirect_url);

+			wp_redirect($redirect_url);

 			exit;

 		}

 		

@@ -2517,10 +2517,10 @@ 
  * @package GeoDirectory

  */

 function geodir_hide_admin_preview_button() {

-    global $post_type;

-    $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

-        echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

+	global $post_type;

+	$post_types = geodir_get_posttypes();

+	if(in_array($post_type, $post_types))

+		echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

 }

 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

@@ -2535,7 +2535,7 @@ 
  */

 function geodir_import_export_tab( $tabs ) {

 	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

-    return $tabs;

+	return $tabs;

 }

 

 /**

@@ -2550,26 +2550,26 @@ 
 function geodir_import_export_page() {

 	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

 	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

-    /**

-     * Filter sample category data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $gd_cats_sample_csv Sample category data csv file url.

-     */

+	/**

+	 * Filter sample category data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $gd_cats_sample_csv Sample category data csv file url.

+	 */

 	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

 	

 	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

-    /**

-     * Filter sample post data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $gd_posts_sample_csv Sample post data csv file url.

-     */

-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

+	/**

+	 * Filter sample post data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $gd_posts_sample_csv Sample post data csv file url.

+	 */

+	$gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

 	

 	$gd_posttypes = geodir_get_posttypes( 'array' );

 	

@@ -2592,14 +2592,14 @@ 
 	$gd_chunksize_options[100000] = 100000;

 	 

 	 /**

-     * Filter max entries per export csv file.

-     *

-     * @since 1.5.6

-     * @package GeoDirectory

-     *

-     * @param string $gd_chunksize_options Entries options.

-     */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+	  * Filter max entries per export csv file.

+	  *

+	  * @since 1.5.6

+	  * @package GeoDirectory

+	  *

+	  * @param string $gd_chunksize_options Entries options.

+	  */

+	$gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

 	

 	$gd_chunksize_option = '';

 	foreach ($gd_chunksize_options as $value => $title) {

@@ -2615,12 +2615,12 @@ 
   <div class="gd-content-heading">

 

   <?php

-    ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

-    ini_restore('max_execution_time');

+	ini_set('max_execution_time', 999999);

+	$ini_max_execution_time_check = @ini_get( 'max_execution_time' );

+	ini_restore('max_execution_time');

 

-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

-        ?>

+	if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

+		?>

 	<div id="gd_ie_reqs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div class="postbox">

@@ -2793,7 +2793,7 @@ 
 						 * Called just after the sample CSV download link.

 						 *

 						 * @since 1.0.0

-                         * @package GeoDirectory

+						 * @package GeoDirectory

 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

@@ -2878,11 +2878,11 @@ 
 	 *

 	 * Called after the last setting on the GD > Import & Export page.

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

 	 *

 	 * @param array $gd_posttypes GD post types.

-     * @param array $gd_chunksize_options File chunk size options.

-     * @param string $nonce Wordpress security token for GD import & export.

+	 * @param array $gd_chunksize_options File chunk size options.

+	 * @param string $nonce Wordpress security token for GD import & export.

 	 */

 	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

 	?>

@@ -3569,44 +3569,44 @@ 
 function geodir_init_filesystem()

 {

 

-    if(!function_exists('get_filesystem_method')){

-        require_once(ABSPATH."/wp-admin/includes/file.php");

-    }

-    $access_type = get_filesystem_method();

-    if ($access_type === 'direct') {

-        /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

-

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@3';

-            return false;

-        }

-

-        global $wp_filesystem;

-        return $wp_filesystem;

-        /* do our file manipulations below */

-    } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+	if(!function_exists('get_filesystem_method')){

+		require_once(ABSPATH."/wp-admin/includes/file.php");

+	}

+	$access_type = get_filesystem_method();

+	if ($access_type === 'direct') {

+		/* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@3';

+			return false;

+		}

 

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@33';

-            return false;

-        }

+		global $wp_filesystem;

+		return $wp_filesystem;

+		/* do our file manipulations below */

+	} elseif (defined('FTP_USER')) {

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@33';

+			return false;

+		}

 

-        global $wp_filesystem;

-        //return '@@@1';

-        return $wp_filesystem;

+		global $wp_filesystem;

+		//return '@@@1';

+		return $wp_filesystem;

 

-    } else {

-        //return '@@@2';

-        /* don't have direct write access. Prompt user with our notice */

-        add_action('admin_notice', 'geodir_filesystem_notice');

-        return false;

-    }

+	} else {

+		//return '@@@2';

+		/* don't have direct write access. Prompt user with our notice */

+		add_action('admin_notice', 'geodir_filesystem_notice');

+		return false;

+	}

 

 }

 

@@ -3624,10 +3624,10 @@ 
  */

 function geodir_filesystem_notice()

 {   if ( defined( 'DOING_AJAX' ) ){return;}

-    $access_type = get_filesystem_method();

-    if ($access_type === 'direct') {

-    } elseif (!defined('FTP_USER')) {

-        ?>

+	$access_type = get_filesystem_method();

+	if ($access_type === 'direct') {

+	} elseif (!defined('FTP_USER')) {

+		?>

         <div class="error">

             <p><?php _e('GeoDirectory does not have access to your filesystem, thing like import/export will not work. Please define your details in wp-config.php as explained here', 'geodirectory'); ?>

                 <a target="_blank" href="http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants">http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants</a>

@@ -3653,1251 +3653,1251 @@ 
  * @return string Json data.

  */

 function geodir_ajax_import_export() {

-    global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

+	global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

     

-    error_reporting(0);

+	error_reporting(0);

 

-    // try to set higher limits for import

-    $max_input_time = ini_get('max_input_time');

-    $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+	// try to set higher limits for import

+	$max_input_time = ini_get('max_input_time');

+	$max_execution_time = ini_get('max_execution_time');

+	$memory_limit= ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

-        ini_set('max_input_time', 3000);

-    }

+	if(!$max_input_time || $max_input_time<3000){

+		ini_set('max_input_time', 3000);

+	}

 

-    if(!$max_execution_time || $max_execution_time<3000){

-        ini_set('max_execution_time', 3000);

-    }

+	if(!$max_execution_time || $max_execution_time<3000){

+		ini_set('max_execution_time', 3000);

+	}

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

-            ini_set('memory_limit', '256M');

-        }

-    }

+	if($memory_limit && str_replace('M','',$memory_limit)){

+		if(str_replace('M','',$memory_limit)<256){

+			ini_set('memory_limit', '256M');

+		}

+	}

 

-    $json = array();

+	$json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !current_user_can( 'manage_options' ) ) {

+		wp_send_json( $json );

+	}

 

-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+	$task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

+	$nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

+	$stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

+		wp_send_json( $json );

+	}

 

-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

-    $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+	$post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

+	$chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+	$chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

+	$chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

 

-    $wp_filesystem = geodir_init_filesystem();

-    if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

-    }

+	$wp_filesystem = geodir_init_filesystem();

+	if (!$wp_filesystem) {

+		$json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

+		wp_send_json( $json );

+	}

 

-    if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

-    }

+	if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

+		$json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

+		wp_send_json( $json );

+	}

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

-        }

-    }

+	$csv_file_dir = geodir_path_import_export( false );

+	if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

+		if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

+			$json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

+			wp_send_json( $json );

+		}

+	}

     

-    $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

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

-

-    switch ( $task ) {

-        case 'export_posts': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

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

+

+	switch ( $task ) {

+		case 'export_posts': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

-                $sitepress->switch_lang('all', true);

-            }

-            // WPML

-            if ( $post_type == 'gd_event' ) {

-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

-            }

-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+				$sitepress->switch_lang('all', true);

+			}

+			// WPML

+			if ( $post_type == 'gd_event' ) {

+				add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+			}

+			$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

             

-            $file_name = $post_type . '_' . date( 'dmyHi' );

-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

-            }

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

+			$file_name = $post_type . '_' . date( 'dmyHi' );

+			if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

+				$file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

+			}

+			$posts_count = geodir_get_posts_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

 

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

-                $json['total'] = $posts_count;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-                gd_die();

-            } else if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$json['total'] = $posts_count;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+				gd_die();

+			} else if ( isset( $_REQUEST['_st'] ) ) {

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-                gd_die();

-            } else {

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_posts = $posts_count;

-                    if ($chunk_per_page > $total_posts) {

-                        $chunk_per_page = $total_posts;

-                    }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+				$json['percentage'] = $percentage;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+				gd_die();

+			} else {

+				if ( !$posts_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_posts = $posts_count;

+					if ($chunk_per_page > $total_posts) {

+						$chunk_per_page = $total_posts;

+					}

+					$chunk_total_pages = ceil( $total_posts / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+					}

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $posts_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        if ($j > 1) {

-                            $json['total'] = $posts_count;

-                            $json['files'] = array();

-                        } else {

-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                        }

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_cats': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $posts_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						if ($j > 1) {

+							$json['total'] = $posts_count;

+							$json['files'] = array();

+						} else {

+							$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+						}

+					}

+				}

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_cats': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

-                $sitepress->switch_lang('all', true);

-            }

-            // WPML

-            $file_name = $post_type . 'category_' . date( 'dmyHi' );

+				$sitepress->switch_lang('all', true);

+			}

+			// WPML

+			$file_name = $post_type . 'category_' . date( 'dmyHi' );

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+			$terms_count = geodir_get_terms_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            } else {

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_terms = $terms_count;

-                    if ($chunk_per_page > $terms_count) {

-                        $chunk_per_page = $terms_count;

-                    }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+				$json['percentage'] = $percentage;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			} else {

+				if ( !$terms_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_terms = $terms_count;

+					if ($chunk_per_page > $terms_count) {

+						$chunk_per_page = $terms_count;

+					}

+					$chunk_total_pages = ceil( $total_terms / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $terms_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $terms_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+					}

+				}

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_locations': {

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_name = 'gd_locations_' . date( 'dmyHi' );

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+			$items_count = (int)geodir_location_imex_count_locations();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                wp_send_json( $json );

-            } else {

-                $chunk_file_paths = array();

+				$json['percentage'] = $percentage;

+				wp_send_json( $json );

+			} else {

+				$chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+				if ( !$items_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$chunk_per_page = min( $chunk_per_page, $items_count );

+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					$per_page = min( $per_page, $chunk_per_page );

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $items_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-                    }

-                }

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_hoods': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $items_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+					}

+				}

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_hoods': {

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_neighbourhoods();

+			$items_count = (int)geodir_location_imex_count_neighbourhoods();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                wp_send_json( $json );

-            } else {

-                $chunk_file_paths = array();

+				$json['percentage'] = $percentage;

+				wp_send_json( $json );

+			} else {

+				$chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+				if ( !$items_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$chunk_per_page = min( $chunk_per_page, $items_count );

+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					$per_page = min( $per_page, $chunk_per_page );

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $items_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-                    }

-                }

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'prepare_import':

-        case 'import_cat':

-        case 'import_post':

-        case 'import_loc':

-        case 'import_hood': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

-            }

-            // WPML

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $items_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+					}

+				}

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'prepare_import':

+		case 'import_cat':

+		case 'import_post':

+		case 'import_loc':

+		case 'import_hood': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

+			}

+			// WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+			ini_set( 'auto_detect_line_endings', true );

             

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

-            $uploads_subdir = $uploads['subdir'];

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

+			$uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+			$csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

+			$import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+			$csv_file_arr = explode( '/', $csv_file );

+			$csv_filename = end( $csv_file_arr );

+			$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

             

-            $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

-            $file = array();

+			$json['file'] = $csv_file;

+			$json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+			$file = array();

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+			if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

+				$wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

                 

-                if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

-                    $json['error'] = NULL;

-                    $json['rows'] = 0;

+				if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

+					$json['error'] = NULL;

+					$json['rows'] = 0;

                     

-                    $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

-                    setlocale(LC_ALL, 'en_US.UTF-8');

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

-                                $file[] = $data;

-                            }

-                        }

-                        fclose($handle);

-                    }

-                    setlocale(LC_ALL, $lc_all);

+					$lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

+					setlocale(LC_ALL, 'en_US.UTF-8');

+					if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

+						while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

+							if ( !empty( $data ) ) {

+								$file[] = $data;

+							}

+						}

+						fclose($handle);

+					}

+					setlocale(LC_ALL, $lc_all);

 

-                    $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

+					$json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

                     

-                    if (!$json['rows'] > 0) {

-                        $json['error'] = __('No data found in csv file.', 'geodirectory');

-                    }

-                } else {

-                    wp_send_json( $json );

-                }

-            } else {

-                wp_send_json( $json );

-            }

+					if (!$json['rows'] > 0) {

+						$json['error'] = __('No data found in csv file.', 'geodirectory');

+					}

+				} else {

+					wp_send_json( $json );

+				}

+			} else {

+				wp_send_json( $json );

+			}

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

-            }

+			if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

+				wp_send_json( $json );

+			}

             

-            $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+			$total = $json['rows'];

+			$limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

+			$processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

             

-            $count = $limit;

+			$count = $limit;

             

-            if ($count < $total) {

-                $count = $processed + $count;

-                if ($count > $total) {

-                    $count = $total;

-                }

-            } else {

-                $count = $total;

-            }

+			if ($count < $total) {

+				$count = $processed + $count;

+				if ($count > $total) {

+					$count = $total;

+				}

+			} else {

+				$count = $total;

+			}

             

-            $created = 0;

-            $updated = 0;

-            $skipped = 0;

-            $invalid = 0;

-            $invalid_addr = 0;

-            $images = 0;

+			$created = 0;

+			$updated = 0;

+			$skipped = 0;

+			$invalid = 0;

+			$invalid_addr = 0;

+			$images = 0;

             

-            $gd_post_info = array();

-            $countpost = 0;

+			$gd_post_info = array();

+			$countpost = 0;

             

-            $post_types = geodir_get_posttypes();

+			$post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+			if ( $task == 'import_cat' ) {

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

                     

-                    $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');

+					$gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');

                     

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

                             

-                            $cat_id = '';

-                            $cat_name = '';

-                            $cat_slug = '';

-                            $cat_posttype = '';

-                            $cat_parent = '';

-                            $cat_description = '';

-                            $cat_schema = '';

-                            $cat_top_description = '';

-                            $cat_image = '';

-                            $cat_icon = '';

-                            $cat_language = '';

-                            $cat_id_original = '';

+							$cat_id = '';

+							$cat_name = '';

+							$cat_slug = '';

+							$cat_posttype = '';

+							$cat_parent = '';

+							$cat_description = '';

+							$cat_schema = '';

+							$cat_top_description = '';

+							$cat_image = '';

+							$cat_icon = '';

+							$cat_language = '';

+							$cat_id_original = '';

                             

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

-                                } else if ( $column == 'cat_name' ) {

-                                    $cat_name = $row[$c];

-                                } else if ( $column == 'cat_slug' ) {

-                                    $cat_slug = $row[$c];

-                                } else if ( $column == 'cat_posttype' ) {

-                                    $cat_posttype = $row[$c];

-                                } else if ( $column == 'cat_parent' ) {

-                                    $cat_parent = trim($row[$c]);

-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

-                                    $cat_schema = $row[$c];

-                                } else if ( $column == 'cat_description' ) {

-                                    $cat_description = $row[$c];

-                                } else if ( $column == 'cat_top_description' ) {

-                                    $cat_top_description = $row[$c];

-                                } else if ( $column == 'cat_image' ) {

-                                    $cat_image = $row[$c];

-                                } else if ( $column == 'cat_icon' ) {

-                                    $cat_icon = $row[$c];

-                                }

-                                // WPML

-                                if ( $is_wpml ) {

-                                    if ( $column == 'cat_language' ) {

-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );

-                                    } else if ( $column == 'cat_id_original' ) {

-                                        $cat_id_original = (int)$row[$c];

-                                    }

-                                }

-                                // WPML

-                                $c++;

-                            }

+							$c = 0;

+							foreach ($columns as $column ) {

+								if ( $column == 'cat_id' ) {

+									$cat_id = (int)$row[$c];

+								} else if ( $column == 'cat_name' ) {

+									$cat_name = $row[$c];

+								} else if ( $column == 'cat_slug' ) {

+									$cat_slug = $row[$c];

+								} else if ( $column == 'cat_posttype' ) {

+									$cat_posttype = $row[$c];

+								} else if ( $column == 'cat_parent' ) {

+									$cat_parent = trim($row[$c]);

+								} else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+									$cat_schema = $row[$c];

+								} else if ( $column == 'cat_description' ) {

+									$cat_description = $row[$c];

+								} else if ( $column == 'cat_top_description' ) {

+									$cat_top_description = $row[$c];

+								} else if ( $column == 'cat_image' ) {

+									$cat_image = $row[$c];

+								} else if ( $column == 'cat_icon' ) {

+									$cat_icon = $row[$c];

+								}

+								// WPML

+								if ( $is_wpml ) {

+									if ( $column == 'cat_language' ) {

+										$cat_language = geodir_strtolower( trim( $row[$c] ) );

+									} else if ( $column == 'cat_id_original' ) {

+										$cat_id_original = (int)$row[$c];

+									}

+								}

+								// WPML

+								$c++;

+							}

                             

-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+							if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

                                 

-                                $invalid++;

-                                continue;

-                            }

+								$invalid++;

+								continue;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

-                                $sitepress->switch_lang($cat_language, true);

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $cat_language != '') {

+								$sitepress->switch_lang($cat_language, true);

+							}

+							// WPML

                                                         

-                            $term_data = array();

-                            $term_data['name'] = $cat_name;

-                            $term_data['slug'] = $cat_slug;

-                            $term_data['description'] = $cat_description;

-                            $term_data['cat_schema'] = $cat_schema;

-                            $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+							$term_data = array();

+							$term_data['name'] = $cat_name;

+							$term_data['slug'] = $cat_slug;

+							$term_data['description'] = $cat_description;

+							$term_data['cat_schema'] = $cat_schema;

+							$term_data['top_description'] = $cat_top_description;

+							$term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

+							$term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

                             

-                            //$term_data = array_map( 'utf8_encode', $term_data );

+							//$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+							$taxonomy = $cat_posttype . 'category';

                             

-                            $term_data['taxonomy'] = $taxonomy;

+							$term_data['taxonomy'] = $taxonomy;

 

-                            $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

-                                $term_parent = '';

+							$term_parent_id = 0;

+							if ($cat_parent != "" || (int)$cat_parent > 0) {

+								$term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else {

-                                    $term_parent_data = array();

-                                    $term_parent_data['name'] = $cat_parent;

-                                    //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

-                                    $term_parent_data['taxonomy'] = $taxonomy;

+								if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+									//

+								} else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+									//

+								} else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+									//

+								} else {

+									$term_parent_data = array();

+									$term_parent_data['name'] = $cat_parent;

+									//$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

+									$term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

-                                }

+									$term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+								}

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

-                                }

-                            }

-                            $term_data['parent'] = (int)$term_parent_id;

+								if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

+									$term_parent_id = (int)$term_parent->term_id;

+								}

+							}

+							$term_data['parent'] = (int)$term_parent_id;

 

-                            $term_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

+							$term_id = NULL;

+							if ( $import_choice == 'update' ) {

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $skipped++;

-                                } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                            }

+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								} else {

+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								}

+							} else if ( $import_choice == 'skip' ) {

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$skipped++;

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$skipped++;

+								} else {

+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+							}

                             

-                            if ( $term_id ) {

-                                // WPML

-                                if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

-                                    $wpml_element_type = 'tax_' . $taxonomy;

-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

-

-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

+							if ( $term_id ) {

+								// WPML

+								if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

+									$wpml_element_type = 'tax_' . $taxonomy;

+									$source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

+

+									$trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

                                     

-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

-                                }

-                                // WPML

+									$sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

+								}

+								// WPML

                                 

-                                if ( isset( $term_data['top_description'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

-                                }

+								if ( isset( $term_data['top_description'] ) ) {

+									update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+								}

                                 

-                                if ( isset( $term_data['cat_schema'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

-                                }

+								if ( isset( $term_data['cat_schema'] ) ) {

+									update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+								}

             

-                                $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+								$attachment = false;

+								if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

+									$cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

+									$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

-                                        $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

-                                    }

-                                }

+									if ( basename($cat_image) != $term_data['image'] ) {

+										$attachment = true;

+										update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+								if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

+									$cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

+									$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

                                         

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

-                                        $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

-                                    }

-                                }

+									if ( basename($cat_icon) != $term_data['icon'] ) {

+										$attachment = true;

+										update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( $attachment ) {

-                                    $images++;

-                                }

-                            }

+								if ( $attachment ) {

+									$images++;

+								}

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

-                                $sitepress->switch_lang($active_lang, true);

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $cat_language != '') {

+								$sitepress->switch_lang($active_lang, true);

+							}

+							// WPML

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_post' ) {

-                //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

-

-                //remove_all_actions('publish_post');

-                //remove_all_actions('transition_post_status');

-                //remove_all_actions('publish_future_post');

-

-                if (!empty($file)) {

-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

-                    $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

-                    $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+				wp_send_json( $json );

+				exit;

+			} else if ( $task == 'import_post' ) {

+				//run some stuff to make the import quicker

+				wp_defer_term_counting( true );

+				wp_defer_comment_counting( true );

+				$wpdb->query( 'SET autocommit = 0;' );

+

+				//remove_all_actions('publish_post');

+				//remove_all_actions('transition_post_status');

+				//remove_all_actions('publish_future_post');

+

+				if (!empty($file)) {

+					$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+					$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

+					$default_status = 'publish';

+					$current_date = date_i18n( 'Y-m-d', time() );

                     

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

 

-                    $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

-                    $processed_actual = 0;

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

-                        $gd_post = array();

+					$gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

+					$wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

+					$processed_actual = 0;

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

+						$gd_post = array();

                         

-                        if (isset($file[$index])) {

-                            $processed_actual++;

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+						if (isset($file[$index])) {

+							$processed_actual++;

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

+							$row = array_map( 'addslashes_gpc', $row );

                             

-                            $post_id = '';

-                            $post_title = '';

-                            $post_author = '';

-                            $post_content = '';

-                            $post_category_arr = array();

-                            $default_category = '';

-                            $post_tags = array();

-                            $post_type = '';

-                            $post_status = '';

-                            $geodir_video = '';

-                            $post_address = '';

-                            $post_city = '';

-                            $post_region = '';

-                            $post_country = '';

-                            $post_zip = '';

-                            $post_latitude = '';

-                            $post_longitude = '';

-                            $post_neighbourhood = '';

-                            $neighbourhood_latitude = '';

-                            $neighbourhood_longitude = '';

-                            $geodir_timing = '';

-                            $geodir_contact = '';

-                            $geodir_email = '';

-                            $geodir_website = '';

-                            $geodir_twitter = '';

-                            $geodir_facebook = '';

-                            $geodir_twitter = '';

-                            $post_images = array();

+							$post_id = '';

+							$post_title = '';

+							$post_author = '';

+							$post_content = '';

+							$post_category_arr = array();

+							$default_category = '';

+							$post_tags = array();

+							$post_type = '';

+							$post_status = '';

+							$geodir_video = '';

+							$post_address = '';

+							$post_city = '';

+							$post_region = '';

+							$post_country = '';

+							$post_zip = '';

+							$post_latitude = '';

+							$post_longitude = '';

+							$post_neighbourhood = '';

+							$neighbourhood_latitude = '';

+							$neighbourhood_longitude = '';

+							$geodir_timing = '';

+							$geodir_contact = '';

+							$geodir_email = '';

+							$geodir_website = '';

+							$geodir_twitter = '';

+							$geodir_facebook = '';

+							$geodir_twitter = '';

+							$post_images = array();

                             

-                            $expire_date = 'Never';

+							$expire_date = 'Never';

                             

-                            $language = '';

-                            $original_post_id = '';

+							$language = '';

+							$original_post_id = '';

                             

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                $gd_post[$column] = $row[$c];

+							$c = 0;

+							foreach ($columns as $column ) {

+								$gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

-                                    $post_id = $row[$c];

-                                } else if ( $column == 'post_title' ) {

-                                    $post_title = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_author' ) {

-                                    $post_author = $row[$c];

-                                } else if ( $column == 'post_content' ) {

-                                    $post_content = $row[$c];

-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {

-                                    $post_category_arr = explode( ',', $row[$c] );

-                                } else if ( $column == 'default_category' ) {

-                                    $default_category = wp_kses_normalize_entities($row[$c]);

-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );

-                                } else if ( $column == 'post_type' ) {

-                                    $post_type = $row[$c];

-                                } else if ( $column == 'post_status' ) {

-                                    $post_status = sanitize_key( $row[$c] );

-                                } else if ( $column == 'is_featured' ) {

-                                    $is_featured = (int)$row[$c];

-                                } else if ( $column == 'geodir_video' ) {

-                                    $geodir_video = $row[$c];

-                                } else if ( $column == 'post_address' ) {

-                                    $post_address = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_city' ) {

-                                    $post_city = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_region' ) {

-                                    $post_region = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_country' ) {

-                                    $post_country = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_zip' ) {

-                                    $post_zip = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_latitude' ) {

-                                    $post_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_longitude' ) {

-                                    $post_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_neighbourhood' ) {

-                                    $post_neighbourhood = sanitize_text_field($row[$c]);

-                                    unset($gd_post[$column]);

-                                } else if ( $column == 'neighbourhood_latitude' ) {

-                                    $neighbourhood_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'neighbourhood_longitude' ) {

-                                    $neighbourhood_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_timing' ) {

-                                    $geodir_timing = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_contact' ) {

-                                    $geodir_contact = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_email' ) {

-                                    $geodir_email = sanitize_email($row[$c]);

-                                } else if ( $column == 'geodir_website' ) {

-                                    $geodir_website = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_twitter' ) {

-                                    $geodir_twitter = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_facebook' ) {

-                                    $geodir_facebook = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

-                                    $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

-                                    $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

-                                }

-                                // WPML

-                                if ($is_wpml) {

-                                    if ($column == 'language') {

-                                        $language = geodir_strtolower(trim($row[$c]));

-                                    } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

-                                    }

-                                }

-                                // WPML

-                                $c++;

-                            }

-                            // listing claimed or not

-                            if ($is_claim_active && isset($gd_post['claimed'])) {

-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

-                            }

+								if ( $column == 'post_id' ) {

+									$post_id = $row[$c];

+								} else if ( $column == 'post_title' ) {

+									$post_title = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_author' ) {

+									$post_author = $row[$c];

+								} else if ( $column == 'post_content' ) {

+									$post_content = $row[$c];

+								} else if ( $column == 'post_category' && $row[$c] != '' ) {

+									$post_category_arr = explode( ',', $row[$c] );

+								} else if ( $column == 'default_category' ) {

+									$default_category = wp_kses_normalize_entities($row[$c]);

+								} else if ( $column == 'post_tags' && $row[$c] != '' ) {

+									$post_tags = explode( ',', sanitize_text_field($row[$c]) );

+								} else if ( $column == 'post_type' ) {

+									$post_type = $row[$c];

+								} else if ( $column == 'post_status' ) {

+									$post_status = sanitize_key( $row[$c] );

+								} else if ( $column == 'is_featured' ) {

+									$is_featured = (int)$row[$c];

+								} else if ( $column == 'geodir_video' ) {

+									$geodir_video = $row[$c];

+								} else if ( $column == 'post_address' ) {

+									$post_address = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_city' ) {

+									$post_city = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_region' ) {

+									$post_region = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_country' ) {

+									$post_country = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_zip' ) {

+									$post_zip = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_latitude' ) {

+									$post_latitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_longitude' ) {

+									$post_longitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_neighbourhood' ) {

+									$post_neighbourhood = sanitize_text_field($row[$c]);

+									unset($gd_post[$column]);

+								} else if ( $column == 'neighbourhood_latitude' ) {

+									$neighbourhood_latitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'neighbourhood_longitude' ) {

+									$neighbourhood_longitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_timing' ) {

+									$geodir_timing = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_contact' ) {

+									$geodir_contact = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_email' ) {

+									$geodir_email = sanitize_email($row[$c]);

+								} else if ( $column == 'geodir_website' ) {

+									$geodir_website = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_twitter' ) {

+									$geodir_twitter = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_facebook' ) {

+									$geodir_facebook = sanitize_text_field($row[$c]);

+								} else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

+									$post_images[] = $row[$c];

+								} else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

+								} else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+									$row[$c] = str_replace('/', '-', $row[$c]);

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+								}

+								// WPML

+								if ($is_wpml) {

+									if ($column == 'language') {

+										$language = geodir_strtolower(trim($row[$c]));

+									} else if ($column == 'original_post_id') {

+										$original_post_id = (int)$row[$c];

+									}

+								}

+								// WPML

+								$c++;

+							}

+							// listing claimed or not

+							if ($is_claim_active && isset($gd_post['claimed'])) {

+								$gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

-                                $sitepress->switch_lang($language, true);

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $language != '') {

+								$sitepress->switch_lang($language, true);

+							}

+							// WPML

 

-                            $gd_post['IMAGE'] = $post_images;

+							$gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+							$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

+							$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

                                                                                                                 

-                            $valid = true;

+							$valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

-                                $invalid++;

-                                $valid = false;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

-                            }

+							if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+								$invalid++;

+								$valid = false;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+							}

                             

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

-                                $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

-                                    $invalid_addr++;

-                                    $valid = false;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

-                                        $invalid_addr++;

-                                        $valid = false;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                    } else {

-                                        if (!$location_manager) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

-                                        }

-                                    }

-                                }

-                            }

+							$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+							if ( $location_allowed ) {

+								$location_result = geodir_get_default_location();

+								if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+									$invalid_addr++;

+									$valid = false;

+									geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+								} else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

+									if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+										$invalid_addr++;

+										$valid = false;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+									} else {

+										if (!$location_manager) {

+											$gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+										}

+									}

+								}

+							}

                             

-                            if ( !$valid ) {

-                                continue;

-                            }

+							if ( !$valid ) {

+								continue;

+							}

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+							$cat_taxonomy = $post_type . 'category';

+							$tags_taxonomy = $post_type . '_tags';

                             

-                            if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

-                                $post_category_arr = array_merge(array($default_category), $post_category_arr);

-                            }

+							if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

+								$post_category_arr = array_merge(array($default_category), $post_category_arr);

+							}

 

-                            $post_category = array();

-                            $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+							$post_category = array();

+							$default_category_id = NULL;

+							if ( !empty( $post_category_arr ) ) {

+								foreach ( $post_category_arr as $value ) {

+									$category_name = wp_kses_normalize_entities( trim( $value ) );

                                     

-                                    if ( $category_name != '' ) {

-                                        $term_category = array();

+									if ( $category_name != '' ) {

+										$term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else {

-                                            $term_data = array();

-                                            $term_data['name'] = $category_name;

-                                            $term_data['taxonomy'] = $cat_taxonomy;

+										if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else {

+											$term_data = array();

+											$term_data['name'] = $category_name;

+											$term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

-                                            }

-                                        }

+											$term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

+											if ( $term_id ) {

+												$term_category = get_term( $term_id, $cat_taxonomy );

+											}

+										}

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

-                                            $post_category[] = intval($term_category->term_id);

+										if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+											$post_category[] = intval($term_category->term_id);

                                             

-                                            if ($category_name == $default_category) {

-                                                $default_category_id = intval($term_category->term_id);

-                                            }

-                                        }

-                                    }

-                                }

-                            }

+											if ($category_name == $default_category) {

+												$default_category_id = intval($term_category->term_id);

+											}

+										}

+									}

+								}

+							}

 

-                            $save_post = array();

-                            $save_post['post_title'] = $post_title;

-                            $save_post['post_content'] = $post_content;

-                            $save_post['post_type'] = $post_type;

-                            $save_post['post_author'] = $post_author;

-                            $save_post['post_status'] = $post_status;

-                            $save_post['post_category'] = $post_category;

-                            $save_post['post_tags'] = $post_tags;

-

-                            $saved_post_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

+							$save_post = array();

+							$save_post['post_title'] = $post_title;

+							$save_post['post_content'] = $post_content;

+							$save_post['post_type'] = $post_type;

+							$save_post['post_author'] = $post_author;

+							$save_post['post_status'] = $post_status;

+							$save_post['post_category'] = $post_category;

+							$save_post['post_tags'] = $post_tags;

+

+							$saved_post_id = NULL;

+							if ( $import_choice == 'update' ) {

+								$gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

                                 

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

-                                    $save_post['ID'] = $post_id;

+								if ( $post_id > 0 && get_post( $post_id ) ) {

+									$save_post['ID'] = $post_id;

                                     

-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $saved_post_id = $post_id;

-                                            $updated++;

-                                        }

-                                    }

-                                } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $created++;

-                                        }

-                                    }

-                                }

+									if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+											$saved_post_id = 0;

+										} else {

+											$saved_post_id = $post_id;

+											$updated++;

+										}

+									}

+								} else {

+									if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+											$saved_post_id = 0;

+										} else {

+											$created++;

+										}

+									}

+								}

                                 

-                                if ( !$saved_post_id > 0 ) {

-                                    $invalid++;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

-                                }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

-                                    $skipped++;	

-                                } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $invalid++;

+								if ( !$saved_post_id > 0 ) {

+									$invalid++;

+									geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

+								}

+							} else if ( $import_choice == 'skip' ) {

+								if ( $post_id > 0 && get_post( $post_id ) ) {

+									$skipped++;	

+								} else {

+									if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$invalid++;

                                             

-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $created++;

-                                        }

-                                    } else {

-                                        $invalid++;

+											geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

+											$saved_post_id = 0;

+										} else {

+											$created++;

+										}

+									} else {

+										$invalid++;

                                         

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+									}

+								}

+							} else {

+								$invalid++;

                                 

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

-                            }

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+							}

 

-                            if ( (int)$saved_post_id > 0 ) {

-                                // WPML

-                                if ($is_wpml && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

+							if ( (int)$saved_post_id > 0 ) {

+								// WPML

+								if ($is_wpml && $original_post_id > 0 && $language != '') {

+									$wpml_post_type = 'post_' . $post_type;

+									$source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+									$trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

-                                }

-                                // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+									$sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+								}

+								// WPML

+								$gd_post_info = geodir_get_post_info( $saved_post_id );

                                 

-                                $gd_post['post_id'] = $saved_post_id;

-                                $gd_post['ID'] = $saved_post_id;

-                                $gd_post['post_tags'] = $post_tags;

-                                $gd_post['post_title'] = $post_title;

-                                $gd_post['post_status'] = $post_status;

-                                $gd_post['submit_time'] = time();

-                                $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+								$gd_post['post_id'] = $saved_post_id;

+								$gd_post['ID'] = $saved_post_id;

+								$gd_post['post_tags'] = $post_tags;

+								$gd_post['post_title'] = $post_title;

+								$gd_post['post_status'] = $post_status;

+								$gd_post['submit_time'] = time();

+								$gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

                                                     

-                                // post location

-                                $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

-                                    $gd_post['post_neighbourhood'] = '';

+								// post location

+								$post_location_id = 0;

+								if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+									$gd_post['post_neighbourhood'] = '';

                                     

-                                    $post_location_info = array(

-                                                                'city' => $post_city,

-                                                                'region' => $post_region,

-                                                                'country' => $post_country,

-                                                                'geo_lat' => $post_latitude,

-                                                                'geo_lng' => $post_longitude

-                                                            );

-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

-                                        $post_location_id = $location_id;

-                                    }

+									$post_location_info = array(

+																'city' => $post_city,

+																'region' => $post_region,

+																'country' => $post_country,

+																'geo_lat' => $post_latitude,

+																'geo_lng' => $post_longitude

+															);

+									if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+										$post_location_id = $location_id;

+									}

                                     

-                                    if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {

-                                        $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);

+									if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {

+										$neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);

 

-                                        $hood_data = array();

-                                        $hood_data['hood_location_id'] = $post_location_id;

-                                        $hood_data['hood_name'] = $post_neighbourhood;

+										$hood_data = array();

+										$hood_data['hood_location_id'] = $post_location_id;

+										$hood_data['hood_name'] = $post_neighbourhood;

                                         

-                                        if (!empty($neighbourhood_info)) {

-                                            $hood_data['hood_id'] = $neighbourhood_info->hood_id;

-                                            $hood_data['hood_slug'] = $neighbourhood_info->hood_slug;

+										if (!empty($neighbourhood_info)) {

+											$hood_data['hood_id'] = $neighbourhood_info->hood_id;

+											$hood_data['hood_slug'] = $neighbourhood_info->hood_slug;

                                             

-                                            if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

-                                                $neighbourhood_latitude = $neighbourhood_info->hood_latitude;

-                                                $neighbourhood_longitude = $neighbourhood_info->hood_longitude;

-                                            }

-                                        }

+											if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

+												$neighbourhood_latitude = $neighbourhood_info->hood_latitude;

+												$neighbourhood_longitude = $neighbourhood_info->hood_longitude;

+											}

+										}

                                         

-                                        if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

-                                            $neighbourhood_latitude = $neighbourhood_info->hood_latitude;

-                                            $neighbourhood_longitude = $neighbourhood_info->hood_longitude;

-                                        }

+										if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

+											$neighbourhood_latitude = $neighbourhood_info->hood_latitude;

+											$neighbourhood_longitude = $neighbourhood_info->hood_longitude;

+										}

                                         

-                                        $hood_data['hood_latitude'] = $post_latitude;

-                                        $hood_data['hood_longitude'] = $post_longitude;

+										$hood_data['hood_latitude'] = $post_latitude;

+										$hood_data['hood_longitude'] = $post_longitude;

 

-                                        $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);

-                                        if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {

-                                            $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;

-                                        }

-                                    }

-                                }

-                                $gd_post['post_location_id'] = $post_location_id;

+										$neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);

+										if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {

+											$gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;

+										}

+									}

+								}

+								$gd_post['post_location_id'] = $post_location_id;

                                 

-                                // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

-                                if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

-                                    $package_id = $gd_post_info->package_id;

-                                }

+								// post package info

+								$package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+								if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

+									$package_id = $gd_post_info->package_id;

+								}

                                 

-                                $package_info = array();

-                                if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+								$package_info = array();

+								if ($package_id && function_exists('geodir_get_package_info_by_id')) {

+									$package_info = (array)geodir_get_package_info_by_id($package_id);

                                     

-                                    if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

-                                        $package_info = array();

-                                    }

-                                }

+									if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

+										$package_info = array();

+									}

+								}

                                 

-                                if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

-                                }

+								if (empty($package_info)) {

+									$package_info = (array)geodir_post_package_info( array(), '', $post_type );

+								}

                                  

-                                if (!empty($package_info))	 {

-                                    $package_id = $package_info['pid'];

+								if (!empty($package_info))	 {

+									$package_id = $package_info['pid'];

                                     

-                                    if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

-                                        $gd_post['expire_date'] = $expire_date;

-                                    } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

-                                        } else {

-                                            $gd_post['expire_date'] = 'Never';

-                                        }

-                                    }

+									if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

+										$gd_post['expire_date'] = $expire_date;

+									} else {

+										if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

+											$gd_post['alive_days'] = (int)$package_info['days'];

+											$gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+										} else {

+											$gd_post['expire_date'] = 'Never';

+										}

+									}

                                     

-                                    $gd_post['package_id'] = $package_id;

-                                }

+									$gd_post['package_id'] = $package_id;

+								}

 

-                                $table = $plugin_prefix . $post_type . '_detail';

+								$table = $plugin_prefix . $post_type . '_detail';

                                 

-                                if ($post_type == 'gd_event') {

-                                    $gd_post = geodir_imex_process_event_data($gd_post);

-                                }

+								if ($post_type == 'gd_event') {

+									$gd_post = geodir_imex_process_event_data($gd_post);

+								}

                                 

-                                if (isset($gd_post['post_id'])) {

-                                    unset($gd_post['post_id']);

-                                }

+								if (isset($gd_post['post_id'])) {

+									unset($gd_post['post_id']);

+								}

 

-                                // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

-                                if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

-                                        $gd_franchise_lock = array();

+								// Export franchise fields

+								$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+								if ($is_franchise_active) {

+									if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

+										$gd_franchise_lock = array();

                                         

-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                            $gd_franchise_lock = trim( $gd_franchise_lock );

-                                            $gd_franchise_lock = explode( ",", $gd_franchise_lock );

-                                        }

+										if ( isset( $gd_post['gd_franchise_lock'] ) ) {

+											$gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

+											$gd_franchise_lock = trim( $gd_franchise_lock );

+											$gd_franchise_lock = explode( ",", $gd_franchise_lock );

+										}

                                         

-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

-                                    } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

-                                        }

-                                    }

-                                }

+										update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

+										update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+									} else {

+										if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

+											geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+										}

+									}

+								}

                                 

-                                if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

-                                    if ($default_category_id) {

-                                        $save_post['post_default_category'] = $default_category_id;

-                                        $gd_post['default_category'] = $default_category_id;

-                                    }

-                                    $gd_post[$cat_taxonomy] = $save_post['post_category'];

-                                }

+								if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

+									$save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+									if ($default_category_id) {

+										$save_post['post_default_category'] = $default_category_id;

+										$gd_post['default_category'] = $default_category_id;

+									}

+									$gd_post[$cat_taxonomy] = $save_post['post_category'];

+								}

                                 

-                                // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

-                                // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+								// Save post info

+								geodir_save_post_info( $saved_post_id, $gd_post );

+								// post taxonomies

+								if ( !empty( $save_post['post_category'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

-                                    if ($default_category_id) {

-                                        $post_default_category = $default_category_id;

-                                    }

-                                    $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

-                                    $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+									$post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+									if ($default_category_id) {

+										$post_default_category = $default_category_id;

+									}

+									$post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

+									$save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

+									$post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

                                     

-                                    if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

-                                    }

+									if ($post_category_str != '' && $post_default_category) {

+										$post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+									}

                                     

-                                    $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

+									$post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

-                                }

+									geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+								}

 

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

-                                }

+								if ( !empty( $save_post['post_tags'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+								}

 

-                                // Post images

-                                if ( !empty( $post_images ) ) {

-                                    $post_images = array_unique($post_images);

+								// Post images

+								if ( !empty( $post_images ) ) {

+									$post_images = array_unique($post_images);

                                     

-                                    $old_post_images_arr = array();

-                                    $saved_post_images_arr = array();

+									$old_post_images_arr = array();

+									$saved_post_images_arr = array();

                                     

-                                    $order = 1;

+									$order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

-                                    if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

-                                            if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

-                                                $old_post_images_arr[] = $old_post_image->file;

-                                            }

-                                        }

-                                    }

+									$old_post_images = geodir_get_images( $saved_post_id );

+									if (!empty($old_post_images)) {

+										foreach( $old_post_images as $old_post_image ) {

+											if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

+												$old_post_images_arr[] = $old_post_image->file;

+											}

+										}

+									}

 

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

-                                        $saved_post_images_arr[] = $image_name;

+									foreach ( $post_images as $post_image ) {

+										$image_name = basename( $post_image );

+										$saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

-                                            continue; // Skip if image already exists.

-                                        }

+										if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+											continue; // Skip if image already exists.

+										}

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

+										$image_name_parts = explode( '.', $image_name );

+										array_pop( $image_name_parts );

+										$proper_image_name = implode( '.', $image_name_parts );

                                         

-                                        $arr_file_type = wp_check_filetype( $image_name );

+										$arr_file_type = wp_check_filetype( $image_name );

                                         

-                                        if ( !empty( $arr_file_type ) ) {

-                                            $uploaded_file_type = $arr_file_type['type'];

+										if ( !empty( $arr_file_type ) ) {

+											$uploaded_file_type = $arr_file_type['type'];

                                             

-                                            $attachment = array();

-                                            $attachment['post_id'] = $saved_post_id;

-                                            $attachment['title'] = $proper_image_name;

-                                            $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

-                                            $attachment['mime_type'] = $uploaded_file_type;

-                                            $attachment['menu_order'] = $order;

-                                            $attachment['is_featured'] = 0;

-

-                                            $attachment_set = '';

-                                            foreach ( $attachment as $key => $val ) {

-                                                if ( $val != '' ) {

-                                                    $attachment_set .= $key . " = '" . $val . "', ";

-                                                }

-                                            }

-                                            $attachment_set = trim( $attachment_set, ", " );

+											$attachment = array();

+											$attachment['post_id'] = $saved_post_id;

+											$attachment['title'] = $proper_image_name;

+											$attachment['content'] = '';

+											$attachment['file'] = $uploads_subdir . '/' . $image_name;

+											$attachment['mime_type'] = $uploaded_file_type;

+											$attachment['menu_order'] = $order;

+											$attachment['is_featured'] = 0;

+

+											$attachment_set = '';

+											foreach ( $attachment as $key => $val ) {

+												if ( $val != '' ) {

+													$attachment_set .= $key . " = '" . $val . "', ";

+												}

+											}

+											$attachment_set = trim( $attachment_set, ", " );

                                                                                         

-                                            // Add new attachment

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+											// Add new attachment

+											$wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

                                                                                         

-                                            $order++;

-                                        }

-                                    }

+											$order++;

+										}

+									}

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

-                                    // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+									$saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+									// Remove previous attachment

+									$wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

                                     

-                                    if ( !empty( $saved_post_images_arr ) ) {

-                                        geodir_set_wp_featured_image($saved_post_id);

-                                        /*

+									if ( !empty( $saved_post_images_arr ) ) {

+										geodir_set_wp_featured_image($saved_post_id);

+										/*

                                         $menu_order = 1;

                                         

                                         foreach ( $saved_post_images_arr as $img_name ) {

@@ -4910,281 +4910,281 @@ 
                                             }

                                             $menu_order++;

                                         }*/

-                                    }

+									}

                                     

-                                    if ( $order > 1 ) {

-                                        $images++;

-                                    }

-                                }

+									if ( $order > 1 ) {

+										$images++;

+									}

+								}

 

-                                /** This action is documented in geodirectory-functions/post-functions.php */

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

+								/** This action is documented in geodirectory-functions/post-functions.php */

+								do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

                                 

-                                if (isset($is_featured)) {

-                                    geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

-                                }

-                                if (isset($gd_post['expire_date'])) {

-                                    geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

-                                }

-                            }

+								if (isset($is_featured)) {

+									geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

+								}

+								if (isset($gd_post['expire_date'])) {

+									geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

+								}

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

-                                $sitepress->switch_lang($active_lang, true);

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $language != '') {

+								$sitepress->switch_lang($active_lang, true);

+							}

+							// WPML

+						}

+					}

+				}

 

-                //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

-

-                $json = array();

-                $json['processed'] = $processed_actual;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['invalid_addr'] = $invalid_addr;

-                $json['images'] = $images;

+				//undo some stuff to make the import quicker

+				wp_defer_term_counting( false );

+				wp_defer_comment_counting( false );

+				$wpdb->query( 'COMMIT;' );

+				$wpdb->query( 'SET autocommit = 1;' );

+

+				$json = array();

+				$json['processed'] = $processed_actual;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['invalid_addr'] = $invalid_addr;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_loc' ) {

-                global $gd_post_types;

-                $gd_post_types = $post_types;

+				wp_send_json( $json );

+				exit;

+			} else if ( $task == 'import_loc' ) {

+				global $gd_post_types;

+				$gd_post_types = $post_types;

                 

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

+						wp_send_json( $json );

+					}

                     

-                    $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					$gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

+					$gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            $data = array();

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							$data = array();

                             

-                            foreach ($columns as $c => $column ) {

-                                if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta', 'city_desc', 'region_meta', 'region_desc', 'country_meta', 'country_desc'))) {

-                                    $data[$column] = $row[$c];

-                                }

-                            }

+							foreach ($columns as $c => $column ) {

+								if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta', 'city_desc', 'region_meta', 'region_desc', 'country_meta', 'country_desc'))) {

+									$data[$column] = $row[$c];

+								}

+							}

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                continue;

-                            }

+							if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+								continue;

+							}

                             

-                            $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

+							$data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

-                            if ( $import_choice == 'update' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+							if ( $import_choice == 'update' ) {

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$data['location_id'] = (int)$location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    }

+									if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									}

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $skipped++;

-                                } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                            }

-                        }

-                    }

-                }

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								} else {

+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								}

+							} elseif ( $import_choice == 'skip' ) {

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									$skipped++;

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$skipped++;

+								} else {

+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+							}

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-            } else if ( $task == 'import_hood' ) {               

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+				wp_send_json( $json );

+			} else if ( $task == 'import_hood' ) {               

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

+						wp_send_json( $json );

+					}

                     

-                    $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

-                    $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					$gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

+					$gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            $data = array();

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							$data = array();

                             

-                            foreach ($columns as $c => $column) {

-                                if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {

-                                    $data[$column] = sanitize_text_field($row[$c]);

-                                }

-                            }

+							foreach ($columns as $c => $column) {

+								if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {

+									$data[$column] = sanitize_text_field($row[$c]);

+								}

+							}

 

-                            if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                continue;

-                            }

+							if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+								continue;

+							}

                             

-                            $location_info = array();

-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);

-                            } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

-                                $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

-                            }

+							$location_info = array();

+							if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

+								$location_info = geodir_get_location_by_id('', (int)$data['location_id']);

+							} else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

+								$location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

+							}

 

-                            if (empty($location_info)) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                continue;

-                            }

+							if (empty($location_info)) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+								continue;

+							}

                             

-                            $location_id = $location_info->location_id;

+							$location_id = $location_info->location_id;

 

-                            $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;

+							$data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;

                             

-                            $hood_data = array();

-                            $hood_data['hood_name'] = $data['neighbourhood_name'];

-                            $hood_data['hood_slug'] = $data['neighbourhood_slug'];

-                            $hood_data['hood_latitude'] = $data['latitude'];

-                            $hood_data['hood_longitude'] = $data['longitude'];

-                            $hood_data['hood_location_id'] = $location_id;

+							$hood_data = array();

+							$hood_data['hood_name'] = $data['neighbourhood_name'];

+							$hood_data['hood_slug'] = $data['neighbourhood_slug'];

+							$hood_data['hood_latitude'] = $data['latitude'];

+							$hood_data['hood_longitude'] = $data['longitude'];

+							$hood_data['hood_location_id'] = $location_id;

                                     

-                            if ( $import_choice == 'update' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];

+							if ( $import_choice == 'update' ) {

+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+									$hood_data['hood_id'] = (int)$data['neighbourhood_id'];

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

+									$hood_data['hood_id'] = (int)$neighbourhood->hood_id;

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                } else {

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $skipped++;

-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $skipped++;

-                                } else {

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								} else {

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								}

+							} elseif ( $import_choice == 'skip' ) {

+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+									$skipped++;

+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

+									$skipped++;

+								} else {

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                            }

-                        }

-                    }

-                }

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+							}

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'import_finish':{

-            /**

-             * Run an action when an import finishes.

-             *

-             * This action can be used to fire functions after an import ends.

-             *

-             * @since 1.5.3

-             * @package GeoDirectory

-             */

-            do_action('geodir_import_finished');

-        }

-        break;

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'import_finish':{

+			/**

+			 * Run an action when an import finishes.

+			 *

+			 * This action can be used to fire functions after an import ends.

+			 *

+			 * @since 1.5.3

+			 * @package GeoDirectory

+			 */

+			do_action('geodir_import_finished');

+		}

+		break;

 

-    }

-    echo '0';

-    gd_die();

+	}

+	echo '0';

+	gd_die();

 }

 

 /**

@@ -5228,12 +5228,12 @@ 
 		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

 	}

 	

-    if( !empty( $term ) ) {

+	if( !empty( $term ) ) {

 		$result = wp_insert_term( $term, $taxonomy, $args );

-        if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

-    }

+		if( !is_wp_error( $result ) ) {

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

+	}

 	

 	return false;

 }

@@ -5279,16 +5279,16 @@ 
 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

 	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

 	} else {

 		return geodir_imex_insert_term( $taxonomy, $term_data );

 	}

@@ -5310,47 +5310,47 @@ 
  * @return int Posts count.

  */

 function geodir_get_posts_count( $post_type ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( !post_type_exists( $post_type ) ) {

-        return 0;

-    }

+	if ( !post_type_exists( $post_type ) ) {

+		return 0;

+	}

         

-    $table = $plugin_prefix . $post_type . '_detail';

+	$table = $plugin_prefix . $post_type . '_detail';

 

-    // Skip listing with statuses trash, auto-draft etc...

-    $skip_statuses = geodir_imex_export_skip_statuses();

-    $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-    }

+	// Skip listing with statuses trash, auto-draft etc...

+	$skip_statuses = geodir_imex_export_skip_statuses();

+	$where_statuses = '';

+	if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+	}

     

-    /**

-     * Filter the SQL where clause part to filter posts count in import/export.

-     *

-     * @since 1.6.4

-     * @package GeoDirectory

-     *

-     * @param string $where SQL where clause part.

-     */

-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

-

-    $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

-

-    $posts_count = (int)$wpdb->get_var( $query );

+	/**

+	 * Filter the SQL where clause part to filter posts count in import/export.

+	 *

+	 * @since 1.6.4

+	 * @package GeoDirectory

+	 *

+	 * @param string $where SQL where clause part.

+	 */

+	$where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

+

+	$query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

+

+	$posts_count = (int)$wpdb->get_var( $query );

     

-    /**

-     * Modify returned post counts for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param int $posts_count Post counts.

-     * @param string $post_type Post type.

-     */

-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

-

-    return $posts_count;

+	/**

+	 * Modify returned post counts for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param int $posts_count Post counts.

+	 * @param string $post_type Post type.

+	 */

+	$posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

+

+	return $posts_count;

 }

 

 /**

@@ -5378,10 +5378,10 @@ 
 	

 	if ( !empty( $posts ) ) {

 		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

-        $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

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

-        $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+		$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

+		$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

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

+		$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

 		

 		$csv_row = array();

 		$csv_row[] = 'post_id';

@@ -5413,7 +5413,7 @@ 
 		}

 		$csv_row[] = 'post_status';

 		$csv_row[] = 'is_featured';

-        // Export claim listing field

+		// Export claim listing field

 		if ($is_claim_active) {

 			$csv_row[] = 'claimed';

 		}

@@ -5421,7 +5421,7 @@ 
 			$csv_row[] = 'package_id';

 			$csv_row[] = 'expire_date';

 		}

-        $csv_row[] = 'post_date';

+		$csv_row[] = 'post_date';

 		$csv_row[] = 'geodir_video';

 		$csv_row[] = 'post_address';

 		$csv_row[] = 'post_city';

@@ -5430,11 +5430,11 @@ 
 		$csv_row[] = 'post_zip';

 		$csv_row[] = 'post_latitude';

 		$csv_row[] = 'post_longitude';

-        if ($neighbourhood_active) {

-            $csv_row[] = 'post_neighbourhood';

-            $csv_row[] = 'neighbourhood_latitude';

-            $csv_row[] = 'neighbourhood_longitude';

-        }

+		if ($neighbourhood_active) {

+			$csv_row[] = 'post_neighbourhood';

+			$csv_row[] = 'neighbourhood_latitude';

+			$csv_row[] = 'neighbourhood_longitude';

+		}

 		$csv_row[] = 'geodir_timing';

 		$csv_row[] = 'geodir_contact';

 		$csv_row[] = 'geodir_email';

@@ -5466,21 +5466,21 @@ 
 			$csv_row[] = 'franchise';

 		}

         

-        /**

-         * Filter columns feild names of gd export listings csv.

-         *

-         * @since 1.6.5

-         * @package GeoDirectory

-         *

-         * @param array $csv_row Column names being exported in csv.

-         * @param string $post_type The post type.

-         */

-        $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);

+		/**

+		 * Filter columns feild names of gd export listings csv.

+		 *

+		 * @since 1.6.5

+		 * @package GeoDirectory

+		 *

+		 * @param array $csv_row Column names being exported in csv.

+		 * @param string $post_type The post type.

+		 */

+		$csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);

 		

 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

+		$xx=0;

 		foreach ( $posts as $post ) {$xx++;

 			$post_id = $post['ID'];

 			

@@ -5611,14 +5611,14 @@ 
 			}

 			$csv_row[] = $post_info['post_status']; // post_status

 			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

-            if ($is_claim_active) {

-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

-            }

+			if ($is_claim_active) {

+				$csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

+			}

 			if ($is_payment_plugin) {

 				$csv_row[] = (int)$post_info['package_id']; // package_id

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

-            $csv_row[] = $post_info['post_date']; // post_date

+			$csv_row[] = $post_info['post_date']; // post_date

 			$csv_row[] = $post_info['geodir_video']; // geodir_video

 			$csv_row[] = $post_info['post_address']; // post_address

 			$csv_row[] = $post_info['post_city']; // post_city

@@ -5627,21 +5627,21 @@ 
 			$csv_row[] = $post_info['post_zip']; // post_zip

 			$csv_row[] = $post_info['post_latitude']; // post_latitude

 			$csv_row[] = $post_info['post_longitude']; // post_longitude

-            if ($neighbourhood_active) {

-                $post_neighbourhood = '';

-                $neighbourhood_latitude = '';

-                $neighbourhood_longitude = '';

-                if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {

-                    if (!empty($hood_info)) {

-                        $post_neighbourhood = $hood_info->hood_name;

-                        $neighbourhood_latitude = $hood_info->hood_latitude;

-                        $neighbourhood_longitude = $hood_info->hood_longitude;

-                    }

-                }

-                $csv_row[] = $post_neighbourhood; // post_neighbourhood

-                $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude

-                $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude

-            }

+			if ($neighbourhood_active) {

+				$post_neighbourhood = '';

+				$neighbourhood_latitude = '';

+				$neighbourhood_longitude = '';

+				if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {

+					if (!empty($hood_info)) {

+						$post_neighbourhood = $hood_info->hood_name;

+						$neighbourhood_latitude = $hood_info->hood_latitude;

+						$neighbourhood_longitude = $hood_info->hood_longitude;

+					}

+				}

+				$csv_row[] = $post_neighbourhood; // post_neighbourhood

+				$csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude

+				$csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude

+			}

 			$csv_row[] = $post_info['geodir_timing']; // geodir_timing

 			$csv_row[] = $post_info['geodir_contact']; // geodir_contact

 			$csv_row[] = $post_info['geodir_email']; // geodir_email

@@ -5681,16 +5681,16 @@ 
 				$csv_row[] = (int)$franchise; // franchise id

 			}

             

-            /**

-             * Filter columns values of gd export listings csv file

-             *

-             * @since 1.6.5

-             * @package GeoDirectory

-             *

-             * @param array $csv_row Field values being exported in csv.

-             * @param array $post_info The post info.

-             */

-            $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

+			/**

+			 * Filter columns values of gd export listings csv file

+			 *

+			 * @since 1.6.5

+			 * @package GeoDirectory

+			 *

+			 * @param array $csv_row Field values being exported in csv.

+			 * @param array $post_info The post info.

+			 */

+			$csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

 			

 			for ( $c = 0; $c < $images_count; $c++ ) {

 				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

@@ -5723,64 +5723,64 @@ 
  * @return array Array of posts data.

  */

 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

-        return new stdClass;

+	if ( ! post_type_exists( $post_type ) )

+		return new stdClass;

         

-    $table = $plugin_prefix . $post_type . '_detail';

+	$table = $plugin_prefix . $post_type . '_detail';

 

-    $limit = '';

-    if ( $per_page > 0 && $page_no > 0 ) {

-        $offset = ( $page_no - 1 ) * $per_page;

+	$limit = '';

+	if ( $per_page > 0 && $page_no > 0 ) {

+		$offset = ( $page_no - 1 ) * $per_page;

         

-        if ( $offset > 0 ) {

-            $limit = " LIMIT " . $offset . "," . $per_page;

-        } else {

-            $limit = " LIMIT " . $per_page;

-        }

-    }

+		if ( $offset > 0 ) {

+			$limit = " LIMIT " . $offset . "," . $per_page;

+		} else {

+			$limit = " LIMIT " . $per_page;

+		}

+	}

 

-    // Skip listing with statuses trash, auto-draft etc...

-    $skip_statuses = geodir_imex_export_skip_statuses();

-    $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-    }

+	// Skip listing with statuses trash, auto-draft etc...

+	$skip_statuses = geodir_imex_export_skip_statuses();

+	$where_statuses = '';

+	if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+	}

     

-    /**

-     * Filter the SQL where clause part to filter posts in import/export.

-     *

-     * @since 1.6.4

-     * @package GeoDirectory

-     *

-     * @param string $where SQL where clause part.

-     */

-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

-

-    $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

-    /**

-     * Modify returned posts SQL query for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param int $query The SQL query.

-     * @param string $post_type Post type.

-     */

-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-    $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

-

-    /**

-     * Modify returned post results for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param object $results An object containing all post ids.

-     * @param string $post_type Post type.

-     */

-    return apply_filters( 'geodir_export_posts', $results, $post_type );

+	/**

+	 * Filter the SQL where clause part to filter posts in import/export.

+	 *

+	 * @since 1.6.4

+	 * @package GeoDirectory

+	 *

+	 * @param string $where SQL where clause part.

+	 */

+	$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+

+	$query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

+	/**

+	 * Modify returned posts SQL query for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param int $query The SQL query.

+	 * @param string $post_type Post type.

+	 */

+	$query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

+	$results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

+

+	/**

+	 * Modify returned post results for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param object $results An object containing all post ids.

+	 * @param string $post_type Post type.

+	 */

+	return apply_filters( 'geodir_export_posts', $results, $post_type );

 }

 

 /**

@@ -5799,26 +5799,26 @@ 
  * @return string The SQL query.

  */

 function geodir_imex_get_events_query( $query, $post_type ) {

-    if ( $post_type == 'gd_event' ) {

-        global $wpdb, $plugin_prefix;

+	if ( $post_type == 'gd_event' ) {

+		global $wpdb, $plugin_prefix;

         

-        $table = $plugin_prefix . $post_type . '_detail';

-        $schedule_table = EVENT_SCHEDULE;

+		$table = $plugin_prefix . $post_type . '_detail';

+		$schedule_table = EVENT_SCHEDULE;

         

-        // Skip listing with statuses trash, auto-draft etc...

-        $skip_statuses = geodir_imex_export_skip_statuses();

-        $where_statuses = '';

-        if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-        }

+		// Skip listing with statuses trash, auto-draft etc...

+		$skip_statuses = geodir_imex_export_skip_statuses();

+		$where_statuses = '';

+		if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

+			$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+		}

         

-        /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */

-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+		/** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */

+		$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

 

-        $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

-    }

+		$query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

+	}

 

-    return $query;

+	return $query;

 }

 

 /**

@@ -5840,36 +5840,36 @@ 
  * @return int Total terms count.

  */

 function geodir_get_terms_count( $post_type ) {

-    $args = array( 'hide_empty' => 0 );

+	$args = array( 'hide_empty' => 0 );

 

-    remove_all_filters( 'get_terms' );

+	remove_all_filters( 'get_terms' );

 

-    $taxonomy = $post_type . 'category';

+	$taxonomy = $post_type . 'category';

 

-    // WPML

-    $is_wpml = geodir_is_wpml();

-    $active_lang = 'all';

-    if ( $is_wpml ) {

-        global $sitepress;

-        $active_lang = $sitepress->get_current_language();

+	// WPML

+	$is_wpml = geodir_is_wpml();

+	$active_lang = 'all';

+	if ( $is_wpml ) {

+		global $sitepress;

+		$active_lang = $sitepress->get_current_language();

         

-        if ( $active_lang != 'all' ) {

-            $sitepress->switch_lang( 'all', true );

-        }

-    }

-    // WPML

+		if ( $active_lang != 'all' ) {

+			$sitepress->switch_lang( 'all', true );

+		}

+	}

+	// WPML

             

-    $count_terms = wp_count_terms( $taxonomy, $args );

+	$count_terms = wp_count_terms( $taxonomy, $args );

 

-    // WPML

-    if ( $is_wpml && $active_lang !== 'all' ) {

-        global $sitepress;

-        $sitepress->switch_lang( $active_lang, true );

-    }

-    // WPML

-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+	// WPML

+	if ( $is_wpml && $active_lang !== 'all' ) {

+		global $sitepress;

+		$sitepress->switch_lang( $active_lang, true );

+	}

+	// WPML

+	$count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

      

-    return $count_terms;

+	return $count_terms;

 }

 

 /**

@@ -5908,11 +5908,11 @@ 
 		$csv_row[] = 'cat_posttype';

 		$csv_row[] = 'cat_parent';

 		$csv_row[] = 'cat_schema';

-        // WPML

+		// WPML

 		$is_wpml = geodir_is_wpml();

 		if ($is_wpml) {

 			$csv_row[] = 'cat_language';

-            $csv_row[] = 'cat_id_original';

+			$csv_row[] = 'cat_id_original';

 		}

 		// WPML

 		$csv_row[] = 'cat_description';

@@ -5942,10 +5942,10 @@ 
 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

 			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

-            // WPML

+			// WPML

 			if ($is_wpml) {

 				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

+				$csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

 			}

 			// WPML

 			$csv_row[] = $term->description;

@@ -6541,43 +6541,43 @@ 
  * @param string $status Post status.

  */

 function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') {

-    global $wpdb, $current_user;

-

-    $option_value = get_option($option);

-

-    if ($option_value > 0) :

-        if (get_post($option_value)) :

-            // Page exists

-            return;

-        endif;

-    endif;

-

-    $page_found = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

-            array($slug)

-        )

-    );

-

-    if ($page_found) :

-        // Page exists

-        if (!$option_value) update_option($option, $page_found);

-        return;

-    endif;

-

-    $page_data = array(

-        'post_status' => $status,

-        'post_type' => 'page',

-        'post_author' => $current_user->ID,

-        'post_name' => $slug,

-        'post_title' => $page_title,

-        'post_content' => $page_content,

-        'post_parent' => $post_parent,

-        'comment_status' => 'closed'

-    );

-    $page_id = wp_insert_post($page_data);

-

-    add_option($option, $page_id);

+	global $wpdb, $current_user;

+

+	$option_value = get_option($option);

+

+	if ($option_value > 0) :

+		if (get_post($option_value)) :

+			// Page exists

+			return;

+		endif;

+	endif;

+

+	$page_found = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+			array($slug)

+		)

+	);

+

+	if ($page_found) :

+		// Page exists

+		if (!$option_value) update_option($option, $page_found);

+		return;

+	endif;

+

+	$page_data = array(

+		'post_status' => $status,

+		'post_type' => 'page',

+		'post_author' => $current_user->ID,

+		'post_name' => $slug,

+		'post_title' => $page_title,

+		'post_content' => $page_content,

+		'post_parent' => $post_parent,

+		'comment_status' => 'closed'

+	);

+	$page_id = wp_insert_post($page_data);

+

+	add_option($option, $page_id);

 

 }

 

@@ -6608,9 +6608,9 @@ 
  * @package GeoDirectory

  */

 function geodir_admin_upgrade_notice() {

-    $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

-    echo"<div class=\"$class\"> <p>$message</p></div>";

+	$class = "error";

+	$message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+	echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

 /**

@@ -6623,18 +6623,18 @@ 
  */

 function geodire_admin_upgrade_notice( $plugin_data, $r )

 {

-    // readme contents

-    $args = array(

-        'timeout'     => 15,

-        'redirection' => 5

-    );

-    $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+	// readme contents

+	$args = array(

+		'timeout'     => 15,

+		'redirection' => 5

+	);

+	$url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

+	$data       = wp_remote_get( $url, $args );

 

-    if (!is_wp_error($data) && $data['response']['code'] == 200) {

+	if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

-        geodir_in_plugin_update_message($data['body']);

-    }

+		geodir_in_plugin_update_message($data['body']);

+	}

 }

 

 

@@ -6642,28 +6642,28 @@ 
 * @param string $content http response body

 */

 function geodir_in_plugin_update_message($content) {

-    // Output Upgrade Notice

-    $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

-    $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

-

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

-

-

-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

-            $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

-            }

-            $upgrade_notice .= '</div> ';

-        }

-        }

-    }

-    echo $upgrade_notice;

+	// Output Upgrade Notice

+	$matches        = null;

+	$regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+	$upgrade_notice = '';

+	if ( preg_match( $regexp, $content, $matches ) ) {

+		if(empty($matches)){return;}

+

+		$version = trim( $matches[1] );

+		if($version && $version>GEODIRECTORY_VERSION){

+

+

+		$notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

+		if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

+			$upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

+			foreach ( $notices as $index => $line ) {

+				$upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+			}

+			$upgrade_notice .= '</div> ';

+		}

+		}

+	}

+	echo $upgrade_notice;

 }

 

 /**

@@ -6696,19 +6696,19 @@ 
  * @param array Listing statuses to be skipped.

  */

 function geodir_imex_export_skip_statuses() {

-    $statuses = array( 'trash', 'auto-draft' );

+	$statuses = array( 'trash', 'auto-draft' );

     

-    /**

-     * Filter the statuses to skip during GD export listings.

-     *

-     * @since 1.6.0

-     * @package GeoDirectory

-     *

-     * @param array $statuses Listing statuses to be skipped.

-     */

-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

+	/**

+	 * Filter the statuses to skip during GD export listings.

+	 *

+	 * @since 1.6.0

+	 * @package GeoDirectory

+	 *

+	 * @param array $statuses Listing statuses to be skipped.

+	 */

+	$statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

      

-    return $statuses;

+	return $statuses;

 }

 

 /**

@@ -6720,15 +6720,15 @@ 
  * @since 1.6.3

  */

 function geodir_admin_dequeue_scripts() {

-    // EDD

-    if (wp_script_is('jquery-chosen', 'enqueued')) {

-        wp_dequeue_script('jquery-chosen');

-    }

+	// EDD

+	if (wp_script_is('jquery-chosen', 'enqueued')) {

+		wp_dequeue_script('jquery-chosen');

+	}

     

-    // Ultimate Addons for Visual Composer

-    if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {

-        wp_dequeue_script('ultimate-vc-backend-script');

-    }

+	// Ultimate Addons for Visual Composer

+	if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {

+		wp_dequeue_script('ultimate-vc-backend-script');

+	}

 }

 

 /**

@@ -6744,24 +6744,24 @@ 
  * @return string SQL where clause part.

  */

 function geodir_imex_get_filter_where($where = '', $post_type = '') {

-    global $wpdb;

+	global $wpdb;

     

-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+	$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

     

-    if ( !empty( $filters ) ) {

-        foreach ( $filters as $field => $value ) {

-            switch ($field) {

-                case 'start_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

-                break;

-                case 'end_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

-                break;

-            }

-        }

-    }

+	if ( !empty( $filters ) ) {

+		foreach ( $filters as $field => $value ) {

+			switch ($field) {

+				case 'start_date':

+					$where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

+				break;

+				case 'end_date':

+					$where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

+				break;

+			}

+		}

+	}

     

-    return $where;

+	return $where;

 }

 add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2);

 add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);