GeoDirectory / geodirectory

geodirectory_shortcodes.php

Indentation +711 added lines, -711 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,43 +32,43 @@ 
  */
 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 {
-       // Add listing page will be used if shortcode is detected in page content, no need to call it here
-    }
-    $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 {
+	   // Add listing page will be used if shortcode is detected in page content, no need to call it here
+	}
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 /**
@@ -96,136 +96,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');
 
@@ -259,77 +259,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')) {
@@ -338,13 +338,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');
@@ -377,120 +377,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');
@@ -514,22 +514,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');
@@ -560,30 +560,30 @@ 
  */
 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' => '',
-        'default_post_type' => '',
-        'parent_only' => false,
-    );
-
-    $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'] : '';
-    $params['parent_only'] = gdsc_to_bool_val($params['parent_only']);
-    geodir_popular_post_category_output($params, $params);
-
-    $output = ob_get_contents();
-
-    ob_end_clean();
-
-    return $output;
+	ob_start();
+	global $geodir_post_category_str;
+	$defaults = array(
+		'category_limit' => 15,
+		'before_widget' => '',
+		'after_widget' => '',
+		'before_title' => '',
+		'after_title' => '',
+		'title' => '',
+		'default_post_type' => '',
+		'parent_only' => false,
+	);
+
+	$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'] : '';
+	$params['parent_only'] = gdsc_to_bool_val($params['parent_only']);
+	geodir_popular_post_category_output($params, $params);
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_popular_post_view', 'geodir_sc_popular_post_view');
@@ -623,97 +623,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'));
 
-    geodir_popular_postview_output($params, $params);
+	// 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']);
 
-    $output = ob_get_contents();
+	// Validate our sorting choice
+	$params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
 
-    ob_end_clean();
+	// Validate character_count
+	$params['character_count'] = absint($params['character_count']);
+	if (20 > $params['character_count']) {
+		$params['character_count'] = 20;
+	}
 
-    return $output;
+	// Validate Listing width, used in the template widget-listing-listview.php
+	// The context is in width=$listing_width% - So we need a positive number between 0 & 100
+	$params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
+
+	// Validate the checkboxes used on the widget
+	$params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+	$params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
+	$params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
+	$params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
+	$params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
+	$params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']);
+
+	/**
+	 * End of validation
+	 */
+
+	geodir_popular_postview_output($params, $params);
+
+
+	$output = ob_get_contents();
+
+	ob_end_clean();
+
+	return $output;
 }
 
 add_shortcode('gd_recent_reviews', 'geodir_sc_recent_reviews');
@@ -735,37 +735,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');
@@ -795,64 +795,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;
 }
 
 /**
@@ -876,13 +876,13 @@ 
  * @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>',
-        'show_adv_search' => 'default',
+		'after_widget' => '</section>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',
+		'show_adv_search' => 'default',
 		'post_type' => ''
 	);
 	
@@ -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');
 
@@ -1203,56 +1203,56 @@ 
  * @return string HTML content to display CPT categories.
  */
 function geodir_sc_cpt_categories_widget($atts, $content = '') {
-    $defaults = array(
-        'title' => '',
-        'post_type' => '', // NULL for all
-        'hide_empty' => '',
-        'show_count' => '',
-        'hide_icon' => '',
-        'cpt_left' => '',
-        'sort_by' => 'count',
-        'max_count' => 'all',
-        'max_level' => '1',
-        'no_cpt_filter' => '',
-        'no_cat_filter' => '',
-        '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>',
-    );
-    $params = shortcode_atts($defaults, $atts);
-
-    /**
-     * 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();
-     
-    // 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']);
+	$defaults = array(
+		'title' => '',
+		'post_type' => '', // NULL for all
+		'hide_empty' => '',
+		'show_count' => '',
+		'hide_icon' => '',
+		'cpt_left' => '',
+		'sort_by' => 'count',
+		'max_count' => 'all',
+		'max_level' => '1',
+		'no_cpt_filter' => '',
+		'no_cat_filter' => '',
+		'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>',
+	);
+	$params = shortcode_atts($defaults, $atts);
 
-    if ($params['max_count'] != 'all') {
-        $params['max_count'] = absint($params['max_count']);
-    }
+	/**
+	 * 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();
+     
+	// 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']);
+
+	if ($params['max_count'] != 'all') {
+		$params['max_count'] = absint($params['max_count']);
+	}
 
-    if ($params['max_level'] != 'all') {
-        $params['max_level'] = absint($params['max_level']);
-    }
+	if ($params['max_level'] != 'all') {
+		$params['max_level'] = absint($params['max_level']);
+	}
 
-    $params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']);
-    $params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']);
+	$params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']);
+	$params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']);
 
-    $params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
+	$params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
 
-    ob_start();
-    the_widget('geodir_cpt_categories_widget', $params, $params);
-    $output = ob_get_contents();
-    ob_end_clean();
+	ob_start();
+	the_widget('geodir_cpt_categories_widget', $params, $params);
+	$output = ob_get_contents();
+	ob_end_clean();
 
-    return $output;
+	return $output;
 }
 add_shortcode('gd_cpt_categories', 'geodir_sc_cpt_categories_widget');
 
@@ -1267,7 +1267,7 @@ 
  * @return string HTML code.
  */
 function geodir_sc_responsive_videos($atts, $content) {
-    return '<div class="geodir-video-wrapper">'.$content.'</div>';
+	return '<div class="geodir-video-wrapper">'.$content.'</div>';
 }
 add_shortcode('gd_video', 'geodir_sc_responsive_videos');
 ?>
\ No newline at end of file

geodirectory-functions/custom_taxonomy_hooks_actions.php

Indentation +474 added lines, -474 removed lines

@@ -13,29 +13,29 @@ 
  */

 function geodir_register_taxonomies()

 {

-    $taxonomies = array();

-    $taxonomies = get_option('geodir_taxonomies');

-    // If custom taxonomies are present, register them

-    if (is_array($taxonomies)) {

-        // Sort taxonomies

-        ksort($taxonomies);

-

-        // Register taxonomies

-        foreach ($taxonomies as $taxonomy => $args) {

-            // Allow taxonomy names to be translated

-            if (!empty($args['args']['labels'])) {

-                foreach ($args['args']['labels'] as $key => $tax_label) {

-                    $args['args']['labels'][$key] = __($tax_label, 'geodirectory');

-                }

-            }

-

-            $tax = register_taxonomy($taxonomy, $args['object_type'], $args['args']);

-

-            if (taxonomy_exists($taxonomy)) {

-                $tax = register_taxonomy_for_object_type($taxonomy, $args['object_type']);

-            }

-        }

-    }

+	$taxonomies = array();

+	$taxonomies = get_option('geodir_taxonomies');

+	// If custom taxonomies are present, register them

+	if (is_array($taxonomies)) {

+		// Sort taxonomies

+		ksort($taxonomies);

+

+		// Register taxonomies

+		foreach ($taxonomies as $taxonomy => $args) {

+			// Allow taxonomy names to be translated

+			if (!empty($args['args']['labels'])) {

+				foreach ($args['args']['labels'] as $key => $tax_label) {

+					$args['args']['labels'][$key] = __($tax_label, 'geodirectory');

+				}

+			}

+

+			$tax = register_taxonomy($taxonomy, $args['object_type'], $args['args']);

+

+			if (taxonomy_exists($taxonomy)) {

+				$tax = register_taxonomy_for_object_type($taxonomy, $args['object_type']);

+			}

+		}

+	}

 }

 

 

@@ -53,40 +53,40 @@ 
  */

 function geodir_register_post_types() 

 {

-    global $wp_post_types;

+	global $wp_post_types;

 

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

 

-    // Register each post type if array of data is returned

-    if (is_array($post_types)):

+	// Register each post type if array of data is returned

+	if (is_array($post_types)):

 

-        foreach ($post_types as $post_type => $args):

+		foreach ($post_types as $post_type => $args):

 

-            if (!empty($args['rewrite']['slug'])) {

-                $args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory');

-            }

-            $args = stripslashes_deep($args);

+			if (!empty($args['rewrite']['slug'])) {

+				$args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory');

+			}

+			$args = stripslashes_deep($args);

 

-            if (!empty($args['labels'])) {

-                foreach ($args['labels'] as $key => $val) {

-                    $args['labels'][$key] = __($val, 'geodirectory');// allow translation

-                }

-            }

+			if (!empty($args['labels'])) {

+				foreach ($args['labels'] as $key => $val) {

+					$args['labels'][$key] = __($val, 'geodirectory');// allow translation

+				}

+			}

 

-            /**

-             * Filter post type args.

-             *

-             * @since 1.0.0

-             * @param string $args Post type args.

-             * @param string $post_type The post type.

-             */

-            $args = apply_filters('geodir_post_type_args', $args, $post_type);

+			/**

+			 * Filter post type args.

+			 *

+			 * @since 1.0.0

+			 * @param string $args Post type args.

+			 * @param string $post_type The post type.

+			 */

+			$args = apply_filters('geodir_post_type_args', $args, $post_type);

 

-            $post_type = register_post_type($post_type, $args);

+			$post_type = register_post_type($post_type, $args);

 

-        endforeach;

-    endif;

+		endforeach;

+	endif;

 }

 

 /**

@@ -100,72 +100,72 @@ 
  */

 function geodir_post_type_args_modify($args, $post_type)

 {

-    $geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix');

+	$geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix');

 	if (isset($_REQUEST['geodir_listing_prefix']) && $_REQUEST['geodir_listing_prefix'] != '' && geodir_strtolower($_REQUEST['geodir_listing_prefix']) != geodir_strtolower($geodir_location_prefix)) {

 

-        $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));

+		$listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));

 

