GeoDirectory / geodirectory

geodirectory_shortcodes.php

Indentation +661 added lines, -661 removed lines

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

Spacing +14 added lines, -14 removed lines

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

geodirectory-admin/option-pages/title_meta_settings_array.php

Indentation +358 added lines, -358 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 $gd_wpseo_use = '';
 if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {
-    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
+    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.', 'geodirectory')."</b><br />";
 }
 
 /**

geodirectory-admin/geodir_admin_ajax.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 *
 	 * @since 1.0.0
 	 */
-	include_once(geodir_plugin_path() . '/geodirectory-admin/option-pages/create_field.php');
+	include_once(geodir_plugin_path().'/geodirectory-admin/option-pages/create_field.php');
     die;
 }
 

Indentation +6 added lines, -6 removed lines

@@ -13,14 +13,14 @@
 	 * @since 1.0.0
 	 */
 	include_once(geodir_plugin_path() . '/geodirectory-admin/option-pages/create_field.php');
-    gd_die();
+	gd_die();
 }
 
 
 if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] != '') {
-    switch ($_REQUEST['ajax_action']):
-        case 'get_cat_dl':
-            geodir_get_categories_dl($_REQUEST['post_type'], $_REQUEST['selected'], false, true);
-            break;
-    endswitch;
+	switch ($_REQUEST['ajax_action']):
+		case 'get_cat_dl':
+			geodir_get_categories_dl($_REQUEST['post_type'], $_REQUEST['selected'], false, true);
+			break;
+	endswitch;
 }
\ No newline at end of file

geodirectory_widgets.php

Spacing +19 added lines, -19 removed lines