-        if ($post_type == 'gd_place') {

-            if (array_key_exists('has_archive', $args))

-                $args['has_archive'] = $listing_slug;

+		if ($post_type == 'gd_place') {

+			if (array_key_exists('has_archive', $args))

+				$args['has_archive'] = $listing_slug;

 

-            if (array_key_exists('rewrite', $args)) {

-                if (array_key_exists('slug', $args['rewrite']))

-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

-            }

+			if (array_key_exists('rewrite', $args)) {

+				if (array_key_exists('slug', $args['rewrite']))

+					$args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+			}

 

-            $geodir_post_types = get_option('geodir_post_types');

+			$geodir_post_types = get_option('geodir_post_types');

 

-            if (array_key_exists($post_type, $geodir_post_types)) {

+			if (array_key_exists($post_type, $geodir_post_types)) {

 

-                if (array_key_exists('has_archive', $geodir_post_types[$post_type]))

-                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;

+				if (array_key_exists('has_archive', $geodir_post_types[$post_type]))

+					$geodir_post_types[$post_type]['has_archive'] = $listing_slug;

 

-                if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

-                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+				if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

+					if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

+						$geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

 

-                update_option('geodir_post_types', $geodir_post_types);

+				update_option('geodir_post_types', $geodir_post_types);

 

-            }

+			}

 

-            $geodir_post_types = get_option('geodir_post_types');

+			$geodir_post_types = get_option('geodir_post_types');

 

-            /* --- update taxonomies (category) --- */

+			/* --- update taxonomies (category) --- */

 

-            $geodir_taxonomies = get_option('geodir_taxonomies');

+			$geodir_taxonomies = get_option('geodir_taxonomies');

 

-            if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {

-                $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;

+			if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {

+				$geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;

 

-                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

-                        if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))

-                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;

+				if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))

+					if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

+						if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))

+							$geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;

 

-                update_option('geodir_taxonomies', $geodir_taxonomies);

+				update_option('geodir_taxonomies', $geodir_taxonomies);

 

-            }

+			}

 

-            /* --- update taxonomies (tags) --- */

-            $geodir_taxonomies_tag = get_option('geodir_taxonomies');

-            if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {

-                $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';

+			/* --- update taxonomies (tags) --- */

+			$geodir_taxonomies_tag = get_option('geodir_taxonomies');

+			if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {

+				$geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';

 

-                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

-                        if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))

-                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';

+				if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))

+					if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

+						if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))

+							$geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';

 

-                update_option('geodir_taxonomies', $geodir_taxonomies_tag);

+				update_option('geodir_taxonomies', $geodir_taxonomies_tag);

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

-    return $args;

+	return $args;

 }

 

 /**

@@ -178,8 +178,8 @@ 
  */

 function geodir_flush_rewrite_rules()

 {

-    global $wp_rewrite;

-    $wp_rewrite->flush_rules(false);

+	global $wp_rewrite;

+	$wp_rewrite->flush_rules(false);

 }

 

 /**

@@ -194,35 +194,35 @@ 
  * @return array Rewrite rules.

  */

 function geodir_listing_rewrite_rules($rules) {

-    $newrules = array();

-    $taxonomies = get_option('geodir_taxonomies');

-    $detail_url_seprator = get_option('geodir_detailurl_separator');

+	$newrules = array();

+	$taxonomies = get_option('geodir_taxonomies');

+	$detail_url_seprator = get_option('geodir_detailurl_separator');

     

 	// create rules for post listing

-    if (is_array($taxonomies)):

-        foreach ($taxonomies as $taxonomy => $args):

-            $post_type = $args['object_type'];

-            $listing_slug = $args['listing_slug'];

-

-            if (strpos($taxonomy, 'tags')) {

-                $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';

-                $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';

-            } else {

-                // use this loop to add paging for details page comments paging

-                $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';

-            }

-        endforeach;

-    endif;

-

-    // create rules for location listing

-    $location_page = get_option('geodir_location_page');

+	if (is_array($taxonomies)):

+		foreach ($taxonomies as $taxonomy => $args):

+			$post_type = $args['object_type'];

+			$listing_slug = $args['listing_slug'];

+

+			if (strpos($taxonomy, 'tags')) {

+				$newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';

+				$newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';

+			} else {

+				// use this loop to add paging for details page comments paging

+				$newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';

+			}

+		endforeach;

+	endif;

+

+	// create rules for location listing

+	$location_page = get_option('geodir_location_page');

 	

-    if($location_page) {

-        global $wpdb;

-        $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

-    }

-    if (!isset($location_prefix))

-        $location_prefix = 'location';

+	if($location_page) {

+		global $wpdb;

+		$location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

+	}

+	if (!isset($location_prefix))

+		$location_prefix = 'location';

 

 	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

 	if ($location_manager) {

@@ -266,12 +266,12 @@ 
 		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]';

 	}

 

-    if ($location_page && function_exists('icl_object_id')) {

-        foreach(icl_get_languages('skip_missing=N') as $lang){

-            $alt_page_id = '';

-            $alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);

-            if($alt_page_id){

-                $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));

+	if ($location_page && function_exists('icl_object_id')) {

+		foreach(icl_get_languages('skip_missing=N') as $lang){

+			$alt_page_id = '';

+			$alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);

+			if($alt_page_id){

+				$location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));

 

 				if ($location_manager && ($hide_country_part || $hide_region_part)) {

 					$matches2 = '';

@@ -307,14 +307,14 @@ 
 					$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]';

 					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]';

 				}

-            }

-        }

-    }

+			}

+		}

+	}

 

-    $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;

+	$newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;

 

-    $rules = array_merge($newrules, $rules);

-    return $rules;

+	$rules = array_merge($newrules, $rules);

+	return $rules;

 }

 

 /**

@@ -329,18 +329,18 @@ 
  */

 function geodir_htaccess_contents($rules)

 {

-    global $wpdb;

-    $location_prefix = get_option('geodir_location_prefix');

-    // if location page slug changed then add redirect

-    if ($location_prefix == 'location') {

-        return $rules;

-    }

-    $my_content = <<<EOD

+	global $wpdb;

+	$location_prefix = get_option('geodir_location_prefix');

+	// if location page slug changed then add redirect

+	if ($location_prefix == 'location') {

+		return $rules;

+	}

+	$my_content = <<<EOD

 \n# BEGIN GeoDirectory Rules

 #Redirect 301 /location/ /$location_prefix/

 # END GeoDirectory Rules\n\n

 EOD;

-    return $my_content . $rules;

+	return $my_content . $rules;

 }

 //add_filter('mod_rewrite_rules', 'geodir_htaccess_contents');

 

@@ -354,10 +354,10 @@ 
  */

 function geodir_add_location_var($public_query_vars)

 {

-    $public_query_vars[] = 'gd_country';

-    $public_query_vars[] = 'gd_region';

-    $public_query_vars[] = 'gd_city';

-    return $public_query_vars;

+	$public_query_vars[] = 'gd_country';

+	$public_query_vars[] = 'gd_region';

+	$public_query_vars[] = 'gd_city';

+	return $public_query_vars;

 }

 

 /**

@@ -370,8 +370,8 @@ 
  */

 function geodir_add_geodir_page_var($public_query_vars)

 {

-    $public_query_vars[] = 'gd_is_geodir_page';

-    return $public_query_vars;

+	$public_query_vars[] = 'gd_is_geodir_page';

+	return $public_query_vars;

 }

 

 /**

@@ -383,20 +383,20 @@ 
  */

 function geodir_add_page_id_in_query_var()

 {

-    global $wp_query;

+	global $wp_query;

 

-    $page_id = $wp_query->get_queried_object_id();

+	$page_id = $wp_query->get_queried_object_id();

 

-    if (!get_query_var('page_id') && !is_archive()) {

-        // fix for WP tags conflict with enfold theme

-        $theme_name = geodir_strtolower(wp_get_theme());

-        if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) {

-            return $wp_query;

-        }

-        $wp_query->set('page_id', $page_id);

-    }

+	if (!get_query_var('page_id') && !is_archive()) {

+		// fix for WP tags conflict with enfold theme

+		$theme_name = geodir_strtolower(wp_get_theme());

+		if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) {

+			return $wp_query;

+		}

+		$wp_query->set('page_id', $page_id);

+	}

 

-    return $wp_query;