@@ -301,7 +301,7 @@ 
             public function form($instance)

             {

                 //widgetform in backend

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

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

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

 

                 ?>

@@ -373,7 +373,7 @@ 
                 ?>

 

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

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

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

 

                 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>

 

@@ -443,7 +443,7 @@ 
             public function form($instance)

             {

                 //widgetform in backend

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

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

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

                 ?>

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

@@ -515,11 +515,11 @@ 
                 echo $before_widget;

                 ?>

 

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

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

+                <?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;?>

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

 

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

 

@@ -584,7 +584,7 @@ 
             public function form($instance)

             {

                 //widgetform in backend

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

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

 

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

 

@@ -596,19 +596,19 @@ 
 

                 ?>

                 <p><label

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

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

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

                                name="<?php echo $this->get_field_name('title'); ?>" type="text"

                                value="<?php echo esc_attr($title); ?>"/></label></p>

 

                 <p><label

-                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory'); ?>

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

                                  name="<?php echo $this->get_field_name('id'); ?>" type="text"

                                  value="<?php echo esc_attr($id); ?>"/></label></p>

 

                 <p><label

-                        for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory'); ?>

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

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

                 </p>

@@ -704,12 +704,12 @@ 
             public function form($instance)

             {

                 //widgetform in backend

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

+                $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');?>

+                        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'); ?>"

                                   name="<?php echo $this->get_field_name('desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>

                 </p>

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

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

                 ?>

 

                 <div class="geodir-flickr clearfix">

@@ -819,14 +819,14 @@ 
             {

 

                 //widgetform in backend

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

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

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

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

                 ?>

 

                 <p>

                     <label

-                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory'); ?>

                         (<a href="http://www.idgettr.com">idGettr</a>):

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

                                name="<?php echo $this->get_field_name('id'); ?>" type="text"

@@ -836,7 +836,7 @@ 
 

                 <p>

                     <label

-                        for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of photos:', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of photos:', 'geodirectory'); ?>

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

                                name="<?php echo $this->get_field_name('number'); ?>" type="text"

                                value="<?php echo esc_attr($number); ?>"/>

@@ -932,12 +932,12 @@ 
             public function form($instance)

             {

                 //widgetform in backend

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

+                $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');?>

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

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

                                   id="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"

                                   name="<?php echo $this->get_field_name('gd_tw_desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>

@@ -990,7 +990,7 @@ 
                  * @param array $args The widget arguments.

                  * @param array $instance The widget instance.

                  */

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

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

 

                 // prints the widget

                 extract($args, EXTR_SKIP);

Indentation +888 added lines, -888 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,169 +944,169 @@ 
                 </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'));

-                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);

-

-                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;

-            }

-

-            /**

-             * 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'));

+				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);

+

+				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;

+			}

+

+			/**

+			 * 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');

+	}

 

 }

 

geodirectory-widgets/geodirectory_features_widget.php

Spacing +29 added lines, -29 removed lines

@@ -33,7 +33,7 @@ 
         ?>
         <?php if ($title) {
         echo '<div class="geodir_list_heading clearfix">';
-        echo $before_title . $title . $after_title;
+        echo $before_title.$title.$after_title;
         echo '</div>';
     } ?>
         <?php
@@ -42,16 +42,16 @@ 
         $i = 1;
         while ($i < 100) {
 
-            if (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) {
+            if (isset($instance['title'.$i]) || isset($instance['image'.$i]) || isset($instance['desc'.$i])) {
                 echo "<li>";
-                if ($instance['title' . $i]) {
-                    echo "<h3 class='gd-fe-title'>" . $instance['title' . $i] . "</h3>";
+                if ($instance['title'.$i]) {
+                    echo "<h3 class='gd-fe-title'>".$instance['title'.$i]."</h3>";
                 }
-                if ($instance['image' . $i]) {
-                    echo "<div class='gd-fe-image'>" . gd_features_parse_image($instance['image' . $i], $icon_color) . "</div>";
+                if ($instance['image'.$i]) {
+                    echo "<div class='gd-fe-image'>".gd_features_parse_image($instance['image'.$i], $icon_color)."</div>";
                 }
-                if ($instance['desc' . $i]) {
-                    echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($instance['desc' . $i]) . "</div>";
+                if ($instance['desc'.$i]) {
+                    echo "<div class='gd-fe-desc'>".gd_features_parse_desc($instance['desc'.$i])."</div>";
                 }
                 echo "</li>";
             } else {
@@ -78,15 +78,15 @@ 
         $i = 1;
         while ($i < 100) {
 
-            if (isset($new_instance['title' . $i]) || isset($new_instance['image' . $i]) || isset($new_instance['desc' . $i])) {
-                if ($new_instance['title' . $i]) {
-                    $instance['title' . $i] = $new_instance['title' . $i];
+            if (isset($new_instance['title'.$i]) || isset($new_instance['image'.$i]) || isset($new_instance['desc'.$i])) {
+                if ($new_instance['title'.$i]) {
+                    $instance['title'.$i] = $new_instance['title'.$i];
                 }
-                if ($new_instance['image' . $i]) {
-                    $instance['image' . $i] = $new_instance['image' . $i];
+                if ($new_instance['image'.$i]) {
+                    $instance['image'.$i] = $new_instance['image'.$i];
                 }
-                if ($new_instance['desc' . $i]) {
-                    $instance['desc' . $i] = $new_instance['desc' . $i];
+                if ($new_instance['desc'.$i]) {
+                    $instance['desc'.$i] = $new_instance['desc'.$i];
                 }
             } else {
                 break;
@@ -101,7 +101,7 @@ 
     public function form($instance)
     {
         //widgetform in backend
-        $instance = wp_parse_args((array)$instance, array(
+        $instance = wp_parse_args((array) $instance, array(
             'title' => '',
             'icon_color' => '#757575',
             'title1' => '',
@@ -138,35 +138,35 @@ 
         </p>
 
 
-        <div class="gd-fet-rep-<?php echo $this->get_field_id('xxx');?>">
+        <div class="gd-fet-rep-<?php echo $this->get_field_id('xxx'); ?>">
             <?php
 
             $i = 1;
             while ($i < 100) {
 
-                if ( $i==1 || (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) && ($instance['title' . $i] || $instance['image' . $i] || $instance['desc' . $i])) {
+                if ($i == 1 || (isset($instance['title'.$i]) || isset($instance['image'.$i]) || isset($instance['desc'.$i])) && ($instance['title'.$i] || $instance['image'.$i] || $instance['desc'.$i])) {
                     ?>
-                    <div class="gdrep<?php echo $i;?>">
+                    <div class="gdrep<?php echo $i; ?>">
                         <p class="features-title">
                             <label
                                 data-gdrep-title-num="1"><?php printf(__('Title %d:', 'geodirectory'), $i); ?></label>
-                            <input data-gdrep-title="1" name="<?php echo $this->get_field_name('title' . $i); ?>"
-                                   type="text" value="<?php echo esc_attr(strip_tags($instance['title' . $i])); ?>"
+                            <input data-gdrep-title="1" name="<?php echo $this->get_field_name('title'.$i); ?>"
+                                   type="text" value="<?php echo esc_attr(strip_tags($instance['title'.$i])); ?>"
                                    class="widefat"/>
                         </p>
 
                         <p class="features-image">
                             <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
                             <input data-gdrep-image="1" type="text" class="widefat"
-                                   name="<?php echo $this->get_field_name('image' . $i); ?>"
-                                   value="<?php echo esc_attr(strip_tags($instance['image' . $i])); ?>"/>
+                                   name="<?php echo $this->get_field_name('image'.$i); ?>"
+                                   value="<?php echo esc_attr(strip_tags($instance['image'.$i])); ?>"/>
                         </p>
 
                         <p class="features-desc">
                             <label><?php echo __('Description:', 'geodirectory'); ?></label>
-                            <textarea data-gdrep-desc="1" name="<?php echo $this->get_field_name('desc' . $i); ?>"
+                            <textarea data-gdrep-desc="1" name="<?php echo $this->get_field_name('desc'.$i); ?>"
                                       rows="3"
-                                      class="widefat"><?php echo esc_attr(strip_tags($instance['desc' . $i])); ?></textarea>
+                                      class="widefat"><?php echo esc_attr(strip_tags($instance['desc'.$i])); ?></textarea>
                         </p>
                     </div>
                 <?php
@@ -179,8 +179,8 @@ 
 
             ?>
             <input class="button button-primary left"
-                   onclick="gd_featured_widget_repeat('gd-fet-rep-<?php echo $this->get_field_id('xxx');?>','<?php echo $this->get_field_name('xxx');?>')"
-                   type="button" value="<?php _e('Add item', 'geodirectory');?>"/>
+                   onclick="gd_featured_widget_repeat('gd-fet-rep-<?php echo $this->get_field_id('xxx'); ?>','<?php echo $this->get_field_name('xxx'); ?>')"
+                   type="button" value="<?php _e('Add item', 'geodirectory'); ?>"/>
         </div>
 
 
@@ -193,12 +193,12 @@ 
 function gd_features_parse_image($image, $icon_color)
 {
     if (substr($image, 0, 4) === "http") {
-        $image = '<img src="' . $image . '" />';
+        $image = '<img src="'.$image.'" />';
     } elseif (substr($image, 0, 3) === "fa-") {
         if (empty($icon_color)) {
             $icon_color = '#757575';
         }
-        $image = '<i style="color:' . $icon_color . '" class="fa ' . $image . '"></i>';
+        $image = '<i style="color:'.$icon_color.'" class="fa '.$image.'"></i>';
     }
     return $image;
 }

Indentation +128 added lines, -128 removed lines

@@ -3,117 +3,117 @@ 
 class Geodir_Features_Widget extends WP_Widget
 {
 
-    /**
-     * Class constructor.
-     */
-    public function __construct()
-    {
-        $widget_ops = array(
-            'description' => __('Displays "GD Features" widget', 'geodirectory'),
-            'classname' => 'widget_gd_features',
-        );
-        parent::__construct(false, $name = _x('GD > Features', 'widget name', 'geodirectory'), $widget_ops);
-
-    }
-
-    /**
-     * Display the widget.
-     *
-     * @param array $args Widget arguments.
-     * @param array $instance The widget settings, as saved by the user.
-     */
-    public function widget($args, $instance)
-    {
-        extract($args);
-
-        $title = empty($instance['title']) ? '' : apply_filters('gd_features_widget_title', __($instance['title'], 'geodirectory'));
-        $icon_color = empty($instance['icon_color']) ? '#757575' : apply_filters('gd_features_widget_icon_color', __($instance['icon_color'], 'geodirectory'));
-
-        echo $before_widget;
-        ?>
+	/**
+	 * Class constructor.
+	 */
+	public function __construct()
+	{
+		$widget_ops = array(
+			'description' => __('Displays "GD Features" widget', 'geodirectory'),
+			'classname' => 'widget_gd_features',
+		);
+		parent::__construct(false, $name = _x('GD > Features', 'widget name', 'geodirectory'), $widget_ops);
+
+	}
+
+	/**
+	 * Display the widget.
+	 *
+	 * @param array $args Widget arguments.
+	 * @param array $instance The widget settings, as saved by the user.
+	 */
+	public function widget($args, $instance)
+	{
+		extract($args);
+
+		$title = empty($instance['title']) ? '' : apply_filters('gd_features_widget_title', __($instance['title'], 'geodirectory'));
+		$icon_color = empty($instance['icon_color']) ? '#757575' : apply_filters('gd_features_widget_icon_color', __($instance['icon_color'], 'geodirectory'));
+
+		echo $before_widget;
+		?>
         <?php if ($title) {
-        echo '<div class="geodir_list_heading clearfix">';
-        echo $before_title . $title . $after_title;
-        echo '</div>';
-    } ?>
+		echo '<div class="geodir_list_heading clearfix">';
+		echo $before_title . $title . $after_title;
+		echo '</div>';
+	} ?>
         <?php
-        echo "<ul class='gd-features'>";
-
-        $i = 1;
-        while ($i < 100) {
-
-            if (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) {
-                echo "<li>";
-                if ($instance['title' . $i]) {
-                    echo "<h3 class='gd-fe-title'>" . $instance['title' . $i] . "</h3>";
-                }
-                if ($instance['image' . $i]) {
-                    echo "<div class='gd-fe-image'>" . gd_features_parse_image($instance['image' . $i], $icon_color) . "</div>";
-                }
-                if ($instance['desc' . $i]) {
-                    echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($instance['desc' . $i]) . "</div>";
-                }
-                echo "</li>";
-            } else {
-                break;
-            }
-
-            $i++;
-        }
-
-        echo "</ul>";
-        ?>
+		echo "<ul class='gd-features'>";
+
+		$i = 1;
+		while ($i < 100) {
+
+			if (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) {
+				echo "<li>";
+				if ($instance['title' . $i]) {
+					echo "<h3 class='gd-fe-title'>" . $instance['title' . $i] . "</h3>";
+				}
+				if ($instance['image' . $i]) {
+					echo "<div class='gd-fe-image'>" . gd_features_parse_image($instance['image' . $i], $icon_color) . "</div>";
+				}
+				if ($instance['desc' . $i]) {
+					echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($instance['desc' . $i]) . "</div>";
+				}
+				echo "</li>";
+			} else {
+				break;
+			}
+
+			$i++;
+		}
+
+		echo "</ul>";
+		?>
         <?php echo $after_widget; ?>
     <?php
-    }
-
-    public function update($new_instance, $old_instance)
-    {
-        //save the widget
-        $instance = $old_instance;
-
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['icon_color'] = strip_tags($new_instance['icon_color']);
-
-        $i = 1;
-        while ($i < 100) {
-
-            if (isset($new_instance['title' . $i]) || isset($new_instance['image' . $i]) || isset($new_instance['desc' . $i])) {
-                if ($new_instance['title' . $i]) {
-                    $instance['title' . $i] = $new_instance['title' . $i];
-                }
-                if ($new_instance['image' . $i]) {
-                    $instance['image' . $i] = $new_instance['image' . $i];
-                }
-                if ($new_instance['desc' . $i]) {
-                    $instance['desc' . $i] = $new_instance['desc' . $i];
-                }
-            } else {
-                break;
-            }
-
-            $i++;
-        }
-
-        return $instance;
-    }
-
-    public function form($instance)
-    {
-        //widgetform in backend
-        $instance = wp_parse_args((array)$instance, array(
-            'title' => '',
-            'icon_color' => '#757575',
-            'title1' => '',
-            'image1' => '',
-            'desc1' => '',
-        ));
-
-
-        $title = strip_tags($instance['title']);
-        $icon_color = strip_tags($instance['icon_color']);
-
-        ?>
+	}
+
+	public function update($new_instance, $old_instance)
+	{
+		//save the widget
+		$instance = $old_instance;
+
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['icon_color'] = strip_tags($new_instance['icon_color']);
+
+		$i = 1;
+		while ($i < 100) {
+
+			if (isset($new_instance['title' . $i]) || isset($new_instance['image' . $i]) || isset($new_instance['desc' . $i])) {
+				if ($new_instance['title' . $i]) {
+					$instance['title' . $i] = $new_instance['title' . $i];
+				}
+				if ($new_instance['image' . $i]) {
+					$instance['image' . $i] = $new_instance['image' . $i];
+				}
+				if ($new_instance['desc' . $i]) {
+					$instance['desc' . $i] = $new_instance['desc' . $i];
+				}
+			} else {
+				break;
+			}
+
+			$i++;
+		}
+
+		return $instance;
+	}
+
+	public function form($instance)
+	{
+		//widgetform in backend
+		$instance = wp_parse_args((array)$instance, array(
+			'title' => '',
+			'icon_color' => '#757575',
+			'title1' => '',
+			'image1' => '',
+			'desc1' => '',
+		));
+
+
+		$title = strip_tags($instance['title']);
+		$icon_color = strip_tags($instance['icon_color']);
+
+		?>
         <p>
             <b>Heads Up!</b> If you don't have enough content, You can keep some boxes blank.
         </p>
@@ -141,11 +141,11 @@ 
         <div class="gd-fet-rep-<?php echo $this->get_field_id('xxx');?>">
             <?php
 
-            $i = 1;
-            while ($i < 100) {
+			$i = 1;
+			while ($i < 100) {
 
-                if ( $i==1 || (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) && ($instance['title' . $i] || $instance['image' . $i] || $instance['desc' . $i])) {
-                    ?>
+				if ( $i==1 || (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) && ($instance['title' . $i] || $instance['image' . $i] || $instance['desc' . $i])) {
+					?>
                     <div class="gdrep<?php echo $i;?>">
                         <p class="features-title">
                             <label
@@ -170,14 +170,14 @@ 
                         </p>
                     </div>
                 <?php
-                } else {
-                    break;
-                }
+				} else {
+					break;
+				}
 
-                $i++;
-            }
+				$i++;
+			}
 
-            ?>
+			?>
             <input class="button button-primary left"
                    onclick="gd_featured_widget_repeat('gd-fet-rep-<?php echo $this->get_field_id('xxx');?>','<?php echo $this->get_field_name('xxx');?>')"
                    type="button" value="<?php _e('Add item', 'geodirectory');?>"/>
@@ -185,25 +185,25 @@ 
 
 
     <?php
-    }
+	}
 
 }
 
 register_widget("Geodir_Features_Widget");
 function gd_features_parse_image($image, $icon_color)
 {
-    if (substr($image, 0, 4) === "http") {
-        $image = '<img src="' . $image . '" />';
-    } elseif (substr($image, 0, 3) === "fa-") {
-        if (empty($icon_color)) {
-            $icon_color = '#757575';
-        }
-        $image = '<i style="color:' . $icon_color . '" class="fa ' . $image . '"></i>';
-    }
-    return $image;
+	if (substr($image, 0, 4) === "http") {
+		$image = '<img src="' . $image . '" />';
+	} elseif (substr($image, 0, 3) === "fa-") {
+		if (empty($icon_color)) {
+			$icon_color = '#757575';
+		}
+		$image = '<i style="color:' . $icon_color . '" class="fa ' . $image . '"></i>';
+	}
+	return $image;
 }
 
 function gd_features_parse_desc($desc)
 {
-    return $desc;
+	return $desc;
 }

tests/lib/wordpress-tests-lib/includes/mock-mailer.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once( ABSPATH . '/wp-includes/class-phpmailer.php' );
+require_once(ABSPATH.'/wp-includes/class-phpmailer.php');
 
 class MockPHPMailer extends PHPMailer {
 	var $mock_sent = array();

tests/lib/wordpress-tests-lib/includes/testcase-xmlrpc.php

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
+include_once(ABSPATH.'wp-admin/includes/admin.php');
+include_once(ABSPATH.WPINC.'/class-IXR.php');
+include_once(ABSPATH.WPINC.'/class-wp-xmlrpc-server.php');
 
 class WP_XMLRPC_UnitTestCase extends WP_UnitTestCase {
 	protected $myxmlrpcserver;
@@ -9,21 +9,21 @@ 
 	function setUp() {
 		parent::setUp();
 
-		add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
+		add_filter('pre_option_enable_xmlrpc', '__return_true');
 
 		$this->myxmlrpcserver = new wp_xmlrpc_server();
 	}
 
 	function tearDown() {
-		remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
+		remove_filter('pre_option_enable_xmlrpc', '__return_true');
 
 		$this->remove_added_uploads();
 
 		parent::tearDown();
 	}
 
-	protected function make_user_by_role( $role ) {
-		return self::factory()->user->create( array(
+	protected function make_user_by_role($role) {
+		return self::factory()->user->create(array(
 			'user_login' => $role,
 			'user_pass'  => $role,
 			'role'       => $role

tests/lib/wordpress-tests-lib/includes/trac.php

Spacing +22 added lines, -22 removed lines

@@ -13,46 +13,46 @@
 	 *
 	 * @return bool|null true if the ticket is resolved, false if not resolved, null on error
 	 */
-	public static function isTracTicketClosed( $trac_url, $ticket_id ) {
-		if ( ! extension_loaded( 'openssl' ) ) {
-			$trac_url = preg_replace( "/^https:/", "http:", $trac_url );
+	public static function isTracTicketClosed($trac_url, $ticket_id) {
+		if (!extension_loaded('openssl')) {
+			$trac_url = preg_replace("/^https:/", "http:", $trac_url);
 		}
 
-		if ( ! isset( self::$trac_ticket_cache[ $trac_url ] ) ) {
+		if (!isset(self::$trac_ticket_cache[$trac_url])) {
 			// In case you're running the tests offline, keep track of open tickets.
-			$file = DIR_TESTDATA . '/.trac-ticket-cache.' . str_replace( array( 'http://', 'https://', '/' ), array( '', '', '-' ), rtrim( $trac_url, '/' ) );
-			$tickets = @file_get_contents( $trac_url . '/query?status=%21closed&format=csv&col=id' );
+			$file = DIR_TESTDATA.'/.trac-ticket-cache.'.str_replace(array('http://', 'https://', '/'), array('', '', '-'), rtrim($trac_url, '/'));
+			$tickets = @file_get_contents($trac_url.'/query?status=%21closed&format=csv&col=id');
 			// Check if our HTTP request failed.
-			if ( false === $tickets ) {
-				if ( file_exists( $file ) ) {
-					register_shutdown_function( array( 'TracTickets', 'usingLocalCache' ) );
-					$tickets = file_get_contents( $file );
+			if (false === $tickets) {
+				if (file_exists($file)) {
+					register_shutdown_function(array('TracTickets', 'usingLocalCache'));
+					$tickets = file_get_contents($file);
 				} else {
-					register_shutdown_function( array( 'TracTickets', 'forcingKnownBugs' ) );
-					self::$trac_ticket_cache[ $trac_url ] = array();
+					register_shutdown_function(array('TracTickets', 'forcingKnownBugs'));
+					self::$trac_ticket_cache[$trac_url] = array();
 					return true; // Assume the ticket is closed, which means it gets run.
 				}
 			} else {
-				$tickets = substr( $tickets, 2 ); // remove 'id' column header
-				$tickets = trim( $tickets );
-				file_put_contents( $file, $tickets );
+				$tickets = substr($tickets, 2); // remove 'id' column header
+				$tickets = trim($tickets);
+				file_put_contents($file, $tickets);
 			}
-			$tickets = explode( "\r\n", $tickets );
-			self::$trac_ticket_cache[ $trac_url ] = $tickets;
+			$tickets = explode("\r\n", $tickets);
+			self::$trac_ticket_cache[$trac_url] = $tickets;
 		}
 
-		return ! in_array( $ticket_id, self::$trac_ticket_cache[ $trac_url ] );
+		return !in_array($ticket_id, self::$trac_ticket_cache[$trac_url]);
 	}
 
 	public static function usingLocalCache() {
-		echo PHP_EOL . "\x1b[0m\x1b[30;43m\x1b[2K";
-		echo 'INFO: Trac was inaccessible, so a local ticket status cache was used.' . PHP_EOL;
+		echo PHP_EOL."\x1b[0m\x1b[30;43m\x1b[2K";
+		echo 'INFO: Trac was inaccessible, so a local ticket status cache was used.'.PHP_EOL;
 		echo "\x1b[0m\x1b[2K";
 	}
 
 	public static function forcingKnownBugs() {
-		echo PHP_EOL . "\x1b[0m\x1b[37;41m\x1b[2K";
-		echo "ERROR: Trac was inaccessible, so known bugs weren't able to be skipped." . PHP_EOL;
+		echo PHP_EOL."\x1b[0m\x1b[37;41m\x1b[2K";
+		echo "ERROR: Trac was inaccessible, so known bugs weren't able to be skipped.".PHP_EOL;
 		echo "\x1b[0m\x1b[2K";
 	}
 }

tests/test-GeoDirectory.php

Doc Comments +6 added lines

@@ -956,6 +956,9 @@ 
         flush_rewrite_rules( true );
     }
 
+    /**
+     * @param string $widget
+     */
     function the_widget_form( $widget, $instance = array() ) {
         global $wp_widget_factory;
 
@@ -968,6 +971,9 @@ 
         $widget_obj->form($instance);
     }
 
+    /**
+     * @param string $widget
+     */
     function the_widget_form_update( $widget, $new_instance = array(), $old_instance = array() ) {
         global $wp_widget_factory;
 

Braces +6 added lines, -3 removed lines

@@ -167,8 +167,9 @@ 
         $geodir_is_widget_listing = false;
 
         $GLOBALS['post'] = $current_post;
-        if (!empty($current_post))
-            setup_postdata($current_post);
+        if (!empty($current_post)) {
+                    setup_postdata($current_post);
+        }
         $map_jason = $current_map_jason;
         $map_canvas_arr = $current_map_canvas_arr;
 
@@ -916,8 +917,10 @@ 
         elseif ( is_date()		   && $template = get_date_template()		   ) :
         elseif ( is_archive()		&& $template = get_archive_template()		) :
         elseif ( is_paged()		  && $template = get_paged_template()		  ) :
-        else :
+        else {
+        	:
             $template = get_index_template();
+        }
         endif;
         /**
          * Filter the path of the current template before including it.

Indentation +1142 added lines, -1142 removed lines

@@ -1,1164 +1,1164 @@
 <?php
 class GeoDirectoryTests extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-
-        geodir_register_sidebar();
-    }
-
-    public function testBreadcrumbs() {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $this->go_to( get_permalink($post_id) );
-
-        ob_start();
-        geodir_breadcrumb();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Places', $output);
-    }
-
-    public function testAdminSettingForms() {
-        $_REQUEST['listing_type'] = 'gd_place';
-        ob_start();
-        geodir_admin_option_form('general_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('General Options', $output);
-
-        ob_start();
-        geodir_admin_option_form('design_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Home Top Section Settings', $output);
-
-        ob_start();
-        geodir_admin_option_form('permalink_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Listing Detail Permalink Settings', $output);
-
-        ob_start();
-        geodir_admin_option_form('title_meta_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Homepage Meta Settings', $output);
-
-        ob_start();
-        geodir_admin_option_form('notifications_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Notification Options', $output);
-
-        ob_start();
-        geodir_admin_option_form('default_location_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Set Default Location', $output);
-
-        ob_start();
-        geodir_admin_option_form('tools_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('GD Diagnostic Tools', $output);
-
-        ob_start();
-        geodir_admin_option_form('compatibility_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Theme Compatability Settings', $output);
-
-        ob_start();
-        geodir_admin_option_form('import_export');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('GD Import & Export CSV', $output);
-
-        $_REQUEST['subtab'] = 'custom_fields';
-        ob_start();
-        geodir_admin_option_form('gd_place_fields_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('general-form-builder-frame', $output);
-
-    }
-
-    public function testPopPostWidget() {
-        $args = array(
-            'before_widget' => '<ul>',
-            'after_widget' => '<ul>',
-            'before_title' => '<ul>',
-            'after_title' => '<ul>'
-        );
-        ob_start();
-        geodir_popular_post_category_output($args);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Popular Categories', $output);
-    }
-
-    public function texstBestOfWidget() {
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+
+		geodir_register_sidebar();
+	}
+
+	public function testBreadcrumbs() {
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$this->go_to( get_permalink($post_id) );
+
+		ob_start();
+		geodir_breadcrumb();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Places', $output);
+	}
+
+	public function testAdminSettingForms() {
+		$_REQUEST['listing_type'] = 'gd_place';
+		ob_start();
+		geodir_admin_option_form('general_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('General Options', $output);
+
+		ob_start();
+		geodir_admin_option_form('design_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Home Top Section Settings', $output);
+
+		ob_start();
+		geodir_admin_option_form('permalink_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Listing Detail Permalink Settings', $output);
+
+		ob_start();
+		geodir_admin_option_form('title_meta_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Homepage Meta Settings', $output);
+
+		ob_start();
+		geodir_admin_option_form('notifications_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Notification Options', $output);
+
+		ob_start();
+		geodir_admin_option_form('default_location_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Set Default Location', $output);
+
+		ob_start();
+		geodir_admin_option_form('tools_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('GD Diagnostic Tools', $output);
+
+		ob_start();
+		geodir_admin_option_form('compatibility_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Theme Compatability Settings', $output);
+
+		ob_start();
+		geodir_admin_option_form('import_export');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('GD Import & Export CSV', $output);
+
+		$_REQUEST['subtab'] = 'custom_fields';
+		ob_start();
+		geodir_admin_option_form('gd_place_fields_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('general-form-builder-frame', $output);
+
+	}
+
+	public function testPopPostWidget() {
+		$args = array(
+			'before_widget' => '<ul>',
+			'after_widget' => '<ul>',
+			'before_title' => '<ul>',
+			'after_title' => '<ul>'
+		);
+		ob_start();
+		geodir_popular_post_category_output($args);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Popular Categories', $output);
+	}
+
+	public function texstBestOfWidget() {
 //        $args = array(
 //            'before_widget' => '<ul>',
 //            'after_widget' => '<ul>',
 //            'before_title' => '<ul>',
 //            'after_title' => '<ul>'
 //        );
-        include_once geodir_plugin_path() . "/geodirectory-widgets/geodirectory_cpt_categories_widget.php";
-        $params = array(
-            'title' => '',
-            'post_type' => array(), // NULL for all
-            'hide_empty' => '',
-            'show_count' => '',
-            'hide_icon' => '',
-            'cpt_left' => '',
-            'sort_by' => 'count',
-            'max_count' => 'all',
-            'max_level' => '1'
-        );
-        ob_start();
-        geodir_cpt_categories_output($params);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('gd-cptcat-title', $output);
-    }
-
-    public function testGDWidgetListView() {
-        global $gridview_columns_widget, $geodir_is_widget_listing;
-
-        $_REQUEST['sgeo_lat'] = '40.7127837';
-        $_REQUEST['sgeo_lon'] = '-74.00594130000002';
-        $query_args = array(
-            'posts_per_page' => 1,
-            'is_geodir_loop' => true,
-            'gd_location' => false,
-            'post_type' => 'gd_place',
-        );
-        $widget_listings = geodir_get_widget_listings($query_args);
-        $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
-        global $post, $map_jason, $map_canvas_arr;
-
-        $current_post = $post;
-        $current_map_jason = $map_jason;
-        $current_map_canvas_arr = $map_canvas_arr;
-        $geodir_is_widget_listing = true;
-
-        ob_start();
-        include($template);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-entry-content', $output);
-
-        $geodir_is_widget_listing = false;
-
-        $GLOBALS['post'] = $current_post;
-        if (!empty($current_post))
-            setup_postdata($current_post);
-        $map_jason = $current_map_jason;
-        $map_canvas_arr = $current_map_canvas_arr;
-
-    }
-
-    public function testRegTemplate() {
+		include_once geodir_plugin_path() . "/geodirectory-widgets/geodirectory_cpt_categories_widget.php";
+		$params = array(
+			'title' => '',
+			'post_type' => array(), // NULL for all
+			'hide_empty' => '',
+			'show_count' => '',
+			'hide_icon' => '',
+			'cpt_left' => '',
+			'sort_by' => 'count',
+			'max_count' => 'all',
+			'max_level' => '1'
+		);
+		ob_start();
+		geodir_cpt_categories_output($params);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('gd-cptcat-title', $output);
+	}
+
+	public function testGDWidgetListView() {
+		global $gridview_columns_widget, $geodir_is_widget_listing;
+
+		$_REQUEST['sgeo_lat'] = '40.7127837';
+		$_REQUEST['sgeo_lon'] = '-74.00594130000002';
+		$query_args = array(
+			'posts_per_page' => 1,
+			'is_geodir_loop' => true,
+			'gd_location' => false,
+			'post_type' => 'gd_place',
+		);
+		$widget_listings = geodir_get_widget_listings($query_args);
+		$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
+		global $post, $map_jason, $map_canvas_arr;
+
+		$current_post = $post;
+		$current_map_jason = $map_jason;
+		$current_map_canvas_arr = $map_canvas_arr;
+		$geodir_is_widget_listing = true;
+
+		ob_start();
+		include($template);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-entry-content', $output);
+
+		$geodir_is_widget_listing = false;
+
+		$GLOBALS['post'] = $current_post;
+		if (!empty($current_post))
+			setup_postdata($current_post);
+		$map_jason = $current_map_jason;
+		$map_canvas_arr = $current_map_canvas_arr;
+
+	}
+
+	public function testRegTemplate() {
 //        var_dump(geodir_login_page_id());
-        wp_set_current_user(0);
-        $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
-
-        ob_start();
-        include($template);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Sign In', $output);
-    }
-
-    public function testInfoTemplate() {
-        wp_set_current_user(1);
-        global $information;
-        $information = "hello world";
-
-        $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
-
-        ob_start();
-        include($template);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('hello world', $output);
-    }
-
-    public function testSuccessPage() {
-        wp_set_current_user(1);
-
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $_REQUEST['listing_type'] = 'gd_place';
-        $_REQUEST['pid'] = $post_id;
-        ob_start();
-        $this->go_to( get_permalink(geodir_success_page_id()) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('View your submitted information', $output);
-    }
-
-    public function testPreviewPage() {
-        wp_set_current_user(1);
-
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $_REQUEST = array(
-            'pid' => $post_id,
-            'listing_type' => 'gd_place',
-            'post_title' => 'Test Listing Title Modified',
-            'post_desc' => 'Test Desc',
-            'post_tags' => 'test1,test2',
-            'post_address' => 'New York City Hall',
-            'post_zip' => '10007',
-            'post_latitude' => '40.7127837',
-            'post_longitude' => '-74.00594130000002',
-            'post_mapview' => 'ROADMAP',
-            'post_mapzoom' => '10',
-            'geodir_timing' => '10.00 am to 6 pm every day',
-            'geodir_contact' => '1234567890',
-            'geodir_email' => 'test@test.com',
-            'geodir_website' => 'http://test.com',
-            'geodir_twitter' => 'http://twitter.com/test',
-            'geodir_facebook' => 'http://facebook.com/test',
-            'geodir_special_offers' => 'Test offer',
-            'preview' => true,
-            'post_category' => array(
-                'gd_placecategory' => ''
-            )
-        );
-
-        ob_start();
-        $this->go_to( get_permalink(geodir_preview_page_id()) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('This is a preview of your listing', $output);
-    }
-
-    public function testAddListingPage() {
-        wp_set_current_user(1);
-
-        ob_start();
-        $this->go_to( get_permalink(geodir_add_listing_page_id()) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Enter Listing Details', $output);
-    }
-
-    public function testLocationPage() {
-        wp_set_current_user(1);
-
-        ob_start();
-        $this->go_to( get_permalink(geodir_location_page_id()) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Location', $output);
-    }
-
-    public function testTemplates() {
-
-        global $current_user;
-
-        $user_id = $current_user->ID;
-
-        $this->setPermalinkStructure();
-
-        $homepage = get_page_by_title( 'GD Home page' );
-        if ( $homepage )
-        {
-            update_option( 'page_on_front', $homepage->ID );
-            update_option( 'show_on_front', 'page' );
-        }
-
-        ob_start();
-        $this->go_to( home_url('/') );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('body class="home', $output);
-
-
-        ob_start();
-        $this->go_to( home_url('/?post_type=gd_place') );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('All Places', $output);
-
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        global $preview;
-        $preview = false;
-        ob_start();
-        $this->go_to( get_permalink($post_id) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('post_profileTab', $output);
-
-        ob_start();
-        $_REQUEST['stype'] = 'gd_place';
-        $_REQUEST['geodir_dashbord'] = true;
-        $this->go_to( get_author_posts_url($user_id) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('gd_list_view', $output);
-
-    }
-
-    public function testSearchPage() {
-        ob_start();
-        $_REQUEST['geodir_search'] = "1";
-        $_REQUEST['stype'] = 'gd_place';
-        $this->go_to( home_url('/?geodir_search=1&stype=gd_place&s=test&snear=&sgeo_lat=&sgeo_lon=') );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Search Results for', $output);
-
-    }
-
-    public function testPopupSendEnquiryTemplate() {
-
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $_REQUEST['popuptype'] = 'b_send_inquiry';
-        $_REQUEST['post_id'] = $post_id;
-        add_filter('wp_redirect', '__return_false');
-        ob_start();
-        geodir_ajax_handler();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('send_inqury', $output);
-        remove_filter('wp_redirect', '__return_false');
-
-    }
-
-    public function texstPopupSendToFrndTemplate() {
-
-        //include template problem. its already loaded. find a way to fix this
-
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $_REQUEST['popuptype'] = 'b_sendtofriend';
-        $_REQUEST['post_id'] = $post_id;
-        add_filter('wp_redirect', '__return_false');
-        ob_start();
-        geodir_ajax_handler();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('send_inqury', $output);
-        remove_filter('wp_redirect', '__return_false');
-    }
-
-    public function testNavMenus() {
-        $menuname = 'Primary Menu';
-        $menulocation = 'primary';
-        // Does the menu exist already?
-        $menu_exists = wp_get_nav_menu_object( $menuname );
-
-        // If it doesn't exist, let's create it.
-        if( !$menu_exists){
-            $menu_id = wp_create_nav_menu($menuname);
-
-            // Set up default BuddyPress links and add them to the menu.
-            wp_update_nav_menu_item($menu_id, 0, array(
-                'menu-item-title' =>  __('Home'),
-                'menu-item-classes' => 'home',
-                'menu-item-url' => home_url( '/' ),
-                'menu-item-status' => 'publish'));
-
-            if( !has_nav_menu( $menulocation ) ){
-                $locations = get_theme_mod('nav_menu_locations');
-                $locations[$menulocation] = $menu_id;
-                set_theme_mod( 'nav_menu_locations', $locations );
-            }
-
-            update_option('geodir_theme_location_nav', array('primary'));
-
-            $menu = wp_nav_menu(array(
-                'theme_location' => 'primary',
-                'echo' => false,
-            ));
-
-            $this->assertContains('Add Listing', $menu);
-
-
-        }
-    }
-
-    public function testBestOfWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_bestof_widget.php';
-        include_once($template);
-
-        ob_start();
-        $instance = array();
-        $instance['use_viewing_post_type'] = '1';
-        $instance['excerpt_type'] = 'show-reviews';
-        the_widget( 'geodir_bestof_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('bestof-widget-tab-layout', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_bestof_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Number of categories', $output);
-
-        $new_instance = array(
-            'title' => '',
-            'post_type' => '',
-            'post_limit' => '5',
-            'categ_limit' => '3',
-            'character_count' => '20',
-            'add_location_filter' => '1',
-            'tab_layout' => 'bestof-tabs-on-top',
-            'excerpt_type' => 'show-desc',
-            'use_viewing_post_type' => '1'
-        );
-        $output = $this->the_widget_form_update( 'geodir_bestof_widget', $new_instance );
-        $this->assertContains('20', $output['character_count']);
-
-        ob_start();
-        geodir_bestof_js();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('bestof-widget-tab-layout', $output);
-
-    }
-
-    public function testCptCatsWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_cpt_categories_widget.php';
-        include_once($template);
-
-        ob_start();
-        the_widget( 'geodir_cpt_categories_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_cpt_categories_widget', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_cpt_categories_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Select CPT', $output);
-
-        $new_instance = array(
-            'title' => '',
-            'post_type' => array(), // NULL for all
-            'hide_empty' => '',
-            'show_count' => '',
-            'hide_icon' => '',
-            'cpt_left' => '',
-            'sort_by' => 'count',
-            'max_count' => 'all',
-            'max_level' => '1'
-        );
-        $output = $this->the_widget_form_update( 'geodir_cpt_categories_widget', $new_instance );
-        $this->assertContains('count', $output['sort_by']);
-
-    }
-
-    public function testFeaturesWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_features_widget.php';
-        include_once($template);
-
-        $instance = array(
-            'title' => 'Features',
-            'icon_color' => '',
-            'title1' => 'Hello World',
-            'image1' => 'fa-recycle',
-            'desc1' => 'cool',
-        );
-
-        ob_start();
-        the_widget( 'Geodir_Features_Widget', $instance);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('widget_gd_features', $output);
-
-        ob_start();
-        $this->the_widget_form( 'Geodir_Features_Widget', $instance );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Font Awesome Icon Color', $output);
-
-        $new_instance = array(
-            'title' => 'Features',
-            'icon_color' => '',
-            'title1' => 'Hello World',
-            'image1' => 'fa-recycle',
-            'desc1' => 'cool',
-        );
-        $output = $this->the_widget_form_update( 'Geodir_Features_Widget', $new_instance );
-        $this->assertContains('Features', $output['title']);
-
-    }
-
-    public function testSliderWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_listing_slider_widget.php';
-        include_once($template);
-
-        ob_start();
-        the_widget( 'geodir_listing_slider_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_listing_slider_view', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_listing_slider_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Slide Show Speed', $output);
-
-        $new_instance = array(
-            'title' => '',
-            'post_type' => '',
-            'category' => '',
-            'post_number' => '5',
-            'max_show' => '1',
-            'slide_width' => '',
-            'show_title' => '',
-            'slideshow' => '',
-            'animationLoop' => '',
-            'directionNav' => '',
-            'slideshowSpeed' => 5000,
-            'animationSpeed' => 600,
-            'animation' => '',
-            'list_sort' => 'latest',
-            'show_featured_only' => '',
-        );
-        $output = $this->the_widget_form_update( 'geodir_listing_slider_widget', $new_instance );
-        $this->assertContains('latest', $output['list_sort']);
-
-    }
-
-    public function testPopularWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_popular_widget.php';
-        include_once($template);
-
-        ob_start();
-        the_widget( 'geodir_popular_post_category' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_popular_post_category', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_popular_post_category' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Default post type to use', $output);
-
-        $new_instance = array(
-            'title' => '',
-            'category_limit' => 15,
-            'default_post_type' => ''
-        );
-        $output = $this->the_widget_form_update( 'geodir_popular_post_category', $new_instance );
-        $this->assertEquals(15, $output['category_limit']);
-
-        ob_start();
-        $instance = array();
-        $instance['category_title'] = '';
-        the_widget( 'geodir_popular_postview', $instance );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_popular_post_view', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_popular_postview' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Post Category', $output);
-
-        $new_instance = array(
-            'title' => '',
-            'post_type' => '',
-            'category' => array(),
-            'category_title' => '',
-            'list_sort' => '',
-            'list_order' => '',
-            'post_number' => '5',
-            'layout' => 'gridview_onehalf',
-            'listing_width' => '',
-            'add_location_filter' => '1',
-            'character_count' => '20',
-            'show_featured_only' => '',
-            'show_special_only' => '',
-            'with_pics_only' => '',
-            'with_videos_only' => '',
-            'use_viewing_post_type' => ''
-        );
-        $output = $this->the_widget_form_update( 'geodir_popular_postview', $new_instance );
-        $this->assertContains('gridview_onehalf', $output['layout']);
-
-    }
-
-    public function testRelatedWidget() {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            global $post;
-            $post_id = get_the_ID();
-            $post = geodir_get_post_info($post->ID);
+		wp_set_current_user(0);
+		$template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
+
+		ob_start();
+		include($template);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Sign In', $output);
+	}
+
+	public function testInfoTemplate() {
+		wp_set_current_user(1);
+		global $information;
+		$information = "hello world";
+
+		$template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+
+		ob_start();
+		include($template);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('hello world', $output);
+	}
+
+	public function testSuccessPage() {
+		wp_set_current_user(1);
+
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$_REQUEST['listing_type'] = 'gd_place';
+		$_REQUEST['pid'] = $post_id;
+		ob_start();
+		$this->go_to( get_permalink(geodir_success_page_id()) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('View your submitted information', $output);
+	}
+
+	public function testPreviewPage() {
+		wp_set_current_user(1);
+
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$_REQUEST = array(
+			'pid' => $post_id,
+			'listing_type' => 'gd_place',
+			'post_title' => 'Test Listing Title Modified',
+			'post_desc' => 'Test Desc',
+			'post_tags' => 'test1,test2',
+			'post_address' => 'New York City Hall',
+			'post_zip' => '10007',
+			'post_latitude' => '40.7127837',
+			'post_longitude' => '-74.00594130000002',
+			'post_mapview' => 'ROADMAP',
+			'post_mapzoom' => '10',
+			'geodir_timing' => '10.00 am to 6 pm every day',
+			'geodir_contact' => '1234567890',
+			'geodir_email' => 'test@test.com',
+			'geodir_website' => 'http://test.com',
+			'geodir_twitter' => 'http://twitter.com/test',
+			'geodir_facebook' => 'http://facebook.com/test',
+			'geodir_special_offers' => 'Test offer',
+			'preview' => true,
+			'post_category' => array(
+				'gd_placecategory' => ''
+			)
+		);
+
+		ob_start();
+		$this->go_to( get_permalink(geodir_preview_page_id()) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('This is a preview of your listing', $output);
+	}
+
+	public function testAddListingPage() {
+		wp_set_current_user(1);
+
+		ob_start();
+		$this->go_to( get_permalink(geodir_add_listing_page_id()) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Enter Listing Details', $output);
+	}
+
+	public function testLocationPage() {
+		wp_set_current_user(1);
+
+		ob_start();
+		$this->go_to( get_permalink(geodir_location_page_id()) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Location', $output);
+	}
+
+	public function testTemplates() {
+
+		global $current_user;
+
+		$user_id = $current_user->ID;
+
+		$this->setPermalinkStructure();
+
+		$homepage = get_page_by_title( 'GD Home page' );
+		if ( $homepage )
+		{
+			update_option( 'page_on_front', $homepage->ID );
+			update_option( 'show_on_front', 'page' );
+		}
+
+		ob_start();
+		$this->go_to( home_url('/') );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('body class="home', $output);
+
+
+		ob_start();
+		$this->go_to( home_url('/?post_type=gd_place') );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('All Places', $output);
+
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		global $preview;
+		$preview = false;
+		ob_start();
+		$this->go_to( get_permalink($post_id) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('post_profileTab', $output);
+
+		ob_start();
+		$_REQUEST['stype'] = 'gd_place';
+		$_REQUEST['geodir_dashbord'] = true;
+		$this->go_to( get_author_posts_url($user_id) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('gd_list_view', $output);
+
+	}
+
+	public function testSearchPage() {
+		ob_start();
+		$_REQUEST['geodir_search'] = "1";
+		$_REQUEST['stype'] = 'gd_place';
+		$this->go_to( home_url('/?geodir_search=1&stype=gd_place&s=test&snear=&sgeo_lat=&sgeo_lon=') );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Search Results for', $output);
+
+	}
+
+	public function testPopupSendEnquiryTemplate() {
+
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$_REQUEST['popuptype'] = 'b_send_inquiry';
+		$_REQUEST['post_id'] = $post_id;
+		add_filter('wp_redirect', '__return_false');
+		ob_start();
+		geodir_ajax_handler();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('send_inqury', $output);
+		remove_filter('wp_redirect', '__return_false');
+
+	}
+
+	public function texstPopupSendToFrndTemplate() {
+
+		//include template problem. its already loaded. find a way to fix this
+
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$_REQUEST['popuptype'] = 'b_sendtofriend';
+		$_REQUEST['post_id'] = $post_id;
+		add_filter('wp_redirect', '__return_false');
+		ob_start();
+		geodir_ajax_handler();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('send_inqury', $output);
+		remove_filter('wp_redirect', '__return_false');
+	}
+
+	public function testNavMenus() {
+		$menuname = 'Primary Menu';
+		$menulocation = 'primary';
+		// Does the menu exist already?
+		$menu_exists = wp_get_nav_menu_object( $menuname );
+
+		// If it doesn't exist, let's create it.
+		if( !$menu_exists){
+			$menu_id = wp_create_nav_menu($menuname);
+
+			// Set up default BuddyPress links and add them to the menu.
+			wp_update_nav_menu_item($menu_id, 0, array(
+				'menu-item-title' =>  __('Home'),
+				'menu-item-classes' => 'home',
+				'menu-item-url' => home_url( '/' ),
+				'menu-item-status' => 'publish'));
+
+			if( !has_nav_menu( $menulocation ) ){
+				$locations = get_theme_mod('nav_menu_locations');
+				$locations[$menulocation] = $menu_id;
+				set_theme_mod( 'nav_menu_locations', $locations );
+			}
+
+			update_option('geodir_theme_location_nav', array('primary'));
+
+			$menu = wp_nav_menu(array(
+				'theme_location' => 'primary',
+				'echo' => false,
+			));
+
+			$this->assertContains('Add Listing', $menu);
+
+
+		}
+	}
+
+	public function testBestOfWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_bestof_widget.php';
+		include_once($template);
+
+		ob_start();
+		$instance = array();
+		$instance['use_viewing_post_type'] = '1';
+		$instance['excerpt_type'] = 'show-reviews';
+		the_widget( 'geodir_bestof_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('bestof-widget-tab-layout', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_bestof_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Number of categories', $output);
+
+		$new_instance = array(
+			'title' => '',
+			'post_type' => '',
+			'post_limit' => '5',
+			'categ_limit' => '3',
+			'character_count' => '20',
+			'add_location_filter' => '1',
+			'tab_layout' => 'bestof-tabs-on-top',
+			'excerpt_type' => 'show-desc',
+			'use_viewing_post_type' => '1'
+		);
+		$output = $this->the_widget_form_update( 'geodir_bestof_widget', $new_instance );
+		$this->assertContains('20', $output['character_count']);
+
+		ob_start();
+		geodir_bestof_js();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('bestof-widget-tab-layout', $output);
+
+	}
+
+	public function testCptCatsWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_cpt_categories_widget.php';
+		include_once($template);
+
+		ob_start();
+		the_widget( 'geodir_cpt_categories_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_cpt_categories_widget', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_cpt_categories_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Select CPT', $output);
+
+		$new_instance = array(
+			'title' => '',
+			'post_type' => array(), // NULL for all
+			'hide_empty' => '',
+			'show_count' => '',
+			'hide_icon' => '',
+			'cpt_left' => '',
+			'sort_by' => 'count',
+			'max_count' => 'all',
+			'max_level' => '1'
+		);
+		$output = $this->the_widget_form_update( 'geodir_cpt_categories_widget', $new_instance );
+		$this->assertContains('count', $output['sort_by']);
+
+	}
+
+	public function testFeaturesWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_features_widget.php';
+		include_once($template);
+
+		$instance = array(
+			'title' => 'Features',
+			'icon_color' => '',
+			'title1' => 'Hello World',
+			'image1' => 'fa-recycle',
+			'desc1' => 'cool',
+		);
+
+		ob_start();
+		the_widget( 'Geodir_Features_Widget', $instance);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('widget_gd_features', $output);
+
+		ob_start();
+		$this->the_widget_form( 'Geodir_Features_Widget', $instance );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Font Awesome Icon Color', $output);
+
+		$new_instance = array(
+			'title' => 'Features',
+			'icon_color' => '',
+			'title1' => 'Hello World',
+			'image1' => 'fa-recycle',
+			'desc1' => 'cool',
+		);
+		$output = $this->the_widget_form_update( 'Geodir_Features_Widget', $new_instance );
+		$this->assertContains('Features', $output['title']);
+
+	}
+
+	public function testSliderWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_listing_slider_widget.php';
+		include_once($template);
+
+		ob_start();
+		the_widget( 'geodir_listing_slider_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_listing_slider_view', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_listing_slider_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Slide Show Speed', $output);
+
+		$new_instance = array(
+			'title' => '',
+			'post_type' => '',
+			'category' => '',
+			'post_number' => '5',
+			'max_show' => '1',
+			'slide_width' => '',
+			'show_title' => '',
+			'slideshow' => '',
+			'animationLoop' => '',
+			'directionNav' => '',
+			'slideshowSpeed' => 5000,
+			'animationSpeed' => 600,
+			'animation' => '',
+			'list_sort' => 'latest',
+			'show_featured_only' => '',
+		);
+		$output = $this->the_widget_form_update( 'geodir_listing_slider_widget', $new_instance );
+		$this->assertContains('latest', $output['list_sort']);
+
+	}
+
+	public function testPopularWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_popular_widget.php';
+		include_once($template);
+
+		ob_start();
+		the_widget( 'geodir_popular_post_category' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_popular_post_category', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_popular_post_category' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Default post type to use', $output);
+
+		$new_instance = array(
+			'title' => '',
+			'category_limit' => 15,
+			'default_post_type' => ''
+		);
+		$output = $this->the_widget_form_update( 'geodir_popular_post_category', $new_instance );
+		$this->assertEquals(15, $output['category_limit']);
+
+		ob_start();
+		$instance = array();
+		$instance['category_title'] = '';
+		the_widget( 'geodir_popular_postview', $instance );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_popular_post_view', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_popular_postview' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Post Category', $output);
+
+		$new_instance = array(
+			'title' => '',
+			'post_type' => '',
+			'category' => array(),
+			'category_title' => '',
+			'list_sort' => '',
+			'list_order' => '',
+			'post_number' => '5',
+			'layout' => 'gridview_onehalf',
+			'listing_width' => '',
+			'add_location_filter' => '1',
+			'character_count' => '20',
+			'show_featured_only' => '',
+			'show_special_only' => '',
+			'with_pics_only' => '',
+			'with_videos_only' => '',
+			'use_viewing_post_type' => ''
+		);
+		$output = $this->the_widget_form_update( 'geodir_popular_postview', $new_instance );
+		$this->assertContains('gridview_onehalf', $output['layout']);
+
+	}
+
+	public function testRelatedWidget() {
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			global $post;
+			$post_id = get_the_ID();
+			$post = geodir_get_post_info($post->ID);
 
 //            $term_list = wp_get_post_terms($post->ID, 'gd_placecategory');
 //            $post->gd_placecategory = (string) $term_list[0]->term_id;
 
-            $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_related_listing_widget.php';
-            include_once($template);
-
-            ob_start();
-            the_widget( 'geodir_related_listing_postview' );
-            $output = ob_get_contents();
-            ob_end_clean();
-            $this->assertContains('Related Listing', $output);
-
-            ob_start();
-            $this->the_widget_form( 'geodir_related_listing_postview' );
-            $output = ob_get_contents();
-            ob_end_clean();
-            $this->assertContains('Relate to', $output);
-
-            $new_instance = array(
-                'title' => '',
-                'list_sort' => '',
-                'list_order' => '',
-                'post_number' => '5',
-                'relate_to' => '',
-                'layout' => 'gridview_onehalf',
-                'listing_width' => '',
-                'add_location_filter' => '1',
-                'character_count' => '20'
-            );
-            $output = $this->the_widget_form_update( 'geodir_related_listing_postview', $new_instance );
-            $this->assertContains('gridview_onehalf', $output['layout']);
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-
-    }
-
-    public function testReviewsWidget() {
-
-        $time = current_time('mysql');
-
-        $args = array(
-            'listing_type' => 'gd_place',
-            'post_title' => 'Test Listing Title',
-            'post_desc' => 'Test Desc',
-            'post_tags' => 'test1,test2',
-            'post_address' => 'New York City Hall',
-            'post_zip' => '10007',
-            'post_latitude' => '40.7127837',
-            'post_longitude' => '-74.00594130000002',
-            'post_mapview' => 'ROADMAP',
-            'post_mapzoom' => '10',
-            'geodir_timing' => '10.00 am to 6 pm every day',
-            'geodir_contact' => '1234567890',
-            'geodir_email' => 'test@test.com',
-            'geodir_website' => 'http://test.com',
-            'geodir_twitter' => 'http://twitter.com/test',
-            'geodir_facebook' => 'http://facebook.com/test',
-            'geodir_special_offers' => 'Test offer'
-        );
-        $post_id = geodir_save_listing($args, true);
-
-        $data = array(
-            'comment_post_ID' => $post_id,
-            'comment_author' => 'admin',
-            'comment_author_email' => 'admin@admin.com',
-            'comment_author_url' => 'http://wpgeodirectory.com',
-            'comment_content' => 'content here',
-            'comment_type' => '',
-            'comment_parent' => 0,
-            'user_id' => 1,
-            'comment_author_IP' => '127.0.0.1',
-            'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
-            'comment_date' => $time,
-            'comment_approved' => 1,
-        );
-
-        $comment_id = wp_insert_comment($data);
-
-        $_REQUEST['geodir_overallrating'] = 5.0;
-        geodir_save_rating($comment_id);
-
-        $this->assertTrue(is_int($comment_id));
-
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_reviews_widget.php';
-        include_once($template);
-
-        ob_start();
-        the_widget( 'geodir_recent_reviews_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_recent_reviews', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_recent_reviews_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Number of Reviews', $output);
-
-        $new_instance = array(
-            'title' => '',
-            't1' => '',
-            't2' => '',
-            't3' => '',
-            'img1' => '',
-            'count' => ''
-        );
-        $output = $this->the_widget_form_update( 'geodir_recent_reviews_widget', $new_instance );
-        $this->assertTrue(empty($output['count']));
-    }
-
-    public function testHomeMapWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/home_map_widget.php';
-        include_once($template);
-
-        ob_start();
-        $instance = array();
-        $args = array();
-        $args["widget_id"] = "geodir_map_v3_home_map-2";
-        the_widget( 'geodir_homepage_map', $instance, $args );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-map-home-page', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_homepage_map' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Map Zoom level', $output);
-
-        $new_instance = array(
-            'width' => '',
-            'heigh' => '',
-            'maptype' => '',
-            'zoom' => '',
-            'autozoom' => '',
-            'child_collapse' => '0',
-            'scrollwheel' => '0'
-        );
-        $output = $this->the_widget_form_update( 'geodir_homepage_map', $new_instance );
-        $this->assertContains('0', $output['scrollwheel']);
-
-    }
-
-    public function testLoginWidget() {
-
-        register_geodir_widgets();
-
-        ob_start();
-        the_widget( 'geodir_loginwidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_loginbox', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_loginwidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Widget Title', $output);
-
-        $new_instance = array(
-            'title' => 'Login',
-            't1' => '',
-            't2' => '',
-            't3' => '',
-            'img1' => '',
-            'desc1' => ''
-        );
-        $output = $this->the_widget_form_update( 'geodir_loginwidget', $new_instance );
-        $this->assertContains('Login', $output['title']);
-
-    }
-
-    public function testSocialWidget() {
-
-        ob_start();
-        the_widget( 'geodir_social_like_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('twitter.com', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_social_like_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('No settings for this widget', $output);
-
-        $new_instance = array(
-            'title' => 'Social',
-        );
-        $output = $this->the_widget_form_update( 'geodir_social_like_widget', $new_instance );
-        $this->assertContains('Social', $output['title']);
-
-    }
-
-    public function testSubscribeWidget() {
-
-        ob_start();
-        the_widget( 'geodirsubscribeWidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-subscribe-form', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodirsubscribeWidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Feedburner ID', $output);
-
-        $new_instance = array(
-            'title' => 'Subscribe',
-            'id' => '',
-            'advt1' => '',
-            'text' => '',
-            'twitter' => '',
-            'facebook' => '',
-            'digg' => '',
-            'myspace' => ''
-        );
-        $output = $this->the_widget_form_update( 'geodirsubscribeWidget', $new_instance );
-        $this->assertContains('Subscribe', $output['title']);
-
-    }
-
-    public function testAdvWidget() {
-
-        ob_start();
-        $instance = array();
-        $instance['desc1'] = 'hello';
-        the_widget( 'geodiradvtwidget', $instance );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('hello', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodiradvtwidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Your Advt code', $output);
-
-        $new_instance = array(
-            'desc1' => 'Advertise'
-        );
-        $output = $this->the_widget_form_update( 'geodiradvtwidget', $new_instance );
-        $this->assertContains('Advertise', $output['desc1']);
-
-    }
-
-    public function testFlickrWidget() {
-
-        ob_start();
-        the_widget( 'GeodirFlickrWidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-flickr', $output);
-
-        ob_start();
-        $this->the_widget_form( 'GeodirFlickrWidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Flickr ID', $output);
-
-        $new_instance = array(
-            'id' => '',
-            'number' => '34'
-        );
-        $output = $this->the_widget_form_update( 'GeodirFlickrWidget', $new_instance );
-        $this->assertContains('34', $output['number']);
-
-    }
-
-    public function testTwitterWidget() {
-
-        ob_start();
-        $instance = array();
-        $instance['gd_tw_desc1'] = 'hello';
-        the_widget( 'geodir_twitter', $instance );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('hello', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_twitter' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Your twitter code', $output);
-
-        $new_instance = array(
-            'gd_tw_desc1' => 'hello'
-        );
-        $output = $this->the_widget_form_update( 'geodir_twitter', $new_instance );
-        $this->assertContains('hello', $output['gd_tw_desc1']);
-
-    }
-
-    public function testAdvSearchWidget() {
-
-        ob_start();
-        the_widget( 'geodir_advance_search_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-loc-bar', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_advance_search_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('This is a search widget', $output);
+			$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_related_listing_widget.php';
+			include_once($template);
+
+			ob_start();
+			the_widget( 'geodir_related_listing_postview' );
+			$output = ob_get_contents();
+			ob_end_clean();
+			$this->assertContains('Related Listing', $output);
+
+			ob_start();
+			$this->the_widget_form( 'geodir_related_listing_postview' );
+			$output = ob_get_contents();
+			ob_end_clean();
+			$this->assertContains('Relate to', $output);
+
+			$new_instance = array(
+				'title' => '',
+				'list_sort' => '',
+				'list_order' => '',
+				'post_number' => '5',
+				'relate_to' => '',
+				'layout' => 'gridview_onehalf',
+				'listing_width' => '',
+				'add_location_filter' => '1',
+				'character_count' => '20'
+			);
+			$output = $this->the_widget_form_update( 'geodir_related_listing_postview', $new_instance );
+			$this->assertContains('gridview_onehalf', $output['layout']);
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+
+	}
+
+	public function testReviewsWidget() {
+
+		$time = current_time('mysql');
+
+		$args = array(
+			'listing_type' => 'gd_place',
+			'post_title' => 'Test Listing Title',
+			'post_desc' => 'Test Desc',
+			'post_tags' => 'test1,test2',
+			'post_address' => 'New York City Hall',
+			'post_zip' => '10007',
+			'post_latitude' => '40.7127837',
+			'post_longitude' => '-74.00594130000002',
+			'post_mapview' => 'ROADMAP',
+			'post_mapzoom' => '10',
+			'geodir_timing' => '10.00 am to 6 pm every day',
+			'geodir_contact' => '1234567890',
+			'geodir_email' => 'test@test.com',
+			'geodir_website' => 'http://test.com',
+			'geodir_twitter' => 'http://twitter.com/test',
+			'geodir_facebook' => 'http://facebook.com/test',
+			'geodir_special_offers' => 'Test offer'
+		);
+		$post_id = geodir_save_listing($args, true);
+
+		$data = array(
+			'comment_post_ID' => $post_id,
+			'comment_author' => 'admin',
+			'comment_author_email' => 'admin@admin.com',
+			'comment_author_url' => 'http://wpgeodirectory.com',
+			'comment_content' => 'content here',
+			'comment_type' => '',
+			'comment_parent' => 0,
+			'user_id' => 1,
+			'comment_author_IP' => '127.0.0.1',
+			'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
+			'comment_date' => $time,
+			'comment_approved' => 1,
+		);
+
+		$comment_id = wp_insert_comment($data);
+
+		$_REQUEST['geodir_overallrating'] = 5.0;
+		geodir_save_rating($comment_id);
+
+		$this->assertTrue(is_int($comment_id));
+
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_reviews_widget.php';
+		include_once($template);
+
+		ob_start();
+		the_widget( 'geodir_recent_reviews_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_recent_reviews', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_recent_reviews_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Number of Reviews', $output);
+
+		$new_instance = array(
+			'title' => '',
+			't1' => '',
+			't2' => '',
+			't3' => '',
+			'img1' => '',
+			'count' => ''
+		);
+		$output = $this->the_widget_form_update( 'geodir_recent_reviews_widget', $new_instance );
+		$this->assertTrue(empty($output['count']));
+	}
+
+	public function testHomeMapWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/home_map_widget.php';
+		include_once($template);
+
+		ob_start();
+		$instance = array();
+		$args = array();
+		$args["widget_id"] = "geodir_map_v3_home_map-2";
+		the_widget( 'geodir_homepage_map', $instance, $args );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-map-home-page', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_homepage_map' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Map Zoom level', $output);
+
+		$new_instance = array(
+			'width' => '',
+			'heigh' => '',
+			'maptype' => '',
+			'zoom' => '',
+			'autozoom' => '',
+			'child_collapse' => '0',
+			'scrollwheel' => '0'
+		);
+		$output = $this->the_widget_form_update( 'geodir_homepage_map', $new_instance );
+		$this->assertContains('0', $output['scrollwheel']);
+
+	}
+
+	public function testLoginWidget() {
+
+		register_geodir_widgets();
+
+		ob_start();
+		the_widget( 'geodir_loginwidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_loginbox', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_loginwidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Widget Title', $output);
+
+		$new_instance = array(
+			'title' => 'Login',
+			't1' => '',
+			't2' => '',
+			't3' => '',
+			'img1' => '',
+			'desc1' => ''
+		);
+		$output = $this->the_widget_form_update( 'geodir_loginwidget', $new_instance );
+		$this->assertContains('Login', $output['title']);
+
+	}
+
+	public function testSocialWidget() {
+
+		ob_start();
+		the_widget( 'geodir_social_like_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('twitter.com', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_social_like_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('No settings for this widget', $output);
+
+		$new_instance = array(
+			'title' => 'Social',
+		);
+		$output = $this->the_widget_form_update( 'geodir_social_like_widget', $new_instance );
+		$this->assertContains('Social', $output['title']);
+
+	}
+
+	public function testSubscribeWidget() {
+
+		ob_start();
+		the_widget( 'geodirsubscribeWidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-subscribe-form', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodirsubscribeWidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Feedburner ID', $output);
+
+		$new_instance = array(
+			'title' => 'Subscribe',
+			'id' => '',
+			'advt1' => '',
+			'text' => '',
+			'twitter' => '',
+			'facebook' => '',
+			'digg' => '',
+			'myspace' => ''
+		);
+		$output = $this->the_widget_form_update( 'geodirsubscribeWidget', $new_instance );
+		$this->assertContains('Subscribe', $output['title']);
+
+	}
+
+	public function testAdvWidget() {
+
+		ob_start();
+		$instance = array();
+		$instance['desc1'] = 'hello';
+		the_widget( 'geodiradvtwidget', $instance );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('hello', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodiradvtwidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Your Advt code', $output);
+
+		$new_instance = array(
+			'desc1' => 'Advertise'
+		);
+		$output = $this->the_widget_form_update( 'geodiradvtwidget', $new_instance );
+		$this->assertContains('Advertise', $output['desc1']);
+
+	}
+
+	public function testFlickrWidget() {
+
+		ob_start();
+		the_widget( 'GeodirFlickrWidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-flickr', $output);
+
+		ob_start();
+		$this->the_widget_form( 'GeodirFlickrWidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Flickr ID', $output);
+
+		$new_instance = array(
+			'id' => '',
+			'number' => '34'
+		);
+		$output = $this->the_widget_form_update( 'GeodirFlickrWidget', $new_instance );
+		$this->assertContains('34', $output['number']);
+
+	}
+
+	public function testTwitterWidget() {
+
+		ob_start();
+		$instance = array();
+		$instance['gd_tw_desc1'] = 'hello';
+		the_widget( 'geodir_twitter', $instance );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('hello', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_twitter' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Your twitter code', $output);
+
+		$new_instance = array(
+			'gd_tw_desc1' => 'hello'
+		);
+		$output = $this->the_widget_form_update( 'geodir_twitter', $new_instance );
+		$this->assertContains('hello', $output['gd_tw_desc1']);
+
+	}
+
+	public function testAdvSearchWidget() {
+
+		ob_start();
+		the_widget( 'geodir_advance_search_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-loc-bar', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_advance_search_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('This is a search widget', $output);
 
 //        $new_instance = array(
 //        );
 //        $output = $this->the_widget_form_update( 'geodir_advance_search_widget', $new_instance );
 //        $this->assertContains('Subscribe', $output['title']);
 
-    }
-
-    public function testListingMapWidget() {
-
-        $template = geodir_plugin_path() . '/geodirectory-widgets/listing_map_widget.php';
-        include_once($template);
-
-        //listing page
-        $this->go_to( home_url('/?post_type=gd_place') );
-
-        ob_start();
-        $instance = array();
-        $args = array();
-        $args["widget_id"] = "geodir_map_v3_listing_map-2";
-        the_widget( 'geodir_map_listingpage', $instance, $args );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-map-listing-page', $output);
-
-        // detail page
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $this->go_to( get_permalink($post_id) );
-
-        ob_start();
-        $instance = array();
-        $args = array();
-        $args["widget_id"] = "geodir_map_v3_listing_map-2";
-        the_widget( 'geodir_map_listingpage', $instance, $args );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-map-listing-page', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_map_listingpage' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Select Map View', $output);
-
-        $new_instance = array(
-            'width' => '',
-            'heigh' => '',
-            'maptype' => '',
-            'zoom' => '',
-            'autozoom' => '',
-            'sticky' => '',
-            'scrollwheel' => '0',
-            'showall' => '0'
-        );
-        $output = $this->the_widget_form_update( 'geodir_map_listingpage', $new_instance );
-        $this->assertContains('0', $output['scrollwheel']);
-
-
-    }
-
-    private function load_template() {
-        do_action( 'template_redirect' );
-        $template = false;
-        if	 ( is_404()			&& $template = get_404_template()			) :
-        elseif ( is_search()		 && $template = get_search_template()		 ) :
-        elseif ( is_front_page()	 && $template = get_front_page_template()	 ) :
-        elseif ( is_home()		   && $template = get_home_template()		   ) :
-        elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
-        elseif ( is_tax()			&& $template = get_taxonomy_template()	   ) :
-        elseif ( is_attachment()	 && $template = get_attachment_template()	 ) :
-            remove_filter('the_content', 'prepend_attachment');
-        elseif ( is_single()		 && $template = get_single_template()		 ) :
-        elseif ( is_page()		   && $template = get_page_template()		   ) :
-        elseif ( is_category()	   && $template = get_category_template()	   ) :
-        elseif ( is_tag()			&& $template = get_tag_template()			) :
-        elseif ( is_author()		 && $template = get_author_template()		 ) :
-        elseif ( is_date()		   && $template = get_date_template()		   ) :
-        elseif ( is_archive()		&& $template = get_archive_template()		) :
-        elseif ( is_paged()		  && $template = get_paged_template()		  ) :
-        else :
-            $template = get_index_template();
-        endif;
-        /**
-         * Filter the path of the current template before including it.
-         *
-         * @since 3.0.0
-         *
-         * @param string $template The path of the template to include.
-         */
-        if ( $template = apply_filters( 'template_include', $template ) ) {
-            $template_contents = file_get_contents( $template );
-            $included_header = $included_footer = false;
-            if ( false !== stripos( $template_contents, 'get_header();' ) ) {
-                do_action( 'get_header', null );
-                locate_template( 'header.php', true, false );
-                $included_header = true;
-            }
-            include( $template );
-            if ( false !== stripos( $template_contents, 'get_footer();' ) ) {
-                do_action( 'get_footer', null );
-                locate_template( 'footer.php', true, false );
-                $included_footer = true;
-            }
-            if ( $included_header && $included_footer ) {
-                global $wp_scripts;
-                $wp_scripts->done = array();
-            }
-        }
-        return;
-    }
-
-    public static function setPermalinkStructure( $struc = '/%postname%/' ) {
-        global $wp_rewrite;
-        $wp_rewrite->set_permalink_structure( $struc );
-        $wp_rewrite->flush_rules();
-        update_option( 'permalink_structure', $struc );
-        flush_rewrite_rules( true );
-    }
-
-    function the_widget_form( $widget, $instance = array() ) {
-        global $wp_widget_factory;
-
-        $widget_obj = $wp_widget_factory->widgets[$widget];
-        if ( ! ( $widget_obj instanceof WP_Widget ) ) {
-            return;
-        }
-
-        $widget_obj->_set(-1);
-        $widget_obj->form($instance);
-    }
-
-    function the_widget_form_update( $widget, $new_instance = array(), $old_instance = array() ) {
-        global $wp_widget_factory;
-
-        $widget_obj = $wp_widget_factory->widgets[$widget];
-        if ( ! ( $widget_obj instanceof WP_Widget ) ) {
-            return;
-        }
-
-        $widget_obj->_set(-1);
-        return $widget_obj->update($new_instance, $old_instance);
-    }
-
-
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	}
+
+	public function testListingMapWidget() {
+
+		$template = geodir_plugin_path() . '/geodirectory-widgets/listing_map_widget.php';
+		include_once($template);
+
+		//listing page
+		$this->go_to( home_url('/?post_type=gd_place') );
+
+		ob_start();
+		$instance = array();
+		$args = array();
+		$args["widget_id"] = "geodir_map_v3_listing_map-2";
+		the_widget( 'geodir_map_listingpage', $instance, $args );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-map-listing-page', $output);
+
+		// detail page
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$this->go_to( get_permalink($post_id) );
+
+		ob_start();
+		$instance = array();
+		$args = array();
+		$args["widget_id"] = "geodir_map_v3_listing_map-2";
+		the_widget( 'geodir_map_listingpage', $instance, $args );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-map-listing-page', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_map_listingpage' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Select Map View', $output);
+
+		$new_instance = array(
+			'width' => '',
+			'heigh' => '',
+			'maptype' => '',
+			'zoom' => '',
+			'autozoom' => '',
+			'sticky' => '',
+			'scrollwheel' => '0',
+			'showall' => '0'
+		);
+		$output = $this->the_widget_form_update( 'geodir_map_listingpage', $new_instance );
+		$this->assertContains('0', $output['scrollwheel']);
+
+
+	}
+
+	private function load_template() {
+		do_action( 'template_redirect' );
+		$template = false;
+		if	 ( is_404()			&& $template = get_404_template()			) :
+		elseif ( is_search()		 && $template = get_search_template()		 ) :
+		elseif ( is_front_page()	 && $template = get_front_page_template()	 ) :
+		elseif ( is_home()		   && $template = get_home_template()		   ) :
+		elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
+		elseif ( is_tax()			&& $template = get_taxonomy_template()	   ) :
+		elseif ( is_attachment()	 && $template = get_attachment_template()	 ) :
+			remove_filter('the_content', 'prepend_attachment');
+		elseif ( is_single()		 && $template = get_single_template()		 ) :
+		elseif ( is_page()		   && $template = get_page_template()		   ) :
+		elseif ( is_category()	   && $template = get_category_template()	   ) :
+		elseif ( is_tag()			&& $template = get_tag_template()			) :
+		elseif ( is_author()		 && $template = get_author_template()		 ) :
+		elseif ( is_date()		   && $template = get_date_template()		   ) :
+		elseif ( is_archive()		&& $template = get_archive_template()		) :
+		elseif ( is_paged()		  && $template = get_paged_template()		  ) :
+		else :
+			$template = get_index_template();
+		endif;
+		/**
+		 * Filter the path of the current template before including it.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param string $template The path of the template to include.
+		 */
+		if ( $template = apply_filters( 'template_include', $template ) ) {
+			$template_contents = file_get_contents( $template );
+			$included_header = $included_footer = false;
+			if ( false !== stripos( $template_contents, 'get_header();' ) ) {
+				do_action( 'get_header', null );
+				locate_template( 'header.php', true, false );
+				$included_header = true;
+			}
+			include( $template );
+			if ( false !== stripos( $template_contents, 'get_footer();' ) ) {
+				do_action( 'get_footer', null );
+				locate_template( 'footer.php', true, false );
+				$included_footer = true;
+			}
+			if ( $included_header && $included_footer ) {
+				global $wp_scripts;
+				$wp_scripts->done = array();
+			}
+		}
+		return;
+	}
+
+	public static function setPermalinkStructure( $struc = '/%postname%/' ) {
+		global $wp_rewrite;
+		$wp_rewrite->set_permalink_structure( $struc );
+		$wp_rewrite->flush_rules();
+		update_option( 'permalink_structure', $struc );
+		flush_rewrite_rules( true );
+	}
+
+	function the_widget_form( $widget, $instance = array() ) {
+		global $wp_widget_factory;
+
+		$widget_obj = $wp_widget_factory->widgets[$widget];
+		if ( ! ( $widget_obj instanceof WP_Widget ) ) {
+			return;
+		}
+
+		$widget_obj->_set(-1);
+		$widget_obj->form($instance);
+	}
+
+	function the_widget_form_update( $widget, $new_instance = array(), $old_instance = array() ) {
+		global $wp_widget_factory;
+
+		$widget_obj = $wp_widget_factory->widgets[$widget];
+		if ( ! ( $widget_obj instanceof WP_Widget ) ) {
+			return;
+		}
+
+		$widget_obj->_set(-1);
+		return $widget_obj->update($new_instance, $old_instance);
+	}
+
+
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +134 added lines, -134 removed lines

@@ -16,15 +16,15 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
         $this->assertTrue(is_int($post_id));
 
-        $this->go_to( get_permalink($post_id) );
+        $this->go_to(get_permalink($post_id));
 
         ob_start();
         geodir_breadcrumb();
@@ -119,7 +119,7 @@ 
 //            'before_title' => '<ul>',
 //            'after_title' => '<ul>'
 //        );
-        include_once geodir_plugin_path() . "/geodirectory-widgets/geodirectory_cpt_categories_widget.php";
+        include_once geodir_plugin_path()."/geodirectory-widgets/geodirectory_cpt_categories_widget.php";
         $params = array(
             'title' => '',
             'post_type' => array(), // NULL for all
@@ -177,7 +177,7 @@ 
     public function testRegTemplate() {
 //        var_dump(geodir_login_page_id());
         wp_set_current_user(0);
-        $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
+        $template = geodir_plugin_path().'/geodirectory-templates/geodir-signup.php';
 
         ob_start();
         include($template);
@@ -191,7 +191,7 @@ 
         global $information;
         $information = "hello world";
 
-        $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+        $template = geodir_plugin_path().'/geodirectory-templates/geodir-information.php';
 
         ob_start();
         include($template);
@@ -209,9 +209,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -220,7 +220,7 @@ 
         $_REQUEST['listing_type'] = 'gd_place';
         $_REQUEST['pid'] = $post_id;
         ob_start();
-        $this->go_to( get_permalink(geodir_success_page_id()) );
+        $this->go_to(get_permalink(geodir_success_page_id()));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -236,9 +236,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -270,7 +270,7 @@ 
         );
 
         ob_start();
-        $this->go_to( get_permalink(geodir_preview_page_id()) );
+        $this->go_to(get_permalink(geodir_preview_page_id()));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -281,7 +281,7 @@ 
         wp_set_current_user(1);
 
         ob_start();
-        $this->go_to( get_permalink(geodir_add_listing_page_id()) );
+        $this->go_to(get_permalink(geodir_add_listing_page_id()));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -292,7 +292,7 @@ 
         wp_set_current_user(1);
 
         ob_start();
-        $this->go_to( get_permalink(geodir_location_page_id()) );
+        $this->go_to(get_permalink(geodir_location_page_id()));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -307,15 +307,15 @@ 
 
         $this->setPermalinkStructure();
 
-        $homepage = get_page_by_title( 'GD Home page' );
-        if ( $homepage )
+        $homepage = get_page_by_title('GD Home page');
+        if ($homepage)
         {
-            update_option( 'page_on_front', $homepage->ID );
-            update_option( 'show_on_front', 'page' );
+            update_option('page_on_front', $homepage->ID);
+            update_option('show_on_front', 'page');
         }
 
         ob_start();
-        $this->go_to( home_url('/') );
+        $this->go_to(home_url('/'));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -323,7 +323,7 @@ 
 
 
         ob_start();
-        $this->go_to( home_url('/?post_type=gd_place') );
+        $this->go_to(home_url('/?post_type=gd_place'));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -335,9 +335,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -346,7 +346,7 @@ 
         global $preview;
         $preview = false;
         ob_start();
-        $this->go_to( get_permalink($post_id) );
+        $this->go_to(get_permalink($post_id));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -355,7 +355,7 @@ 
         ob_start();
         $_REQUEST['stype'] = 'gd_place';
         $_REQUEST['geodir_dashbord'] = true;
-        $this->go_to( get_author_posts_url($user_id) );
+        $this->go_to(get_author_posts_url($user_id));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -367,7 +367,7 @@ 
         ob_start();
         $_REQUEST['geodir_search'] = "1";
         $_REQUEST['stype'] = 'gd_place';
-        $this->go_to( home_url('/?geodir_search=1&stype=gd_place&s=test&snear=&sgeo_lat=&sgeo_lon=') );
+        $this->go_to(home_url('/?geodir_search=1&stype=gd_place&s=test&snear=&sgeo_lat=&sgeo_lon='));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -383,9 +383,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -413,9 +413,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -436,23 +436,23 @@ 
         $menuname = 'Primary Menu';
         $menulocation = 'primary';
         // Does the menu exist already?
-        $menu_exists = wp_get_nav_menu_object( $menuname );
+        $menu_exists = wp_get_nav_menu_object($menuname);
 
         // If it doesn't exist, let's create it.
-        if( !$menu_exists){
+        if (!$menu_exists) {
             $menu_id = wp_create_nav_menu($menuname);
 
             // Set up default BuddyPress links and add them to the menu.
             wp_update_nav_menu_item($menu_id, 0, array(
                 'menu-item-title' =>  __('Home'),
                 'menu-item-classes' => 'home',
-                'menu-item-url' => home_url( '/' ),
+                'menu-item-url' => home_url('/'),
                 'menu-item-status' => 'publish'));
 
-            if( !has_nav_menu( $menulocation ) ){
+            if (!has_nav_menu($menulocation)) {
                 $locations = get_theme_mod('nav_menu_locations');
                 $locations[$menulocation] = $menu_id;
-                set_theme_mod( 'nav_menu_locations', $locations );
+                set_theme_mod('nav_menu_locations', $locations);
             }
 
             update_option('geodir_theme_location_nav', array('primary'));
@@ -469,20 +469,20 @@ 
     }
 
     public function testBestOfWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_bestof_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_bestof_widget.php';
         include_once($template);
 
         ob_start();
         $instance = array();
         $instance['use_viewing_post_type'] = '1';
         $instance['excerpt_type'] = 'show-reviews';
-        the_widget( 'geodir_bestof_widget' );
+        the_widget('geodir_bestof_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('bestof-widget-tab-layout', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_bestof_widget' );
+        $this->the_widget_form('geodir_bestof_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Number of categories', $output);
@@ -498,7 +498,7 @@ 
             'excerpt_type' => 'show-desc',
             'use_viewing_post_type' => '1'
         );
-        $output = $this->the_widget_form_update( 'geodir_bestof_widget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_bestof_widget', $new_instance);
         $this->assertContains('20', $output['character_count']);
 
         ob_start();
@@ -510,17 +510,17 @@ 
     }
 
     public function testCptCatsWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_cpt_categories_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_cpt_categories_widget.php';
         include_once($template);
 
         ob_start();
-        the_widget( 'geodir_cpt_categories_widget' );
+        the_widget('geodir_cpt_categories_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_cpt_categories_widget', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_cpt_categories_widget' );
+        $this->the_widget_form('geodir_cpt_categories_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Select CPT', $output);
@@ -536,13 +536,13 @@ 
             'max_count' => 'all',
             'max_level' => '1'
         );
-        $output = $this->the_widget_form_update( 'geodir_cpt_categories_widget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_cpt_categories_widget', $new_instance);
         $this->assertContains('count', $output['sort_by']);
 
     }
 
     public function testFeaturesWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_features_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_features_widget.php';
         include_once($template);
 
         $instance = array(
@@ -554,13 +554,13 @@ 
         );
 
         ob_start();
-        the_widget( 'Geodir_Features_Widget', $instance);
+        the_widget('Geodir_Features_Widget', $instance);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('widget_gd_features', $output);
 
         ob_start();
-        $this->the_widget_form( 'Geodir_Features_Widget', $instance );
+        $this->the_widget_form('Geodir_Features_Widget', $instance);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Font Awesome Icon Color', $output);
@@ -572,23 +572,23 @@ 
             'image1' => 'fa-recycle',
             'desc1' => 'cool',
         );
-        $output = $this->the_widget_form_update( 'Geodir_Features_Widget', $new_instance );
+        $output = $this->the_widget_form_update('Geodir_Features_Widget', $new_instance);
         $this->assertContains('Features', $output['title']);
 
     }
 
     public function testSliderWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_listing_slider_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_listing_slider_widget.php';
         include_once($template);
 
         ob_start();
-        the_widget( 'geodir_listing_slider_widget' );
+        the_widget('geodir_listing_slider_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_listing_slider_view', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_listing_slider_widget' );
+        $this->the_widget_form('geodir_listing_slider_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Slide Show Speed', $output);
@@ -610,23 +610,23 @@ 
             'list_sort' => 'latest',
             'show_featured_only' => '',
         );
-        $output = $this->the_widget_form_update( 'geodir_listing_slider_widget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_listing_slider_widget', $new_instance);
         $this->assertContains('latest', $output['list_sort']);
 
     }
 
     public function testPopularWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_popular_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_popular_widget.php';
         include_once($template);
 
         ob_start();
-        the_widget( 'geodir_popular_post_category' );
+        the_widget('geodir_popular_post_category');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_popular_post_category', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_popular_post_category' );
+        $this->the_widget_form('geodir_popular_post_category');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Default post type to use', $output);
@@ -636,19 +636,19 @@ 
             'category_limit' => 15,
             'default_post_type' => ''
         );
-        $output = $this->the_widget_form_update( 'geodir_popular_post_category', $new_instance );
+        $output = $this->the_widget_form_update('geodir_popular_post_category', $new_instance);
         $this->assertEquals(15, $output['category_limit']);
 
         ob_start();
         $instance = array();
         $instance['category_title'] = '';
-        the_widget( 'geodir_popular_postview', $instance );
+        the_widget('geodir_popular_postview', $instance);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_popular_post_view', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_popular_postview' );
+        $this->the_widget_form('geodir_popular_postview');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Post Category', $output);
@@ -671,7 +671,7 @@ 
             'with_videos_only' => '',
             'use_viewing_post_type' => ''
         );
-        $output = $this->the_widget_form_update( 'geodir_popular_postview', $new_instance );
+        $output = $this->the_widget_form_update('geodir_popular_postview', $new_instance);
         $this->assertContains('gridview_onehalf', $output['layout']);
 
     }
@@ -683,9 +683,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             global $post;
             $post_id = get_the_ID();
             $post = geodir_get_post_info($post->ID);
@@ -693,17 +693,17 @@ 
 //            $term_list = wp_get_post_terms($post->ID, 'gd_placecategory');
 //            $post->gd_placecategory = (string) $term_list[0]->term_id;
 
-            $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_related_listing_widget.php';
+            $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_related_listing_widget.php';
             include_once($template);
 
             ob_start();
-            the_widget( 'geodir_related_listing_postview' );
+            the_widget('geodir_related_listing_postview');
             $output = ob_get_contents();
             ob_end_clean();
             $this->assertContains('Related Listing', $output);
 
             ob_start();
-            $this->the_widget_form( 'geodir_related_listing_postview' );
+            $this->the_widget_form('geodir_related_listing_postview');
             $output = ob_get_contents();
             ob_end_clean();
             $this->assertContains('Relate to', $output);
@@ -719,7 +719,7 @@ 
                 'add_location_filter' => '1',
                 'character_count' => '20'
             );
-            $output = $this->the_widget_form_update( 'geodir_related_listing_postview', $new_instance );
+            $output = $this->the_widget_form_update('geodir_related_listing_postview', $new_instance);
             $this->assertContains('gridview_onehalf', $output['layout']);
         endwhile;
 
@@ -775,17 +775,17 @@ 
 
         $this->assertTrue(is_int($comment_id));
 
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_reviews_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_reviews_widget.php';
         include_once($template);
 
         ob_start();
-        the_widget( 'geodir_recent_reviews_widget' );
+        the_widget('geodir_recent_reviews_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_recent_reviews', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_recent_reviews_widget' );
+        $this->the_widget_form('geodir_recent_reviews_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Number of Reviews', $output);
@@ -798,25 +798,25 @@ 
             'img1' => '',
             'count' => ''
         );
-        $output = $this->the_widget_form_update( 'geodir_recent_reviews_widget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_recent_reviews_widget', $new_instance);
         $this->assertTrue(empty($output['count']));
     }
 
     public function testHomeMapWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/home_map_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/home_map_widget.php';
         include_once($template);
 
         ob_start();
         $instance = array();
         $args = array();
         $args["widget_id"] = "geodir_map_v3_home_map-2";
-        the_widget( 'geodir_homepage_map', $instance, $args );
+        the_widget('geodir_homepage_map', $instance, $args);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-map-home-page', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_homepage_map' );
+        $this->the_widget_form('geodir_homepage_map');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Map Zoom level', $output);
@@ -830,7 +830,7 @@ 
             'child_collapse' => '0',
             'scrollwheel' => '0'
         );
-        $output = $this->the_widget_form_update( 'geodir_homepage_map', $new_instance );
+        $output = $this->the_widget_form_update('geodir_homepage_map', $new_instance);
         $this->assertContains('0', $output['scrollwheel']);
 
     }
@@ -840,13 +840,13 @@ 
         register_geodir_widgets();
 
         ob_start();
-        the_widget( 'geodir_loginwidget' );
+        the_widget('geodir_loginwidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_loginbox', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_loginwidget' );
+        $this->the_widget_form('geodir_loginwidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Widget Title', $output);
@@ -859,7 +859,7 @@ 
             'img1' => '',
             'desc1' => ''
         );
-        $output = $this->the_widget_form_update( 'geodir_loginwidget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_loginwidget', $new_instance);
         $this->assertContains('Login', $output['title']);
 
     }
@@ -867,13 +867,13 @@ 
     public function testSocialWidget() {
 
         ob_start();
-        the_widget( 'geodir_social_like_widget' );
+        the_widget('geodir_social_like_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('twitter.com', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_social_like_widget' );
+        $this->the_widget_form('geodir_social_like_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('No settings for this widget', $output);
@@ -881,7 +881,7 @@ 
         $new_instance = array(
             'title' => 'Social',
         );
-        $output = $this->the_widget_form_update( 'geodir_social_like_widget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_social_like_widget', $new_instance);
         $this->assertContains('Social', $output['title']);
 
     }
@@ -889,13 +889,13 @@ 
     public function testSubscribeWidget() {
 
         ob_start();
-        the_widget( 'geodirsubscribeWidget' );
+        the_widget('geodirsubscribeWidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-subscribe-form', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodirsubscribeWidget' );
+        $this->the_widget_form('geodirsubscribeWidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Feedburner ID', $output);
@@ -910,7 +910,7 @@ 
             'digg' => '',
             'myspace' => ''
         );
-        $output = $this->the_widget_form_update( 'geodirsubscribeWidget', $new_instance );
+        $output = $this->the_widget_form_update('geodirsubscribeWidget', $new_instance);
         $this->assertContains('Subscribe', $output['title']);
 
     }
@@ -920,13 +920,13 @@ 
         ob_start();
         $instance = array();
         $instance['desc1'] = 'hello';
-        the_widget( 'geodiradvtwidget', $instance );
+        the_widget('geodiradvtwidget', $instance);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('hello', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodiradvtwidget' );
+        $this->the_widget_form('geodiradvtwidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Your Advt code', $output);
@@ -934,7 +934,7 @@ 
         $new_instance = array(
             'desc1' => 'Advertise'
         );
-        $output = $this->the_widget_form_update( 'geodiradvtwidget', $new_instance );
+        $output = $this->the_widget_form_update('geodiradvtwidget', $new_instance);
         $this->assertContains('Advertise', $output['desc1']);
 
     }
@@ -942,13 +942,13 @@ 
     public function testFlickrWidget() {
 
         ob_start();
-        the_widget( 'GeodirFlickrWidget' );
+        the_widget('GeodirFlickrWidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-flickr', $output);
 
         ob_start();
-        $this->the_widget_form( 'GeodirFlickrWidget' );
+        $this->the_widget_form('GeodirFlickrWidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Flickr ID', $output);
@@ -957,7 +957,7 @@ 
             'id' => '',
             'number' => '34'
         );
-        $output = $this->the_widget_form_update( 'GeodirFlickrWidget', $new_instance );
+        $output = $this->the_widget_form_update('GeodirFlickrWidget', $new_instance);
         $this->assertContains('34', $output['number']);
 
     }