+	return $wp_query;

 }

 

 /**

@@ -411,24 +411,24 @@ 
 function geodir_set_location_var_in_session_in_core($wp) {

 	global $gd_session;

 	

-    // Fix for WPML removing page_id query var:

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

-        global $wpdb;

-

-        $page_for_posts = get_option('page_for_posts');

-        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));

-

-        if (function_exists('icl_object_id')) {

-            $real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);

-        }

-        if ($real_page_id && $real_page_id!=$page_for_posts) {

-            $wp->query_vars['page_id'] = $real_page_id;

-        }

-    }

+	// Fix for WPML removing page_id query var:

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

+		global $wpdb;

+

+		$page_for_posts = get_option('page_for_posts');

+		$real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));

+

+		if (function_exists('icl_object_id')) {

+			$real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);

+		}

+		if ($real_page_id && $real_page_id!=$page_for_posts) {

+			$wp->query_vars['page_id'] = $real_page_id;

+		}

+	}

 	

 	// Query Vars will have page_id parameter

 	// check if query var has page_id and that page id is location page

-    geodir_set_is_geodir_page($wp);

+	geodir_set_is_geodir_page($wp);

 	// if is GD homepage set the page ID

 	if (geodir_is_page('home')) {

 		$wp->query_vars['page_id'] = get_option('page_on_front');

@@ -437,118 +437,118 @@ 
 	// The location url format (all or country_city or region_city or city).

 	$geodir_show_location_url = get_option('geodir_show_location_url');

 

-    if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) {

-        $gd_country = '';

-        $gd_region = '';

-        $gd_city = '';

-        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '')

-            $gd_country = urldecode($wp->query_vars['gd_country']);

-

-        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '')

-            $gd_region = urldecode($wp->query_vars['gd_region']);

-

-        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '')

-            $gd_city = urldecode($wp->query_vars['gd_city']);

-

-        if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {

-            $default_location = geodir_get_default_location();

-

-            if (get_option('geodir_add_location_url')) {

-                if ($geodir_show_location_url != 'all') {

-                    if ($gd_region == '') {

-                        if ($gd_ses_region = $gd_session->get('gd_region'))

-                            $gd_region = $gd_ses_region;

-                        else

-                            $gd_region = $default_location->region_slug;

-                    }

-

-                    if ($gd_city == '') {

-                        if ($gd_ses_city = $gd_session->get('gd_city'))

-                            $gd_city = $gd_ses_city;

-                        else

-                            $gd_city = $default_location->city_slug;

-

-                        $base_location_link = geodir_get_location_link('base');

-                        wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);

-                        exit();

-                    }

-                }

-            }

-

-            $args = array(

-                'what' => 'city',

-                'city_val' => $gd_city,

-                'region_val' => $gd_region,

-                'country_val' => $gd_country,

-                'country_column_name' => 'country_slug',

-                'region_column_name' => 'region_slug',

-                'city_column_name' => 'city_slug',

-                'location_link_part' => false,

-                'compare_operator' => ''

-            );

-

-            $location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array();

-            if (!empty($location_array)) {

-                $gd_session->set('gd_multi_location', 1);

-                $gd_session->set('gd_country', $gd_country);

-                $gd_session->set('gd_region', $gd_region);

-                $gd_session->set('gd_city', $gd_city);

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

+		$gd_country = '';

+		$gd_region = '';

+		$gd_city = '';

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

+			$gd_country = urldecode($wp->query_vars['gd_country']);

+

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

+			$gd_region = urldecode($wp->query_vars['gd_region']);

+

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

+			$gd_city = urldecode($wp->query_vars['gd_city']);

+

+		if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {

+			$default_location = geodir_get_default_location();

+

+			if (get_option('geodir_add_location_url')) {

+				if ($geodir_show_location_url != 'all') {

+					if ($gd_region == '') {

+						if ($gd_ses_region = $gd_session->get('gd_region'))

+							$gd_region = $gd_ses_region;

+						else

+							$gd_region = $default_location->region_slug;

+					}

+

+					if ($gd_city == '') {

+						if ($gd_ses_city = $gd_session->get('gd_city'))

+							$gd_city = $gd_ses_city;

+						else

+							$gd_city = $default_location->city_slug;

+

+						$base_location_link = geodir_get_location_link('base');

+						wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);

+						exit();

+					}

+				}

+			}

+

+			$args = array(

+				'what' => 'city',

+				'city_val' => $gd_city,

+				'region_val' => $gd_region,

+				'country_val' => $gd_country,

+				'country_column_name' => 'country_slug',

+				'region_column_name' => 'region_slug',

+				'city_column_name' => 'city_slug',

+				'location_link_part' => false,

+				'compare_operator' => ''

+			);

+

+			$location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array();

+			if (!empty($location_array)) {

+				$gd_session->set('gd_multi_location', 1);

+				$gd_session->set('gd_country', $gd_country);

+				$gd_session->set('gd_region', $gd_region);

+				$gd_session->set('gd_city', $gd_city);

                 

 				$wp->query_vars['gd_country'] = $gd_country;

-                $wp->query_vars['gd_region'] = $gd_region;

-                $wp->query_vars['gd_city'] = $gd_city;

-            } else {

-                $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

-            }

-        } else {

-            $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

-        }

-

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

-        if (!is_admin()) {

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

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

-            $post_type_array = geodir_get_posttypes();

+				$wp->query_vars['gd_region'] = $gd_region;

+				$wp->query_vars['gd_city'] = $gd_city;

+			} else {

+				$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

+			}

+		} else {

+			$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

+		}

+

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

+		if (!is_admin()) {

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

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

+			$post_type_array = geodir_get_posttypes();

             

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

-                // now u can apply geodirectory related manipulation.

-            }

-        }

-    } else {

-        // check if a geodirectory taxonomy is set

-        $gd_country = '';

-        $gd_region = '';

-        $gd_city = '';

+				// now u can apply geodirectory related manipulation.

+			}

+		}

+	} else {

+		// check if a geodirectory taxonomy is set

+		$gd_country = '';

+		$gd_region = '';

+		$gd_city = '';

         

 		$is_geodir_taxonomy = false;

-        $is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not

-        $is_geodir_location_found = false;

+		$is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not

+		$is_geodir_location_found = false;

 		

 		$geodir_taxonomy = '';

-        $geodir_post_type = '';

-        $geodir_term = '';

-        $geodir_set_location_session = true;

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

-

-        if(!empty($geodir_taxonomis)){

-            foreach ($geodir_taxonomis as $taxonomy) {

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

-                    $is_geodir_taxonomy = true;

-                    $geodir_taxonomy = $taxonomy;

-                    $geodir_post_type = str_replace('category', '', $taxonomy);

-                    $geodir_post_type = str_replace('_tags', '', $geodir_post_type);

-                    $geodir_term = $wp->query_vars[$geodir_taxonomy];

-                    break;

-                }

-            }

-        }

-

-        // now get an array of all terms seperated by '/'

-        $geodir_terms = explode('/', $geodir_term);

-        $geodir_last_term = end($geodir_terms);

-

-        if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy

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

+		$geodir_post_type = '';

+		$geodir_term = '';

+		$geodir_set_location_session = true;

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

+

+		if(!empty($geodir_taxonomis)){

+			foreach ($geodir_taxonomis as $taxonomy) {

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

+					$is_geodir_taxonomy = true;

+					$geodir_taxonomy = $taxonomy;

+					$geodir_post_type = str_replace('category', '', $taxonomy);

+					$geodir_post_type = str_replace('_tags', '', $geodir_post_type);

+					$geodir_term = $wp->query_vars[$geodir_taxonomy];

+					break;

+				}

+			}

+		}

+

+		// now get an array of all terms seperated by '/'

+		$geodir_terms = explode('/', $geodir_term);

+		$geodir_last_term = end($geodir_terms);

+

+		if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy

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

 

 			// now check if last term is a post of geodirectory post types

 			$geodir_post = get_posts(array(

@@ -597,196 +597,196 @@ 
 				//return ;

 			}

 

-            $geodir_location_terms = '';

-            // if last term is not a post then check if last term is a term of the specific texonomy or not

-            if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) {

-                $is_geodir_taxonomy_term = true;

+			$geodir_location_terms = '';

+			// if last term is not a post then check if last term is a term of the specific texonomy or not

+			if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) {

+				$is_geodir_taxonomy_term = true;

 

-                $geodir_set_location_session = false;

-            }

+				$geodir_set_location_session = false;

+			}

 

 

-            // now check if there is location parts in the url or not

-            if (get_option('geodir_add_location_url')) {				

+			// now check if there is location parts in the url or not

+			if (get_option('geodir_add_location_url')) {				

 				$default_location = geodir_get_default_location();

                 

 				if ($geodir_show_location_url == 'all') {

-                    if (count($geodir_terms) >= 3) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                        $gd_region = urldecode($geodir_terms[1]);

-                        $gd_city = urldecode($geodir_terms[2]);

-                    } else if (count($geodir_terms) >= 2) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                        $gd_region = urldecode($geodir_terms[1]);

-                    } else if (count($geodir_terms) >= 1) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                    }

-

-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

-                        geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&

-                        geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)

-                    )

-                        $is_geodir_location_found = true;

-

-                    // if location has not been found for country , region and city then search for country and region only

-

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

-                            geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)

-                        )

-                            $is_geodir_location_found = true;

-

-                    }

-

-                    // if location has not been found for country , region  then search for country only

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

-                        $gd_region = '';

-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

-                    }

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

-                    if (count($geodir_terms) >= 2) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                        $gd_city = urldecode($geodir_terms[1]);

-                    } else if (count($geodir_terms) >= 1) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                    }

-

-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

-

-                    // if location has not been found for country and city  then search for country only

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

+					if (count($geodir_terms) >= 3) {

+						$gd_country = urldecode($geodir_terms[0]);

+						$gd_region = urldecode($geodir_terms[1]);

+						$gd_city = urldecode($geodir_terms[2]);

+					} else if (count($geodir_terms) >= 2) {

+						$gd_country = urldecode($geodir_terms[0]);

+						$gd_region = urldecode($geodir_terms[1]);

+					} else if (count($geodir_terms) >= 1) {

+						$gd_country = urldecode($geodir_terms[0]);

+					}

+

+					if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

+						geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&

+						geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)

+					)

+						$is_geodir_location_found = true;

+

+					// if location has not been found for country , region and city then search for country and region only

+

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

+							geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)

+						)

+							$is_geodir_location_found = true;

+

+					}

+

+					// if location has not been found for country , region  then search for country only

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

+						$gd_region = '';

+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

+							$is_geodir_location_found = true;

+					}

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

+					if (count($geodir_terms) >= 2) {

+						$gd_country = urldecode($geodir_terms[0]);

+						$gd_city = urldecode($geodir_terms[1]);

+					} else if (count($geodir_terms) >= 1) {

+						$gd_country = urldecode($geodir_terms[0]);

+					}

+

+					if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

+						$is_geodir_location_found = true;

+

+					// if location has not been found for country and city  then search for country only

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

                         

 						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

-                    }

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

-                    if (count($geodir_terms) >= 2) {

-                        $gd_region = urldecode($geodir_terms[0]);

-                        $gd_city = urldecode($geodir_terms[1]);

-                    } else if (count($geodir_terms) >= 1) {

-                        $gd_region = urldecode($geodir_terms[0]);

-                    }

-

-                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

-

-                    // if location has not been found for region and city  then search for region only

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

+							$is_geodir_location_found = true;

+					}

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

+					if (count($geodir_terms) >= 2) {

+						$gd_region = urldecode($geodir_terms[0]);

+						$gd_city = urldecode($geodir_terms[1]);

+					} else if (count($geodir_terms) >= 1) {

+						$gd_region = urldecode($geodir_terms[0]);

+					}

+

+					if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

+						$is_geodir_location_found = true;

+

+					// if location has not been found for region and city  then search for region only

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

                         

 						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region))

-                            $is_geodir_location_found = true;

-                    }

-                } else {

-                    $gd_city = $geodir_terms[0];

-

-                    if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {

-                        $is_geodir_location_found = true;

-                        $gd_region = $default_location->region_slug;

-                        $gd_country = $default_location->country_slug;

-                    }

-                }

-                // if location still not found then clear location related session variables

-                if ($is_geodir_location_found && $geodir_set_location_session) {

-                    $gd_session->set('gd_multi_location', 1);

-                    $gd_session->set('gd_country', $gd_country);

-                    $gd_session->set('gd_region', $gd_region);

-                    $gd_session->set('gd_city', $gd_city);

-                }

-

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

+							$is_geodir_location_found = true;

+					}

+				} else {

+					$gd_city = $geodir_terms[0];

+

+					if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {

+						$is_geodir_location_found = true;

+						$gd_region = $default_location->region_slug;

+						$gd_country = $default_location->country_slug;

+					}

+				}

+				// if location still not found then clear location related session variables

+				if ($is_geodir_location_found && $geodir_set_location_session) {

+					$gd_session->set('gd_multi_location', 1);

+					$gd_session->set('gd_country', $gd_country);

+					$gd_session->set('gd_region', $gd_region);

+					$gd_session->set('gd_city', $gd_city);

+				}

+

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

 				} else if ($geodir_show_location_url == 'country_city') {

 					$gd_region = '';

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

 					$gd_country = '';

 				} else {

 					$gd_country = '';

-                    $gd_region = '';

+					$gd_region = '';

 				}

 

-                if ($is_geodir_location_found) {

-                    $wp->query_vars['gd_country'] = $gd_country;

-                    $wp->query_vars['gd_region'] = $gd_region;

-                    $wp->query_vars['gd_city'] = $gd_city;

-                } else {

-                    $gd_country = '';

-                    $gd_region = '';

-                    $gd_city = '';

-                }

-            }

-

-            $wp->query_vars[$geodir_taxonomy] = $geodir_term;

-            // eliminate location related terms from taxonomy term

-            if ($gd_country != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

-

-            if ($gd_region != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

-

-            if ($gd_city != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

-

-

-            $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);

-            $wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]);

-

-            $wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/');

-

-            if ($wp->query_vars[$geodir_taxonomy] == '') {

-                unset($wp->query_vars[$geodir_taxonomy]);

-            } else {

-                if (!$is_geodir_taxonomy_term) {

-                    foreach ($wp->query_vars as $key => $vars) {

-                        unset($wp->query_vars[$key]);

-                    }

-                    $wp->query_vars['error'] = '404';

-                }

-            }

-        }

-    }

+				if ($is_geodir_location_found) {

+					$wp->query_vars['gd_country'] = $gd_country;

+					$wp->query_vars['gd_region'] = $gd_region;

+					$wp->query_vars['gd_city'] = $gd_city;

+				} else {

+					$gd_country = '';

+					$gd_region = '';

+					$gd_city = '';

+				}

+			}

+

+			$wp->query_vars[$geodir_taxonomy] = $geodir_term;

+			// eliminate location related terms from taxonomy term

+			if ($gd_country != '')

+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+

+			if ($gd_region != '')

+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+

+			if ($gd_city != '')

+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+

+

+			$wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);

+			$wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]);

+

+			$wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/');

+

+			if ($wp->query_vars[$geodir_taxonomy] == '') {

+				unset($wp->query_vars[$geodir_taxonomy]);

+			} else {

+				if (!$is_geodir_taxonomy_term) {

+					foreach ($wp->query_vars as $key => $vars) {

+						unset($wp->query_vars[$key]);

+					}

+					$wp->query_vars['error'] = '404';

+				}

+			}

+		}

+	}

 	

 	// Unset location session if gd page and location not set.

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

 		$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

 	}

 

-    if ($gd_session->get('gd_multi_location') == 1) {

-        $wp->query_vars['gd_country'] = $gd_session->get('gd_country');

-        $wp->query_vars['gd_region'] = $gd_session->get('gd_region');

-        $wp->query_vars['gd_city'] = $gd_session->get('gd_city');

-    }

+	if ($gd_session->get('gd_multi_location') == 1) {

+		$wp->query_vars['gd_country'] = $gd_session->get('gd_country');

+		$wp->query_vars['gd_region'] = $gd_session->get('gd_region');

+		$wp->query_vars['gd_city'] = $gd_session->get('gd_city');

+	}

 

-    // now check if there is location parts in the url or not

-    if (get_option('geodir_add_location_url')) {        

+	// now check if there is location parts in the url or not

+	if (get_option('geodir_add_location_url')) {        

 		if ($geodir_show_location_url == 'all') {

 		} else if ($geodir_show_location_url == 'country_city') {

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

-                $wp->query_vars['gd_region'] = '';

+				$wp->query_vars['gd_region'] = '';

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

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

-                $wp->query_vars['gd_country'] = '';

+				$wp->query_vars['gd_country'] = '';

 		} else {

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

-                $wp->query_vars['gd_country'] = '';

+				$wp->query_vars['gd_country'] = '';

 

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

-                $wp->query_vars['gd_region'] = '';

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

+				$wp->query_vars['gd_region'] = '';

 		}

-    } else {

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

-            $wp->query_vars['gd_country'] = '';

+	} else {

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

+			$wp->query_vars['gd_country'] = '';

 

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

-            $wp->query_vars['gd_region'] = '';

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

+			$wp->query_vars['gd_region'] = '';

 

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

-            $wp->query_vars['gd_city'] = '';

-    }

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

+			$wp->query_vars['gd_city'] = '';

+	}

 }

 

 /**

@@ -800,24 +800,24 @@ 
  */

 function geodir_custom_post_status()

 {

-    // Virtual Page Status

-    register_post_status('virtual', array(

-        'label' => _x('Virtual', 'page', 'geodirectory'),

-        'public' => true,

-        'exclude_from_search' => true,

-        'show_in_admin_all_list' => true,

-        'show_in_admin_status_list' => true,

-        'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'),

-    ));