@@ -967,13 +967,13 @@ 
         ob_start();
         $instance = array();
         $instance['gd_tw_desc1'] = 'hello';
-        the_widget( 'geodir_twitter', $instance );
+        the_widget('geodir_twitter', $instance);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('hello', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_twitter' );
+        $this->the_widget_form('geodir_twitter');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Your twitter code', $output);
@@ -981,7 +981,7 @@ 
         $new_instance = array(
             'gd_tw_desc1' => 'hello'
         );
-        $output = $this->the_widget_form_update( 'geodir_twitter', $new_instance );
+        $output = $this->the_widget_form_update('geodir_twitter', $new_instance);
         $this->assertContains('hello', $output['gd_tw_desc1']);
 
     }
@@ -989,13 +989,13 @@ 
     public function testAdvSearchWidget() {
 
         ob_start();
-        the_widget( 'geodir_advance_search_widget' );
+        the_widget('geodir_advance_search_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-loc-bar', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_advance_search_widget' );
+        $this->the_widget_form('geodir_advance_search_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('This is a search widget', $output);
@@ -1009,17 +1009,17 @@ 
 
     public function testListingMapWidget() {
 
-        $template = geodir_plugin_path() . '/geodirectory-widgets/listing_map_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/listing_map_widget.php';
         include_once($template);
 
         //listing page
-        $this->go_to( home_url('/?post_type=gd_place') );
+        $this->go_to(home_url('/?post_type=gd_place'));
 
         ob_start();
         $instance = array();
         $args = array();
         $args["widget_id"] = "geodir_map_v3_listing_map-2";
-        the_widget( 'geodir_map_listingpage', $instance, $args );
+        the_widget('geodir_map_listingpage', $instance, $args);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-map-listing-page', $output);
@@ -1031,27 +1031,27 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
         $this->assertTrue(is_int($post_id));
 
-        $this->go_to( get_permalink($post_id) );
+        $this->go_to(get_permalink($post_id));
 
         ob_start();
         $instance = array();
         $args = array();
         $args["widget_id"] = "geodir_map_v3_listing_map-2";
-        the_widget( 'geodir_map_listingpage', $instance, $args );
+        the_widget('geodir_map_listingpage', $instance, $args);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-map-listing-page', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_map_listingpage' );
+        $this->the_widget_form('geodir_map_listingpage');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Select Map View', $output);
@@ -1066,31 +1066,31 @@ 
             'scrollwheel' => '0',
             'showall' => '0'
         );
-        $output = $this->the_widget_form_update( 'geodir_map_listingpage', $new_instance );
+        $output = $this->the_widget_form_update('geodir_map_listingpage', $new_instance);
         $this->assertContains('0', $output['scrollwheel']);
 
 
     }
 
     private function load_template() {
-        do_action( 'template_redirect' );
+        do_action('template_redirect');
         $template = false;
-        if	 ( is_404()			&& $template = get_404_template()			) :
-        elseif ( is_search()		 && $template = get_search_template()		 ) :
-        elseif ( is_front_page()	 && $template = get_front_page_template()	 ) :
-        elseif ( is_home()		   && $template = get_home_template()		   ) :
-        elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
-        elseif ( is_tax()			&& $template = get_taxonomy_template()	   ) :
-        elseif ( is_attachment()	 && $template = get_attachment_template()	 ) :
+        if (is_404() && $template = get_404_template()) :
+        elseif (is_search() && $template = get_search_template()) :
+        elseif (is_front_page() && $template = get_front_page_template()) :
+        elseif (is_home() && $template = get_home_template()) :
+        elseif (is_post_type_archive() && $template = get_post_type_archive_template()) :
+        elseif (is_tax() && $template = get_taxonomy_template()) :
+        elseif (is_attachment() && $template = get_attachment_template()) :
             remove_filter('the_content', 'prepend_attachment');
-        elseif ( is_single()		 && $template = get_single_template()		 ) :
-        elseif ( is_page()		   && $template = get_page_template()		   ) :
-        elseif ( is_category()	   && $template = get_category_template()	   ) :
-        elseif ( is_tag()			&& $template = get_tag_template()			) :
-        elseif ( is_author()		 && $template = get_author_template()		 ) :
-        elseif ( is_date()		   && $template = get_date_template()		   ) :
-        elseif ( is_archive()		&& $template = get_archive_template()		) :
-        elseif ( is_paged()		  && $template = get_paged_template()		  ) :
+        elseif (is_single() && $template = get_single_template()) :
+        elseif (is_page() && $template = get_page_template()) :
+        elseif (is_category() && $template = get_category_template()) :
+        elseif (is_tag() && $template = get_tag_template()) :
+        elseif (is_author() && $template = get_author_template()) :
+        elseif (is_date() && $template = get_date_template()) :
+        elseif (is_archive() && $template = get_archive_template()) :
+        elseif (is_paged() && $template = get_paged_template()) :
         else :
             $template = get_index_template();
         endif;
@@ -1101,21 +1101,21 @@ 
          *
          * @param string $template The path of the template to include.
          */
-        if ( $template = apply_filters( 'template_include', $template ) ) {
-            $template_contents = file_get_contents( $template );
+        if ($template = apply_filters('template_include', $template)) {
+            $template_contents = file_get_contents($template);
             $included_header = $included_footer = false;
-            if ( false !== stripos( $template_contents, 'get_header();' ) ) {
-                do_action( 'get_header', null );
-                locate_template( 'header.php', true, false );
+            if (false !== stripos($template_contents, 'get_header();')) {
+                do_action('get_header', null);
+                locate_template('header.php', true, false);
                 $included_header = true;
             }
-            include( $template );
-            if ( false !== stripos( $template_contents, 'get_footer();' ) ) {
-                do_action( 'get_footer', null );
-                locate_template( 'footer.php', true, false );
+            include($template);
+            if (false !== stripos($template_contents, 'get_footer();')) {
+                do_action('get_footer', null);
+                locate_template('footer.php', true, false);
                 $included_footer = true;
             }
-            if ( $included_header && $included_footer ) {
+            if ($included_header && $included_footer) {
                 global $wp_scripts;
                 $wp_scripts->done = array();
             }
@@ -1123,19 +1123,19 @@ 
         return;
     }
 
-    public static function setPermalinkStructure( $struc = '/%postname%/' ) {
+    public static function setPermalinkStructure($struc = '/%postname%/') {
         global $wp_rewrite;
-        $wp_rewrite->set_permalink_structure( $struc );
+        $wp_rewrite->set_permalink_structure($struc);
         $wp_rewrite->flush_rules();
-        update_option( 'permalink_structure', $struc );
-        flush_rewrite_rules( true );
+        update_option('permalink_structure', $struc);
+        flush_rewrite_rules(true);
     }
 
-    function the_widget_form( $widget, $instance = array() ) {
+    function the_widget_form($widget, $instance = array()) {
         global $wp_widget_factory;
 
         $widget_obj = $wp_widget_factory->widgets[$widget];
-        if ( ! ( $widget_obj instanceof WP_Widget ) ) {
+        if (!($widget_obj instanceof WP_Widget)) {
             return;
         }
 
@@ -1143,11 +1143,11 @@ 
         $widget_obj->form($instance);
     }
 
-    function the_widget_form_update( $widget, $new_instance = array(), $old_instance = array() ) {
+    function the_widget_form_update($widget, $new_instance = array(), $old_instance = array()) {
         global $wp_widget_factory;
 
         $widget_obj = $wp_widget_factory->widgets[$widget];
-        if ( ! ( $widget_obj instanceof WP_Widget ) ) {
+        if (!($widget_obj instanceof WP_Widget)) {
             return;
         }