-

-    /**

-     * Called after we register the custom post status 'Virtual'.

-     *

-     * Can be use to add more post statuses.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_custom_post_status');

+	// Virtual Page Status

+	register_post_status('virtual', array(

+		'label' => _x('Virtual', 'page', 'geodirectory'),

+		'public' => true,

+		'exclude_from_search' => true,

+		'show_in_admin_all_list' => true,

+		'show_in_admin_status_list' => true,

+		'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'),

+	));

+

+	/**

+	 * Called after we register the custom post status 'Virtual'.

+	 *

+	 * Can be use to add more post statuses.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_custom_post_status');

 }

 

 /**

@@ -832,7 +832,7 @@ 
  */

 function geodir_get_term_link($termlink, $term, $taxonomy)

 {

-    return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php

+	return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php

 }

 

 /**

@@ -846,7 +846,7 @@ 
  */

 function geodir_get_posttype_link($link, $post_type)

 {

-    return geodir_posttype_link($link, $post_type); // taxonomy_functions.php

+	return geodir_posttype_link($link, $post_type); // taxonomy_functions.php

 }

 

 /**

@@ -861,13 +861,13 @@ 
  */

 function exclude_from_wp_list_pages($exclude_array)

 {

-    $pages_ids = array();

-    $pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual'));

-    foreach ($pages_array as $page) {

-        $pages_ids[] = $page->ID;

-    }

-    $exclude_array = $exclude_array + $pages_ids;

-    return $exclude_array;

+	$pages_ids = array();

+	$pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual'));

+	foreach ($pages_array as $page) {

+		$pages_ids[] = $page->ID;

+	}

+	$exclude_array = $exclude_array + $pages_ids;

+	return $exclude_array;

 }

 

 /**

@@ -880,8 +880,8 @@ 
  */

 function geodir_exclude_page($query)

 {

-    add_filter('posts_where', 'geodir_exclude_page_where', 100);

-    return $query;

+	add_filter('posts_where', 'geodir_exclude_page_where', 100);

+	return $query;

 }

 

 /**

@@ -896,11 +896,11 @@ 
  */

 function geodir_exclude_page_where($where)

 {

-    global $wpdb;

-    if (is_admin())

-        $where .= " AND $wpdb->posts.post_status != 'virtual'";

+	global $wpdb;

+	if (is_admin())

+		$where .= " AND $wpdb->posts.post_status != 'virtual'";

 

-    return $where;

+	return $where;

 }

 

 /**

@@ -915,20 +915,20 @@ 
  * @return mixed The taxonomy option value.

  */

 function geodir_wpseo_taxonomy_meta( $value, $option = '' ) {

-    global $wp_query;

+	global $wp_query;

     

-    if ( !empty( $value ) && ( is_category() || is_tax() ) ) {

-        $term = $wp_query->get_queried_object();

+	if ( !empty( $value ) && ( is_category() || is_tax() ) ) {

+		$term = $wp_query->get_queried_object();

         

-        if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {

-            $image  = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) );

+		if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {

+			$image  = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) );

             

-            if ( !empty( $image['src'] ) ) {

-                $value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src'];

-                $value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src'];

-            }

-        }

-    }

-    return $value;

+			if ( !empty( $image['src'] ) ) {

+				$value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src'];

+				$value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src'];

+			}

+		}

+	}

+	return $value;

 }

 add_filter( 'option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2 );

geodirectory_widgets.php

Indentation +898 added lines, -898 removed lines

@@ -15,296 +15,296 @@ 
  */

 function geodir_register_sidebar()

 {

-    global $geodir_sidebars;

-

-    if (function_exists('register_sidebar')) {

-        /*===========================*/

-        /* Home page sidebars start*/

-        /*===========================*/

-

-        /**

-         * Filter the `$before_widget` widget opening HTML tag.

-         *

-         * @since 1.0.0

-         * @param string $var The HTML string to filter. Default = '<section id="%1$s" class="widget geodir-widget %2$s">'.

-         * @see 'geodir_after_widget'

-         */

-        $before_widget = apply_filters('geodir_before_widget', '<section id="%1$s" class="widget geodir-widget %2$s">');

-        /**

-         * Filter the `$after_widget` widget closing HTML tag.

-         *

-         * @since 1.0.0

-         * @param string $var The HTML string to filter. Default = '</section>'.

-         * @see 'geodir_before_widget'

-         */

-        $after_widget = apply_filters('geodir_after_widget', '</section>');

-        /**

-         * Filter the `$before_title` widget title opening HTML tag.

-         *

-         * @since 1.0.0

-         * @param string $var The HTML string to filter. Default = '<h3 class="widget-title">'.

-         * @see 'geodir_after_title'

-         */

-        $before_title = apply_filters('geodir_before_title', '<h3 class="widget-title">');

-        /**

-         * Filter the `$after_title` widget title closing HTML tag.

-         *

-         * @since 1.0.0

-         * @param string $var The HTML string to filter. Default = '</h3>'.

-         * @see 'geodir_before_title'

-         */

-        $after_title = apply_filters('geodir_after_title', '</h3>');

-

-        if (get_option('geodir_show_home_top_section')) {

-            register_sidebars(1, array('id' => 'geodir_home_top', 'name' => __('GD Home Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

-

-            $geodir_sidebars[] = 'geodir_home_top';

-        }

-

-        if (get_option('geodir_show_home_contant_section')) {

-            register_sidebars(1, array('id' => 'geodir_home_content', 'name' => __('GD Home Content Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+	global $geodir_sidebars;

 

-            $geodir_sidebars[] = 'geodir_home_content';

-        }

+	if (function_exists('register_sidebar')) {

+		/*===========================*/

+		/* Home page sidebars start*/

+		/*===========================*/

 

-        if (get_option('geodir_show_home_right_section')) {

-            register_sidebars(1, array('id' => 'geodir_home_right', 'name' => __('GD Home Right Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		/**

+		 * Filter the `$before_widget` widget opening HTML tag.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The HTML string to filter. Default = '<section id="%1$s" class="widget geodir-widget %2$s">'.

+		 * @see 'geodir_after_widget'

+		 */

+		$before_widget = apply_filters('geodir_before_widget', '<section id="%1$s" class="widget geodir-widget %2$s">');

+		/**

+		 * Filter the `$after_widget` widget closing HTML tag.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The HTML string to filter. Default = '</section>'.

+		 * @see 'geodir_before_widget'

+		 */

+		$after_widget = apply_filters('geodir_after_widget', '</section>');

+		/**

+		 * Filter the `$before_title` widget title opening HTML tag.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The HTML string to filter. Default = '<h3 class="widget-title">'.

+		 * @see 'geodir_after_title'

+		 */

+		$before_title = apply_filters('geodir_before_title', '<h3 class="widget-title">');

+		/**

+		 * Filter the `$after_title` widget title closing HTML tag.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The HTML string to filter. Default = '</h3>'.

+		 * @see 'geodir_before_title'

+		 */

+		$after_title = apply_filters('geodir_after_title', '</h3>');

+

+		if (get_option('geodir_show_home_top_section')) {

+			register_sidebars(1, array('id' => 'geodir_home_top', 'name' => __('GD Home Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_home_right';

-        }

+			$geodir_sidebars[] = 'geodir_home_top';

+		}

 

-        if (get_option('geodir_show_home_left_section')) {

-            register_sidebars(1, array('id' => 'geodir_home_left', 'name' => __('GD Home Left Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_home_contant_section')) {

+			register_sidebars(1, array('id' => 'geodir_home_content', 'name' => __('GD Home Content Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_home_left';

-        }

+			$geodir_sidebars[] = 'geodir_home_content';

+		}

 

-        if (get_option('geodir_show_home_bottom_section')) {

-            register_sidebars(1, array('id' => 'geodir_home_bottom', 'name' => __('GD Home Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_home_right_section')) {

+			register_sidebars(1, array('id' => 'geodir_home_right', 'name' => __('GD Home Right Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_home_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_home_right';

+		}

 

-        /*===========================*/

-        /* Home page sidebars end*/

-        /*===========================*/

+		if (get_option('geodir_show_home_left_section')) {

+			register_sidebars(1, array('id' => 'geodir_home_left', 'name' => __('GD Home Left Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        /*===========================*/

-        /* Listing page sidebars start*/

-        /*===========================*/

+			$geodir_sidebars[] = 'geodir_home_left';

+		}

 

-        if (get_option('geodir_show_listing_top_section')) {

-            register_sidebars(1, array('id' => 'geodir_listing_top', 'name' => __('GD Listing Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_home_bottom_section')) {

+			register_sidebars(1, array('id' => 'geodir_home_bottom', 'name' => __('GD Home Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_listing_top';

-        }

+			$geodir_sidebars[] = 'geodir_home_bottom';

+		}

 

-        if (get_option('geodir_show_listing_left_section')) {

-            register_sidebars(1, array('id' => 'geodir_listing_left_sidebar', 'name' => __('GD Listing Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		/*===========================*/

+		/* Home page sidebars end*/

+		/*===========================*/

 

-            $geodir_sidebars[] = 'geodir_listing_left_sidebar';

-        }

+		/*===========================*/

+		/* Listing page sidebars start*/

+		/*===========================*/

 

-        if (get_option('geodir_show_listing_right_section')) {

-            register_sidebars(1, array('id' => 'geodir_listing_right_sidebar', 'name' => __('GD Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_listing_top_section')) {

+			register_sidebars(1, array('id' => 'geodir_listing_top', 'name' => __('GD Listing Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_listing_right_sidebar';

-        }

+			$geodir_sidebars[] = 'geodir_listing_top';

+		}

 

-        if (get_option('geodir_show_listing_bottom_section')) {

-            register_sidebars(1, array('id' => 'geodir_listing_bottom', 'name' => __('GD Listing Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_listing_left_section')) {

+			register_sidebars(1, array('id' => 'geodir_listing_left_sidebar', 'name' => __('GD Listing Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_listing_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_listing_left_sidebar';

+		}

 

-        /*===========================*/

-        /* Listing page sidebars start*/

-        /*===========================*/

+		if (get_option('geodir_show_listing_right_section')) {

+			register_sidebars(1, array('id' => 'geodir_listing_right_sidebar', 'name' => __('GD Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        /*===========================*/

-        /* Search page sidebars start*/

-        /*===========================*/

+			$geodir_sidebars[] = 'geodir_listing_right_sidebar';

+		}

 

-        if (get_option('geodir_show_search_top_section')) {

-            register_sidebars(1, array('id' => 'geodir_search_top', 'name' => __('GD Search Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_listing_bottom_section')) {

+			register_sidebars(1, array('id' => 'geodir_listing_bottom', 'name' => __('GD Listing Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_search_top';

-        }

+			$geodir_sidebars[] = 'geodir_listing_bottom';

+		}

 

-        if (get_option('geodir_show_search_left_section')) {

-            register_sidebars(1, array('id' => 'geodir_search_left_sidebar', 'name' => __('GD Search Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		/*===========================*/

+		/* Listing page sidebars start*/

+		/*===========================*/

 

-            $geodir_sidebars[] = 'geodir_search_left_sidebar';

-        }

+		/*===========================*/

+		/* Search page sidebars start*/

+		/*===========================*/

 

-        if (get_option('geodir_show_search_right_section')) {

-            register_sidebars(1, array('id' => 'geodir_search_right_sidebar', 'name' => __('GD Search Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_search_top_section')) {

+			register_sidebars(1, array('id' => 'geodir_search_top', 'name' => __('GD Search Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_search_right_sidebar';

-        }

+			$geodir_sidebars[] = 'geodir_search_top';

+		}

 

-        if (get_option('geodir_show_search_bottom_section')) {

-            register_sidebars(1, array('id' => 'geodir_search_bottom', 'name' => __('GD Search Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_search_left_section')) {

+			register_sidebars(1, array('id' => 'geodir_search_left_sidebar', 'name' => __('GD Search Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_search_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_search_left_sidebar';

+		}

 

-        /*===========================*/

-        /* Search page sidebars end*/

-        /*===========================*/

+		if (get_option('geodir_show_search_right_section')) {

+			register_sidebars(1, array('id' => 'geodir_search_right_sidebar', 'name' => __('GD Search Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        /*==================================*/

-        /* Detail/Single page sidebars start*/

-        /*==================================*/

-        if (get_option('geodir_show_detail_top_section')) {

-            register_sidebars(1, array('id' => 'geodir_detail_top', 'name' => __('GD Detail Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+			$geodir_sidebars[] = 'geodir_search_right_sidebar';

+		}

 

-            $geodir_sidebars[] = 'geodir_detail_top';

-        }

+		if (get_option('geodir_show_search_bottom_section')) {

+			register_sidebars(1, array('id' => 'geodir_search_bottom', 'name' => __('GD Search Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        register_sidebars(1, array('id' => 'geodir_detail_sidebar', 'name' => __('GD Detail Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+			$geodir_sidebars[] = 'geodir_search_bottom';

+		}

 

-        $geodir_sidebars[] = 'geodir_detail_sidebar';

+		/*===========================*/

+		/* Search page sidebars end*/

+		/*===========================*/

 

-        if (get_option('geodir_show_detail_bottom_section')) {

-            register_sidebars(1, array('id' => 'geodir_detail_bottom', 'name' => __('GD Detail Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		/*==================================*/

+		/* Detail/Single page sidebars start*/

+		/*==================================*/

+		if (get_option('geodir_show_detail_top_section')) {

+			register_sidebars(1, array('id' => 'geodir_detail_top', 'name' => __('GD Detail Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_detail_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_detail_top';

+		}

 

-        /*==================================*/

-        /* Detail/Single page sidebars end*/

-        /*==================================*/

+		register_sidebars(1, array('id' => 'geodir_detail_sidebar', 'name' => __('GD Detail Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        /*==================================*/

-        /* Author page sidebars start       */

-        /*==================================*/

+		$geodir_sidebars[] = 'geodir_detail_sidebar';

 

-        if (get_option('geodir_show_author_top_section')) {

-            register_sidebars(1, array('id' => 'geodir_author_top', 'name' => __('GD Author Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_detail_bottom_section')) {

+			register_sidebars(1, array('id' => 'geodir_detail_bottom', 'name' => __('GD Detail Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_author_top';

-        }

+			$geodir_sidebars[] = 'geodir_detail_bottom';

+		}

 

-        if (get_option('geodir_show_author_left_section')) {

-            register_sidebars(1, array('id' => 'geodir_author_left_sidebar', 'name' => __('GD Author Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		/*==================================*/

+		/* Detail/Single page sidebars end*/

+		/*==================================*/

 

-            $geodir_sidebars[] = 'geodir_author_left_sidebar';

-        }

+		/*==================================*/

+		/* Author page sidebars start       */

+		/*==================================*/

 

-        if (get_option('geodir_show_author_right_section')) {

-            register_sidebars(1, array('id' => 'geodir_author_right_sidebar', 'name' => __('GD Author Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_author_top_section')) {

+			register_sidebars(1, array('id' => 'geodir_author_top', 'name' => __('GD Author Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_author_right_sidebar';

-        }

+			$geodir_sidebars[] = 'geodir_author_top';

+		}

 

-        if (get_option('geodir_show_author_bottom_section')) {

-            register_sidebars(1, array('id' => 'geodir_author_bottom', 'name' => __('GD Author Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_author_left_section')) {

+			register_sidebars(1, array('id' => 'geodir_author_left_sidebar', 'name' => __('GD Author Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_author_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_author_left_sidebar';

+		}

 

-        /*==================================*/

-        /* Author page sidebars end         */

-        /*==================================*/

+		if (get_option('geodir_show_author_right_section')) {

+			register_sidebars(1, array('id' => 'geodir_author_right_sidebar', 'name' => __('GD Author Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        /*==================================*/

-        /* Add listing page sidebars start       */

-        /*==================================*/

+			$geodir_sidebars[] = 'geodir_author_right_sidebar';

+		}

 

-        register_sidebars(1, array('id' => 'geodir_add_listing_sidebar', 'name' => __('GD Add Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_author_bottom_section')) {

+			register_sidebars(1, array('id' => 'geodir_author_bottom', 'name' => __('GD Author Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        $geodir_sidebars[] = 'geodir_add_listing_sidebar';

+			$geodir_sidebars[] = 'geodir_author_bottom';

+		}

 

-        /*==================================*/

-        /* Add listing page sidebars end         */

-        /*==================================*/

+		/*==================================*/

+		/* Author page sidebars end         */

+		/*==================================*/

 

-    }

+		/*==================================*/

+		/* Add listing page sidebars start       */

+		/*==================================*/

+

+		register_sidebars(1, array('id' => 'geodir_add_listing_sidebar', 'name' => __('GD Add Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+

+		$geodir_sidebars[] = 'geodir_add_listing_sidebar';

+

+		/*==================================*/

+		/* Add listing page sidebars end         */

+		/*==================================*/

+

+	}

 }

 

 

 if (!function_exists('register_geodir_widgets')) {

-    /**

-     * Registers all Widgets.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function register_geodir_widgets()

-    {

-        /**

-         * Login Widget.

-         *

-         * @since 1.0.0

-         */

-        class geodir_loginwidget extends WP_Widget

-        {

-            /**

-             * Register the login widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'geodir_loginbox', 'description' => __('Geodirectory Loginbox Widget', 'geodirectory'));

-                parent::__construct(

-                    'geodir_loginbox', // Base ID

-                    __('GD > Loginbox', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-            /**

-             * Front-end display content for login widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-                geodir_loginwidget_output($args, $instance);

-            }

-

-            /**

-             * Sanitize login widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                $instance = $old_instance;

-                $instance['title'] = strip_tags($new_instance['title']);

-

-                return $instance;

-            }

-

-            /**

-             * Back-end login widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

-                $title = strip_tags($instance['title']);

-

-                ?>

+	/**

+	 * Registers all Widgets.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function register_geodir_widgets()

+	{

+		/**

+		 * Login Widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodir_loginwidget extends WP_Widget

+		{

+			/**

+			 * Register the login widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'geodir_loginbox', 'description' => __('Geodirectory Loginbox Widget', 'geodirectory'));

+				parent::__construct(

+					'geodir_loginbox', // Base ID

+					__('GD > Loginbox', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+			/**

+			 * Front-end display content for login widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+				geodir_loginwidget_output($args, $instance);

+			}

+

+			/**

+			 * Sanitize login widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				$instance = $old_instance;

+				$instance['title'] = strip_tags($new_instance['title']);

+

+				return $instance;

+			}

+

+			/**

+			 * Back-end login widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

+				$title = strip_tags($instance['title']);

+

+				?>

                 <p><label

                         for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Widget Title', 'geodirectory'); ?>

                         : <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"

@@ -313,64 +313,64 @@ 
 

 

             <?php

-            }

-        }

-

-        register_widget('geodir_loginwidget');

-

-

-        /**

-         * GeoDirectory Social Like Widget.

-         *

-         * @since 1.0.0

-         */

-        class geodir_social_like_widget extends WP_Widget

-        {

-

-            /**

-             * Register the social like widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'geodir_social_like_widget', 'description' => __('GD > Twitter,Facebook and Google+ buttons', 'geodirectory'));

-                parent::__construct(

-                    'social_like_widget', // Base ID

-                    __('GD > Social Like', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-            /**

-             * Front-end display content for social like widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-                // prints the widget

-                extract($args, EXTR_SKIP);

-

-                /**

-                 * Filter the widget title text.

-                 *

-                 * @since 1.0.0

-                 * @global object $current_user Current user object.

-                 * @param string $title The widget title text.

-                 */

-                $title = empty($instance['title']) ? '&nbsp;' : apply_filters('widget_title', $instance['title']);

-

-                global $current_user, $post;

-                echo $before_widget;

-                ?>

+			}

+		}

+

+		register_widget('geodir_loginwidget');

+

+

+		/**

+		 * GeoDirectory Social Like Widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodir_social_like_widget extends WP_Widget

+		{

+

+			/**

+			 * Register the social like widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'geodir_social_like_widget', 'description' => __('GD > Twitter,Facebook and Google+ buttons', 'geodirectory'));

+				parent::__construct(

+					'social_like_widget', // Base ID

+					__('GD > Social Like', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+			/**

+			 * Front-end display content for social like widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+				// prints the widget

+				extract($args, EXTR_SKIP);

+

+				/**

+				 * Filter the widget title text.

+				 *

+				 * @since 1.0.0

+				 * @global object $current_user Current user object.

+				 * @param string $title The widget title text.

+				 */

+				$title = empty($instance['title']) ? '&nbsp;' : apply_filters('widget_title', $instance['title']);

+

+				global $current_user, $post;

+				echo $before_widget;

+				?>

 

                 <?php //if ( get_option('gd_tweet_button') ) {

-                ?>

+				?>

 

                 <a href="http://twitter.com/share"

                    class="twitter-share-button"><?php _e('Tweet', 'geodirectory');?></a>

@@ -378,23 +378,23 @@ 
                 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>

 

                 <?php //}

-                ?>

+				?>

 

                 <?php // if ( get_option('gd_facebook_button') ) {

-                ?>

+				?>

 

                 <iframe <?php if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {

-                    echo 'allowtransparency="true"';

-                }?> class="facebook"

+					echo 'allowtransparency="true"';

+				}?> class="facebook"

                     src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode(geodir_curPageURL()); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light"

                     style="border:none; overflow:hidden; width:100px; height:20px"></iframe>

 

 

                 <?php //}

-                ?>

+				?>

 

                 <?php //if ( get_option('gd_google_button') ) {

-                ?>

+				?>

                 <script>

                     window.___gcfg = {

                         parsetags: 'explicit'

@@ -408,118 +408,118 @@ 
                         "count": "true"

                     });</script>

                 <?php //}

-                echo $after_widget;

-

-            }

-

-            /**

-             * Sanitize social like widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                $instance = $old_instance;

-                $instance['title'] = strip_tags($new_instance['title']);

-                return $instance;

-            }

-

-            /**

-             * Back-end social like widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => ''));

-                $title = strip_tags($instance['title']);

-                ?>

+				echo $after_widget;

+

+			}

+

+			/**

+			 * Sanitize social like widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				$instance = $old_instance;

+				$instance['title'] = strip_tags($new_instance['title']);

+				return $instance;

+			}

+

+			/**

+			 * Back-end social like widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => ''));

+				$title = strip_tags($instance['title']);

+				?>

                 <p>No settings for this widget</p>

 

 

             <?php

-            }

-        }

-

-        register_widget('geodir_social_like_widget');

-

-

-        /**

-         * GeoDirectory Feedburner Subscribe widget.

-         *

-         * @since 1.0.0

-         */

-        class geodirsubscribeWidget extends WP_Widget

-        {

-

-            /**

-             * Register the feedburner subscribe widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'geodir-subscribe', 'description' => __('GD > Google Feedburner Subscribe', 'geodirectory'));

-                parent::__construct(

-                    'widget_subscribeWidget', // Base ID

-                    __('GD > Subscribe', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-            /**

-             * Front-end display content for feedburner subscribe widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-                // prints the widget

-                extract($args, EXTR_SKIP);

-

-                /**

-                 * Filter the widget instance id.

-                 *

-                 * @since 1.0.0

-                 * @param string $id The widget instance id.

-                 */

-                $id = empty($instance['id']) ? '' : apply_filters('widget_id', $instance['id']);

-

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

-                $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

-

-                /**

-                 * Filter the widget text.

-                 *

-                 * @since 1.0.0

-                 * @param string $text The widget text.

-                 */

-                $text = empty($instance['text']) ? '' : apply_filters('widget_text', $instance['text']);

-

-                echo $before_widget;

-                ?>

+			}

+		}

+

+		register_widget('geodir_social_like_widget');

+

+

+		/**

+		 * GeoDirectory Feedburner Subscribe widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodirsubscribeWidget extends WP_Widget

+		{

+

+			/**

+			 * Register the feedburner subscribe widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'geodir-subscribe', 'description' => __('GD > Google Feedburner Subscribe', 'geodirectory'));

+				parent::__construct(

+					'widget_subscribeWidget', // Base ID

+					__('GD > Subscribe', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+			/**

+			 * Front-end display content for feedburner subscribe widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+				// prints the widget

+				extract($args, EXTR_SKIP);

+

+				/**

+				 * Filter the widget instance id.

+				 *

+				 * @since 1.0.0

+				 * @param string $id The widget instance id.

+				 */

+				$id = empty($instance['id']) ? '' : apply_filters('widget_id', $instance['id']);

+

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

+				$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+

+				/**

+				 * Filter the widget text.

+				 *

+				 * @since 1.0.0

+				 * @param string $text The widget text.

+				 */

+				$text = empty($instance['text']) ? '' : apply_filters('widget_text', $instance['text']);

+

+				echo $before_widget;

+				?>

 

                 <?php echo $before_title . $title; ?>  <a href="<?php if ($id) {

-                echo 'http://feeds2.feedburner.com/' . $id;

-            } else {

-                bloginfo('rss_url');

-            } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?>

+				echo 'http://feeds2.feedburner.com/' . $id;

+			} else {

+				bloginfo('rss_url');

+			} ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?>

 

                 <?php if ($text <> "") { ?>

 

@@ -544,57 +544,57 @@ 
                 </form>

 

                 <?php

-                echo $after_widget;

+				echo $after_widget;

 

-            }

+			}

 

-            /**

-             * Sanitize feedburner subscribe widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

+			/**

+			 * Sanitize feedburner subscribe widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

 

-                //save the widget

-                $instance = $old_instance;

-                $instance['id'] = strip_tags($new_instance['id']);

-                $instance['title'] = ($new_instance['title']);

-                $instance['text'] = ($new_instance['text']);

+				//save the widget

+				$instance = $old_instance;

+				$instance['id'] = strip_tags($new_instance['id']);

+				$instance['title'] = ($new_instance['title']);

+				$instance['text'] = ($new_instance['text']);

 

 

-                return $instance;

-            }

+				return $instance;

+			}

 

-            /**

-             * Back-end feedburner subscribe widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));

+			/**

+			 * Back-end feedburner subscribe widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));

 

-                $id = strip_tags($instance['id']);

+				$id = strip_tags($instance['id']);

 

-                $title = strip_tags($instance['title']);

+				$title = strip_tags($instance['title']);

 

-                $text = strip_tags($instance['text']);

+				$text = strip_tags($instance['text']);

 

 

 

-                ?>

+				?>

                 <p><label

                         for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory');?>:

                         <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"

@@ -613,101 +613,101 @@ 
                                   name="<?php echo $this->get_field_name('text'); ?>"><?php echo esc_attr($text); ?></textarea></label>

                 </p>

             <?php

-            }

-        }

-

-        register_widget('geodirsubscribeWidget');

-

-        /**

-         * GeoDirectory advertise widget.

-         *

-         * @since 1.0.0

-         */

-        class geodiradvtwidget extends WP_Widget

-        {

-

-            /**

-             * Register the advertise widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'GeoDirectory Advertise', 'description' => __('GD > common advertise widget in sidebar, bottom section', 'geodirectory'));

-                parent::__construct(

-                    'advtwidget', // Base ID

-                    __('GD > Advertise', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-

-            /**

-             * Front-end display content for advertise widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-

-                // prints the widget

-

-                extract($args, EXTR_SKIP);

-

-                /**

-                 * Filter the description text.

-                 *

-                 * @since 1.0.0

-                 * @param string $desc1 The widget description text.

-                 */

-                $desc1 = empty($instance['desc1']) ? '&nbsp;' : apply_filters('widget_desc1', $instance['desc1']);

-                echo $before_widget;

-                ?>

+			}

+		}

+

+		register_widget('geodirsubscribeWidget');

+

+		/**

+		 * GeoDirectory advertise widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodiradvtwidget extends WP_Widget

+		{

+

+			/**

+			 * Register the advertise widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'GeoDirectory Advertise', 'description' => __('GD > common advertise widget in sidebar, bottom section', 'geodirectory'));

+				parent::__construct(

+					'advtwidget', // Base ID

+					__('GD > Advertise', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+

+			/**

+			 * Front-end display content for advertise widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+

+				// prints the widget

+

+				extract($args, EXTR_SKIP);

+

+				/**

+				 * Filter the description text.

+				 *

+				 * @since 1.0.0

+				 * @param string $desc1 The widget description text.

+				 */

+				$desc1 = empty($instance['desc1']) ? '&nbsp;' : apply_filters('widget_desc1', $instance['desc1']);

+				echo $before_widget;

+				?>

                 <?php if ($desc1 <> "") { ?>

                 <?php echo $desc1; ?>

             <?php }

-                echo $after_widget;

-            }

-

-            /**

-             * Sanitize advertise widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                $instance = $old_instance;

-                $instance['desc1'] = ($new_instance['desc1']);

-                return $instance;

-            }

-

-            /**

-             * Back-end advertise widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

-

-                $desc1 = ($instance['desc1']);

-                ?>

+				echo $after_widget;

+			}

+

+			/**

+			 * Sanitize advertise widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				$instance = $old_instance;

+				$instance['desc1'] = ($new_instance['desc1']);

+				return $instance;

+			}

+

+			/**

+			 * Back-end advertise widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

+

+				$desc1 = ($instance['desc1']);

+				?>

                 <p><label

                         for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory');?>

                         <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('desc1'); ?>"

@@ -715,65 +715,65 @@ 
                 </p>

 

             <?php

-            }

-        }

-

-        register_widget('geodiradvtwidget');

-

-        /**

-         * GeoDirectory Flickr widget.

-         *

-         * @since 1.0.0

-         */

-        class GeodirFlickrWidget extends WP_Widget

-        {

-

-            /**

-             * Register the flickr widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'Geo Dir Flickr Photos ', 'description' => __('GD > Flickr Photos', 'geodirectory'));

-                parent::__construct(

-                    'widget_flickrwidget', // Base ID

-                    __('GD > Flickr Photos', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-            /**

-             * Front-end display content for flickr widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-

-                // prints the widget

-                extract($args, EXTR_SKIP);

-

-                echo $before_widget;

-

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

-                $id = empty($instance['id']) ? '&nbsp;' : apply_filters('widget_id', $instance['id']);

-

-                /**

-                 * Filter the widget number.

-                 *

-                 * This is used in the flicker widget to show how many images to show.

-                 *

-                 * @since 1.0.0

-                 * @param string $number The image count.

-                 */

-                $number = empty($instance['number']) ? '&nbsp;' : apply_filters('widget_number', $instance['number']);

-                echo $before_title . __('Photo Gallery', 'geodirectory') . $after_title;

-                ?>

+			}

+		}

+

+		register_widget('geodiradvtwidget');

+

+		/**

+		 * GeoDirectory Flickr widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class GeodirFlickrWidget extends WP_Widget

+		{

+

+			/**

+			 * Register the flickr widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'Geo Dir Flickr Photos ', 'description' => __('GD > Flickr Photos', 'geodirectory'));

+				parent::__construct(

+					'widget_flickrwidget', // Base ID

+					__('GD > Flickr Photos', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+			/**

+			 * Front-end display content for flickr widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+

+				// prints the widget

+				extract($args, EXTR_SKIP);

+

+				echo $before_widget;

+

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

+				$id = empty($instance['id']) ? '&nbsp;' : apply_filters('widget_id', $instance['id']);

+

+				/**

+				 * Filter the widget number.

+				 *

+				 * This is used in the flicker widget to show how many images to show.

+				 *

+				 * @since 1.0.0

+				 * @param string $number The image count.

+				 */

+				$number = empty($instance['number']) ? '&nbsp;' : apply_filters('widget_number', $instance['number']);

+				echo $before_title . __('Photo Gallery', 'geodirectory') . $after_title;

+				?>

 

                 <div class="geodir-flickr clearfix">

 

@@ -784,45 +784,45 @@ 
 

 

                 <?php echo $after_widget;

-            }

-

-            /**

-             * Sanitize flickr widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                $instance = $old_instance;

-                $instance['id'] = strip_tags($new_instance['id']);

-                $instance['number'] = strip_tags($new_instance['number']);

-                return $instance;

-            }

-

-            /**

-             * Back-end flickr widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));

-                $id = strip_tags($instance['id']);

-                $number = strip_tags($instance['number']);

-                ?>

+			}

+

+			/**

+			 * Sanitize flickr widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				$instance = $old_instance;

+				$instance['id'] = strip_tags($new_instance['id']);

+				$instance['number'] = strip_tags($new_instance['number']);

+				return $instance;

+			}

+

+			/**

+			 * Back-end flickr widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));

+				$id = strip_tags($instance['id']);

+				$number = strip_tags($instance['number']);

+				?>

 

                 <p>

                     <label

@@ -843,99 +843,99 @@ 
                     </label>

                 </p>

             <?php

-            }

-        }

-

-        register_widget('GeodirFlickrWidget');

-

-        /**

-         * GeoDirectory Twitter widget.

-         *

-         * @since 1.0.0

-         */

-        class geodir_twitter extends WP_Widget

-        {

-            /**

-             * Register the Twitter widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'Twitter', 'description' => __('GD > Twitter Feed', 'geodirectory'));

-                parent::__construct(

-                    'widget_Twidget', // Base ID

-                    __('GD > Twitter', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-

-            /**

-             * Front-end display content for Twitter widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-

-                // prints the widget

-

-                extract($args, EXTR_SKIP);

-

-                /**

-                 * Filter the twitter widget description text.

-                 *

-                 * @since 1.0.0

-                 * @param string $desc1 The widget description text.

-                 */

-                $desc1 = empty($instance['gd_tw_desc1']) ? '&nbsp;' : apply_filters('gd_tw_widget_desc1', $instance['gd_tw_desc1']);

-                echo $before_widget;

-                if ($desc1 <> "") {

-                    echo $desc1;

-                }

-                echo $after_widget;

-            }

-

-            /**

-             * Sanitize twitter widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                $instance = $old_instance;

-                $instance['gd_tw_desc1'] = ($new_instance['gd_tw_desc1']);

-                return $instance;

-            }

-

-            /**

-             * Back-end twitter widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));

-

-                $desc1 = ($instance['gd_tw_desc1']);

-                ?>

+			}

+		}

+

+		register_widget('GeodirFlickrWidget');

+

+		/**

+		 * GeoDirectory Twitter widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodir_twitter extends WP_Widget

+		{

+			/**

+			 * Register the Twitter widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'Twitter', 'description' => __('GD > Twitter Feed', 'geodirectory'));

+				parent::__construct(

+					'widget_Twidget', // Base ID

+					__('GD > Twitter', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+

+			/**

+			 * Front-end display content for Twitter widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+

+				// prints the widget

+

+				extract($args, EXTR_SKIP);

+

+				/**

+				 * Filter the twitter widget description text.

+				 *

+				 * @since 1.0.0

+				 * @param string $desc1 The widget description text.

+				 */

+				$desc1 = empty($instance['gd_tw_desc1']) ? '&nbsp;' : apply_filters('gd_tw_widget_desc1', $instance['gd_tw_desc1']);

+				echo $before_widget;

+				if ($desc1 <> "") {

+					echo $desc1;

+				}

+				echo $after_widget;

+			}

+

+			/**

+			 * Sanitize twitter widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				$instance = $old_instance;

+				$instance['gd_tw_desc1'] = ($new_instance['gd_tw_desc1']);

+				return $instance;

+			}

+

+			/**

+			 * Back-end twitter widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));

+

+				$desc1 = ($instance['gd_tw_desc1']);

+				?>

                 <p><label

                         for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory');?>

                         <textarea class="widefat" rows="6" cols="20"

@@ -944,179 +944,179 @@ 
                 </p>

 

             <?php

-            }

-        }

-

-        register_widget('geodir_twitter');

-

-        /**

-         * GeoDirectory Advanced Search widget.

-         *

-         * @since 1.0.0

-         */

-        class geodir_advance_search_widget extends WP_Widget

-        {

-            /**

-             * Register the advanced search widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'),'post_type'=>'');

-                parent::__construct(

-                    'geodir_advance_search', // Base ID

-                    __('GD > Search', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-

-            /**

-             * Front-end display content for advanced search widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-                /**

-                 * Filter the search widget arguments.

-                 *

-                 * @since 1.5.7

-                 * @param array $args The widget arguments.

-                 * @param array $instance The widget instance.

-                 */

-                $args = apply_filters('widget_geodir_advance_search_args',$args,$instance);

-

-                // prints the widget

-                extract($args, EXTR_SKIP);

-

-                if(isset($post_type) && $post_type){

-                    geodir_get_search_post_type($post_type);// set the post type

-                }else{

-                    geodir_get_search_post_type();// set the post type

-                }

-

-                echo $before_widget;

-

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

-                $title = empty($instance['title']) ? __('Search', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

-

-                geodir_get_template_part('listing', 'filter-form');

-

-                echo $after_widget;

-

-                // after outputing the search reset the CPT

-                global $geodir_search_post_type;

-                $geodir_search_post_type = '';

-            }

-

-            /**

-             * Sanitize advanced search widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                //Nothing to save

-                return isset($instance) ? $instance : array();

-            }

-

-            /**

-             * Back-end advanced search widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                echo __("This is a search widget to show advance search for gedodirectory listings.", 'geodirectory');

-            }

-        }

-

-        register_widget('geodir_advance_search_widget');

-

-

-        /**

-         * Contains all functions for popular widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_popular_widget.php');

-        /**

-         * Contains all functions for listing slider widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_listing_slider_widget.php');

-        /**

-         * Contains all functions for home map widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/home_map_widget.php');

-        /**

-         * Contains all functions for listing map widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/listing_map_widget.php');

-        /**

-         * Contains all functions for reviews widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_reviews_widget.php');

-        /**

-         * Contains all functions for related listing widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_related_listing_widget.php');

-        /**

-         * Contains all functions for bestof widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_bestof_widget.php');

+			}

+		}

+

+		register_widget('geodir_twitter');

+

+		/**

+		 * GeoDirectory Advanced Search widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodir_advance_search_widget extends WP_Widget

+		{

+			/**

+			 * Register the advanced search widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'),'post_type'=>'');

+				parent::__construct(

+					'geodir_advance_search', // Base ID

+					__('GD > Search', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+

+			/**

+			 * Front-end display content for advanced search widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+				/**

+				 * Filter the search widget arguments.

+				 *

+				 * @since 1.5.7

+				 * @param array $args The widget arguments.

+				 * @param array $instance The widget instance.

+				 */

+				$args = apply_filters('widget_geodir_advance_search_args',$args,$instance);

+

+				// prints the widget

+				extract($args, EXTR_SKIP);

+

+				if(isset($post_type) && $post_type){

+					geodir_get_search_post_type($post_type);// set the post type

+				}else{

+					geodir_get_search_post_type();// set the post type

+				}

+

+				echo $before_widget;

+

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

+				$title = empty($instance['title']) ? __('Search', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+

+				geodir_get_template_part('listing', 'filter-form');

+

+				echo $after_widget;

+

+				// after outputing the search reset the CPT

+				global $geodir_search_post_type;

+				$geodir_search_post_type = '';

+			}

+

+			/**

+			 * Sanitize advanced search widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				//Nothing to save

+				return isset($instance) ? $instance : array();

+			}

+

+			/**

+			 * Back-end advanced search widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				echo __("This is a search widget to show advance search for gedodirectory listings.", 'geodirectory');

+			}

+		}

+

+		register_widget('geodir_advance_search_widget');

+

+

+		/**

+		 * Contains all functions for popular widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_popular_widget.php');

+		/**

+		 * Contains all functions for listing slider widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_listing_slider_widget.php');

+		/**

+		 * Contains all functions for home map widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/home_map_widget.php');

+		/**

+		 * Contains all functions for listing map widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/listing_map_widget.php');

+		/**

+		 * Contains all functions for reviews widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_reviews_widget.php');

+		/**

+		 * Contains all functions for related listing widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_related_listing_widget.php');

+		/**

+		 * Contains all functions for bestof widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_bestof_widget.php');

+		/**

+		 * Contains all functions for cpt categories widget.

+		 *

+		 * @since 1.5.4

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_cpt_categories_widget.php');

 		/**

-         * Contains all functions for cpt categories widget.

-         *

-         * @since 1.5.4

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_cpt_categories_widget.php');

-        /**

-         * Contains all functions for features widget.

-         *

-         * @since 1.5.6

-         * @package GeoDirectory

-         * @todo make the image field recurring

-         */

-        include_once('geodirectory-widgets/geodirectory_features_widget.php');

-    }

+		 * Contains all functions for features widget.

+		 *

+		 * @since 1.5.6

+		 * @package GeoDirectory

+		 * @todo make the image field recurring

+		 */

+		include_once('geodirectory-widgets/geodirectory_features_widget.php');

+	}

 

 }