GeoDirectory / geodirectory

geodirectory-templates/listing-success.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Template for the success page after submitting a listing
- *
- * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.
- *
- * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
- * @since 1.0.0
- * @package GeoDirectory
- */
+		 * Template for the success page after submitting a listing
+		 *
+		 * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.
+		 *
+		 * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
 
 // call header
 get_header();

geodirectory_template_tags.php

Braces +38 added lines, -20 removed lines

@@ -245,13 +245,14 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

-        return $url;

-    else if (is_admin())

-        return str_replace('#asyncload', '', $url);

-    else

-        return str_replace('#asyncload', '', $url)."' async='async";

-}

+    if (strpos($url, '#asyncload')===false) {
+            return $url;
+    } else if (is_admin()) {
+            return str_replace('#asyncload', '', $url);
+    } else {
+            return str_replace('#asyncload', '', $url)."' async='async";
+    }
+    }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

 /**

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

         wp_enqueue_style('geodir-chosen-style');

 

-    }else{

+    } else{

         wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-core-scss');

 

@@ -359,8 +360,10 @@ 
 

     $half_pages_to_show = round($pages_to_show / 2);

 

-    if (geodir_is_page('home') || (get_option('geodir_set_as_home') && is_home())) // dont apply default  pagination for geodirectory home page.

-        return;

+    if (geodir_is_page('home') || (get_option('geodir_set_as_home') && is_home())) {
+    	// dont apply default  pagination for geodirectory home page.

+        return;
+    }
 

     if (!is_single()) {

 		if (function_exists('geodir_location_geo_home_link')) {

@@ -433,11 +436,21 @@ 
     }

     $dist_dif = 1000;

 

-    if ($dist <= 5000) $dist_dif = 500;

-    if ($dist <= 1000) $dist_dif = 100;

-    if ($dist <= 500) $dist_dif = 50;

-    if ($dist <= 100) $dist_dif = 10;

-    if ($dist <= 50) $dist_dif = 5;

+    if ($dist <= 5000) {
+    	$dist_dif = 500;
+    }
+    if ($dist <= 1000) {
+    	$dist_dif = 100;
+    }
+    if ($dist <= 500) {
+    	$dist_dif = 50;
+    }
+    if ($dist <= 100) {
+    	$dist_dif = 10;
+    }
+    if ($dist <= 50) {
+    	$dist_dif = 5;
+    }
 

     ?>

     <script type="text/javascript">

@@ -499,18 +512,23 @@ 
 {

 

     $default_search_for_text = SEARCH_FOR_TEXT;

-    if (get_option('geodir_search_field_default_text'))

-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+    if (get_option('geodir_search_field_default_text')) {
+            $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
+    }
 

     $default_near_text = NEAR_TEXT;

-    if (get_option('geodir_near_field_default_text'))

-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+    if (get_option('geodir_near_field_default_text')) {
+            $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+    }
 

     ?>

 

 

     <script type="text/javascript">

-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';

+        var default_location = '<?php if($search_location = geodir_get_default_location()) {
+	echo $search_location->city ;
+}
+?>';

         var latlng;

         var Sgeocoder;

         var address;

Spacing +38 added lines, -38 removed lines

@@ -37,7 +37,7 @@ 
 {

     $is_detail_page = false;

 

-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

+    if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {

         $is_detail_page = true;

     }

 

@@ -51,7 +51,7 @@ 
         'siteurl' => get_option('siteurl'),

         'geodir_plugin_url' => geodir_plugin_url(),

         'geodir_ajax_url' => geodir_get_ajax_url(),

-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

+        'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),

         'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

     );

 

@@ -72,17 +72,17 @@ 
      *

      * }

      */

-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

+    $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);

 

     wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

 

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

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

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

+    if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }

 

-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-lightbox-jquery');

 

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

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

     if ($is_detail_page) {

         wp_enqueue_script('geodirectory-jquery-simplemodal');

     }

@@ -99,7 +99,7 @@ 
     $map_extra = apply_filters('geodir_googlemap_script_extra', '');

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

     

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

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

     wp_enqueue_script('geodirectory-goMap-script');

 

 

@@ -116,7 +116,7 @@ 
         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

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

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

         wp_enqueue_script('geodirectory-plupload-script');

         // SCRIPT FOR UPLOAD END

 

@@ -229,12 +229,12 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

+    if (strpos($url, '#asyncload') === false)

         return $url;

     else if (is_admin())

         return str_replace('#asyncload', '', $url);

     else

-        return str_replace('#asyncload', '', $url)."' async='async";

+        return str_replace('#asyncload', '', $url) . "' async='async";

 }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

@@ -248,7 +248,7 @@ 
 {

 

 

-    if(get_option('geodir_scss_core')) {

+    if (get_option('geodir_scss_core')) {

 

 

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

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

         wp_enqueue_style('geodir-chosen-style');

 

-    }else{

+    } else {

         wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-core-scss');

 

@@ -290,7 +290,7 @@ 
 

     }

 

-    if(is_rtl()){

+    if (is_rtl()) {

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

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

     }

@@ -365,7 +365,7 @@ 
                 $term_id = get_queried_object_id();

                 $taxonomy = get_query_var('taxonomy');

 

-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

+                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category') {

                     $term = get_term($term_id, $post_type . 'category');

                 }

             }

@@ -374,9 +374,9 @@ 
                 $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

                 

                 if (!is_array($taxonomy_search)) {

-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');

-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');

+                    $term = get_term((int) $taxonomy_search, $post_type . 'category');

+                } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

+                    $term = get_term((int) $taxonomy_search[0], $post_type . 'category');

                 }

             }

             

@@ -388,7 +388,7 @@ 
         if ($max_page > 1 || $always_show) {            

             // Extra pagination info

             $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;

+            $start_no = ($paged - 1) * $posts_per_page + 1;

             $end_no = min($paged * $posts_per_page, $numposts);

 

             if ($geodir_pagination_more_info != '') {

@@ -474,7 +474,7 @@ 
         jQuery(function ($) {

             $("#distance_slider").slider({

                 range: true,

-                values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

+                values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

                 min: 0,

                 max: <?php echo $dist; ?>,

                 step: <?php echo $dist_dif; ?>,

@@ -539,7 +539,7 @@ 
 

 

     <script type="text/javascript">

-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';

+        var default_location = '<?php if ($search_location = geodir_get_default_location())  echo $search_location->city; ?>';

         var latlng;

         var Sgeocoder;

         var address;

@@ -552,7 +552,7 @@ 
 				var $form = jQuery(this).closest('form');

 				

 				if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();

-				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);

+				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);

 				

 				// Disable location based search for disabled location post type.

 				if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {

@@ -566,7 +566,7 @@ 
 					}

 				}

 				

-				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {

+				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {

 					geodir_setsearch($form);

 				} else {

 					jQuery(".snear", $form).val('');

@@ -586,7 +586,7 @@ 
 		});

         

 		function geodir_setsearch($form) {

-			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);

+			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);

 			geocodeAddress($form);

 		}

 

@@ -599,8 +599,8 @@ 
         function geocodeAddress($form) {

             Sgeocoder = new google.maps.Geocoder(); // Call the geocode function

 

-            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

-                if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

+            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

+                if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

                     jQuery(".snear", $form).val('');

                 }

                 jQuery($form).submit();

@@ -608,24 +608,24 @@ 
 

                 var address = jQuery(".snear", $form).val();

 

-                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {

+                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {

                     initialise2();

                 } else {

 

                     Sgeocoder.geocode({'address': address<?php

-                    if($near_add = get_option('geodir_search_near_addition')){echo '+", '.$near_add.'"';}

-                    if($near_add2 =

+                    if ($near_add = get_option('geodir_search_near_addition')) {echo '+", ' . $near_add . '"'; }

+                    if ($near_add2 =

                     /**

                      * Adds any extra info to the near search box query when trying to geolocate it via google api.

                      *

                      * @since 1.0.0

                      */

-                    apply_filters('geodir_search_near_addition','')){echo $near_add2;}//gt_advanced_near_search();?>},

+                    apply_filters('geodir_search_near_addition', '')) {echo $near_add2; }//gt_advanced_near_search();?>},

                         function (results, status) {

                             if (status == google.maps.GeocoderStatus.OK) {

                                 updateSearchPosition(results[0].geometry.location, $form);

                             } else {

-                                alert("<?php _e('Search was not successful for the following reason:','geodirectory');?>" + status);

+                                alert("<?php _e('Search was not successful for the following reason:', 'geodirectory'); ?>" + status);

                             }

                         });

                 }

@@ -656,19 +656,19 @@ 
             var msg;

             switch (err.code) {

                 case err.UNKNOWN_ERROR:

-                    msg = "<?php _e('Unable to find your location','geodirectory');?>";

+                    msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";

                     break;

                 case err.PERMISSION_DENINED:

-                    msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";

+                    msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";

                     break;

                 case err.POSITION_UNAVAILABLE:

-                    msg = "<?php _e('Your location is currently unknown','geodirectory');?>";

+                    msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";

                     break;

                 case err.BREAK:

-                    msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";

+                    msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";

                     break;

                 default:

-                    msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";

+                    msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";

             }

             jQuery('#info').html(msg);

         }

@@ -709,7 +709,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>', $post, $link);

             break;

         case 'new' :

             /**

@@ -719,7 +719,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>', $post, $link);

             break;

 

     }

Indentation +336 added lines, -336 removed lines

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

 /**

- * Template tag functions.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * Template tag functions.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 

 /**

  * Contains all map related templates used by the plugin.

@@ -22,7 +22,7 @@ 
  */

 function geodir_core_dequeue_script()

 {

-    wp_dequeue_script('flexslider');

+	wp_dequeue_script('flexslider');

 }

 

 add_action('wp_print_scripts', 'geodir_core_dequeue_script', 100);

@@ -35,143 +35,143 @@ 
  */

 function geodir_templates_scripts()

 {

-    $is_detail_page = false;

-

-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

-        $is_detail_page = true;

-    }

-

-    wp_enqueue_script('jquery');

-

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

-    wp_enqueue_script('geodirectory-script');

-

-

-    $geodir_vars_data = array(

-        'siteurl' => get_option('siteurl'),

-        'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_ajax_url' => geodir_get_ajax_url(),

-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

-        'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

-    );

-

-    /**

-     * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.

-     *

-     * This is used by addons to add JS translatable variables.

-     *

-     * @since 1.4.4

-     * @param array $geodir_vars_data {

-     *    geodir var data used by addons to add JS translatable variables.

-     *

-     *    @type string $siteurl Site url.

-     *    @type string $geodir_plugin_url Geodirectory core plugin url.

-     *    @type string $geodir_ajax_url Geodirectory plugin ajax url.

-     *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.

-     *    @type int $is_rtl Checks if current locale is RTL.

-     *

-     * }

-     */

-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

-

-    wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

-

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

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

-

-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

-    wp_enqueue_script('geodirectory-lightbox-jquery');

-

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

-    if ($is_detail_page) {

-        wp_enqueue_script('geodirectory-jquery-simplemodal');

-    }

-

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

-    /**

-     * Filter the variables that are added to the end of the google maps script call.

-     *

-     * This i used to change things like google maps language etc.

-     *

-     * @since 1.0.0

-     * @param string $var The string to filter, default is empty string.

-     */

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

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

+	$is_detail_page = false;

+

+	if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

+		$is_detail_page = true;

+	}

+

+	wp_enqueue_script('jquery');

+

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

+	wp_enqueue_script('geodirectory-script');

+

+

+	$geodir_vars_data = array(

+		'siteurl' => get_option('siteurl'),

+		'geodir_plugin_url' => geodir_plugin_url(),

+		'geodir_ajax_url' => geodir_get_ajax_url(),

+		'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

+		'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

+	);

+

+	/**

+	 * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.

+	 *

+	 * This is used by addons to add JS translatable variables.

+	 *

+	 * @since 1.4.4

+	 * @param array $geodir_vars_data {

+	 *    geodir var data used by addons to add JS translatable variables.

+	 *

+	 *    @type string $siteurl Site url.

+	 *    @type string $geodir_plugin_url Geodirectory core plugin url.

+	 *    @type string $geodir_ajax_url Geodirectory plugin ajax url.

+	 *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.

+	 *    @type int $is_rtl Checks if current locale is RTL.

+	 *

+	 * }

+	 */

+	$geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

+

+	wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

+

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

+	if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

+

+	wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

+	wp_enqueue_script('geodirectory-lightbox-jquery');

+

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

+	if ($is_detail_page) {

+		wp_enqueue_script('geodirectory-jquery-simplemodal');

+	}

+

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

+	/**

+	 * Filter the variables that are added to the end of the google maps script call.

+	 *

+	 * This i used to change things like google maps language etc.

+	 *

+	 * @since 1.0.0

+	 * @param string $var The string to filter, default is empty string.

+	 */

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

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

     

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

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

-

-

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

-    wp_enqueue_script('chosen');

-

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

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

-

-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js#asyncload', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

-

-    if (is_page() && geodir_is_page('add-listing')) {

-        // SCRIPT FOR UPLOAD

-        wp_enqueue_script('plupload-all');

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

-

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

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

-        // SCRIPT FOR UPLOAD END

-

-        // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

-        if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-            $ajax_url = admin_url('admin-ajax.php');

-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-            $ajax_url = admin_url('admin-ajax.php');

-        } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-            $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-            $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

-        } else {

-            $ajax_url = admin_url('admin-ajax.php');

-        }

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

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

+

+

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

+	wp_enqueue_script('chosen');

+

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

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

+

+	wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js#asyncload', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

+

+	if (is_page() && geodir_is_page('add-listing')) {

+		// SCRIPT FOR UPLOAD

+		wp_enqueue_script('plupload-all');

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

+

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

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

+		// SCRIPT FOR UPLOAD END

+

+		// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

+		if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+			$ajax_url = admin_url('admin-ajax.php');

+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+			$ajax_url = admin_url('admin-ajax.php');

+		} elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+			$ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+			$ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

+		} else {

+			$ajax_url = admin_url('admin-ajax.php');

+		}

 

-        // place js config array for plupload

-        $plupload_init = array(

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

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

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

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

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

-            'multiple_queues' => true,

-            'max_file_size' => geodir_max_upload_size(),

-            'url' => $ajax_url,

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

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

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

-            'multipart' => true,

-            'urlstream_upload' => true,

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

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

-            'multipart_params' => array(

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

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

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

-            )

-        );

-        $base_plupload_config = json_encode($plupload_init);

-

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

-            'upload_img_size' => geodir_max_upload_size());

-

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

-

-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

-    } // End if for add place page

-

-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

-    if ($is_detail_page) {

+		// place js config array for plupload

+		$plupload_init = array(

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

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

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

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

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

+			'multiple_queues' => true,

+			'max_file_size' => geodir_max_upload_size(),

+			'url' => $ajax_url,

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

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

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

+			'multipart' => true,

+			'urlstream_upload' => true,

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

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

+			'multipart_params' => array(

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

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

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

+			)

+		);

+		$base_plupload_config = json_encode($plupload_init);

+

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

+			'upload_img_size' => geodir_max_upload_size());

+

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

+

+		wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

+	} // End if for add place page

+

+	wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+	if ($is_detail_page) {

 		wp_enqueue_script('geodirectory-post-custom-js');

 	}

 

-    // font awesome rating script

+	// font awesome rating script

 	if (get_option('geodir_reviewrating_enable_font_awesome')) {

 		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-barrating-js');

@@ -180,11 +180,11 @@ 
 		wp_enqueue_script('geodir-jRating-js');

 	}

 

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

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

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

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

 

-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

-    wp_enqueue_script('google-geometa');

+	wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+	wp_enqueue_script('google-geometa');

 }

 

 /**

@@ -198,8 +198,8 @@ 
  */

 function geodir_header_scripts()

 {

-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

-    echo stripslashes(get_option('geodir_header_scripts'));

+	echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

+	echo stripslashes(get_option('geodir_header_scripts'));

 }

 

 

@@ -215,7 +215,7 @@ 
 function geodir_footer_scripts()

 {	

 	echo stripslashes(get_option('geodir_ga_tracking_code'));

-    echo stripslashes(get_option('geodir_footer_scripts'));

+	echo stripslashes(get_option('geodir_footer_scripts'));

 }

 

 

@@ -229,12 +229,12 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

-        return $url;

-    else if (is_admin())

-        return str_replace('#asyncload', '', $url);

-    else

-        return str_replace('#asyncload', '', $url)."' async='async";

+	if (strpos($url, '#asyncload')===false)

+		return $url;

+	else if (is_admin())

+		return str_replace('#asyncload', '', $url);

+	else

+		return str_replace('#asyncload', '', $url)."' async='async";

 }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

@@ -248,55 +248,55 @@ 
 {

 

 

-    if(get_option('geodir_scss_core')) {

+	if(get_option('geodir_scss_core')) {

 

 

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

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

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

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

 

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

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

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

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

 

 

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

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

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

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

 

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

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

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

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

 

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

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

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

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

 

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

-        wp_enqueue_style('geodirectory-thic-box-css');

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

+		wp_enqueue_style('geodirectory-thic-box-css');

 

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

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

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

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

 

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

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

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

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

 

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

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

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

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

 

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

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

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

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

 

-    }else{

-        wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-core-scss');

+	}else{

+		wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-core-scss');

 

-        wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

+		wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

 

-    }

+	}

 

-    if(is_rtl()){

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

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

-    }

+	if(is_rtl()){

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

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

+	}

 

-    wp_register_style('geodirectory-font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

-    wp_enqueue_style('geodirectory-font-awesome');

+	wp_register_style('geodirectory-font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

+	wp_enqueue_style('geodirectory-font-awesome');

 

 

 }

@@ -310,7 +310,7 @@ 
  */

 function geodir_get_sidebar()

 {

-    get_sidebar('geodirectory');

+	get_sidebar('geodirectory');

 }

 

 /**

@@ -329,122 +329,122 @@ 
  * @param bool $always_show Do you want to show the pagination always? Default: false.

  */

 function geodir_pagination($before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {

-    global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;

+	global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;

 

-    if (empty($prelabel)) {

-        $prelabel = '<strong>&laquo;</strong>';

-    }

+	if (empty($prelabel)) {

+		$prelabel = '<strong>&laquo;</strong>';

+	}

 

-    if (empty($nxtlabel)) {

-        $nxtlabel = '<strong>&raquo;</strong>';

-    }

+	if (empty($nxtlabel)) {

+		$nxtlabel = '<strong>&raquo;</strong>';

+	}

 

-    $half_pages_to_show = round($pages_to_show / 2);

+	$half_pages_to_show = round($pages_to_show / 2);

 

-    if (geodir_is_page('home') || (get_option('geodir_set_as_home') && is_home())) // dont apply default  pagination for geodirectory home page.

-        return;

+	if (geodir_is_page('home') || (get_option('geodir_set_as_home') && is_home())) // dont apply default  pagination for geodirectory home page.

+		return;

 

-    if (!is_single()) {

-        if (function_exists('geodir_location_geo_home_link')) {

-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

-        }

-        $numposts = $wp_query->found_posts;

+	if (!is_single()) {

+		if (function_exists('geodir_location_geo_home_link')) {

+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+		}

+		$numposts = $wp_query->found_posts;

 

-        $max_page = ceil($numposts / $posts_per_page);

+		$max_page = ceil($numposts / $posts_per_page);

 

-        if (empty($paged)) {

-            $paged = 1;

-        }

+		if (empty($paged)) {

+			$paged = 1;

+		}

         

-        $post_type = geodir_get_current_posttype();

-        $listing_type_name = get_post_type_plural_label($post_type);

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

-            $term = array();

+		$post_type = geodir_get_current_posttype();

+		$listing_type_name = get_post_type_plural_label($post_type);

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

+			$term = array();

             

-            if (is_tax()) {

-                $term_id = get_queried_object_id();

-                $taxonomy = get_query_var('taxonomy');

+			if (is_tax()) {

+				$term_id = get_queried_object_id();

+				$taxonomy = get_query_var('taxonomy');

 

-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

-                    $term = get_term($term_id, $post_type . 'category');

-                }

-            }

+				if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

+					$term = get_term($term_id, $post_type . 'category');

+				}

+			}

             

-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

+			if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

+				$taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

                 

-                if (!is_array($taxonomy_search)) {

-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');

-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');

-                }

-            }

+				if (!is_array($taxonomy_search)) {

+					$term = get_term((int)$taxonomy_search, $post_type . 'category');

+				} else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

+					$term = get_term((int)$taxonomy_search[0], $post_type . 'category');

+				}

+			}

             

-            if (!empty($term) && !is_wp_error($term)) {

-                $listing_type_name = $term->name;

-            }

-        }

+			if (!empty($term) && !is_wp_error($term)) {

+				$listing_type_name = $term->name;

+			}

+		}

 

-        if ($max_page > 1 || $always_show) {            

-            // Extra pagination info

-            $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;

-            $end_no = min($paged * $posts_per_page, $numposts);

+		if ($max_page > 1 || $always_show) {            

+			// Extra pagination info

+			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

+			$start_no = ( $paged - 1 ) * $posts_per_page + 1;

+			$end_no = min($paged * $posts_per_page, $numposts);

 

-            if ($geodir_pagination_more_info != '') {

-                if ($listing_type_name) {

-                    $listing_type_name = __($listing_type_name, 'geodirectory');

-                    $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);

-                } else {

-                    $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

-                }

-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

-                /**

-                 * Adds an extra pagination info above/under pagination.

-                 *

-                 * @since 1.5.9

-                 *

-                 * @param string $pagination_info Extra pagination info content.

-                 * @param string $listing_type_name Listing results type.

-                 * @param string $start_no First result number.

-                 * @param string $end_no Last result number.

-                 * @param string $numposts Total number of listings.

-                 * @param string $post_type The post type.

-                 */

-                $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

+			if ($geodir_pagination_more_info != '') {

+				if ($listing_type_name) {

+					$listing_type_name = __($listing_type_name, 'geodirectory');

+					$pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);

+				} else {

+					$pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

+				}

+				$pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

+				/**

+				 * Adds an extra pagination info above/under pagination.

+				 *

+				 * @since 1.5.9

+				 *

+				 * @param string $pagination_info Extra pagination info content.

+				 * @param string $listing_type_name Listing results type.

+				 * @param string $start_no First result number.

+				 * @param string $end_no Last result number.

+				 * @param string $numposts Total number of listings.

+				 * @param string $post_type The post type.

+				 */

+				$pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

                 

-                if ($geodir_pagination_more_info == 'before') {

-                    $before = $before . $pagination_info;

-                } else if ($geodir_pagination_more_info == 'after') {

-                    $after = $pagination_info . $after;

-                }

-            }

+				if ($geodir_pagination_more_info == 'before') {

+					$before = $before . $pagination_info;

+				} else if ($geodir_pagination_more_info == 'after') {

+					$after = $pagination_info . $after;

+				}

+			}

             

-            echo "$before <div class='Navi'>";

-            if ($paged >= ($pages_to_show - 1)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

-            }

-            previous_posts_link($prelabel);

-            for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

-                if ($i >= 1 && $i <= $max_page) {

-                    if ($i == $paged) {

-                        echo "<strong class='on'>$i</strong>";

-                    } else {

-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

-                    }

-                }

-            }

-            next_posts_link($nxtlabel, $max_page);

-            if (($paged + $half_pages_to_show) < ($max_page)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

-            }

-            echo "</div> $after";

-        }

+			echo "$before <div class='Navi'>";

+			if ($paged >= ($pages_to_show - 1)) {

+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

+			}

+			previous_posts_link($prelabel);

+			for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

+				if ($i >= 1 && $i <= $max_page) {

+					if ($i == $paged) {

+						echo "<strong class='on'>$i</strong>";

+					} else {

+						echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

+					}

+				}

+			}

+			next_posts_link($nxtlabel, $max_page);

+			if (($paged + $half_pages_to_show) < ($max_page)) {

+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

+			}

+			echo "</div> $after";

+		}

         

-        if (function_exists('geodir_location_geo_home_link')) {

-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

-        }

-    }

+		if (function_exists('geodir_location_geo_home_link')) {

+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+		}

+	}

 }

 

 /**

@@ -455,20 +455,20 @@ 
  */

 function geodir_listingsearch_scripts()

 {

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

-        $dist = get_option('gd_search_dist');

-    } else {

-        $dist = 500;

-    }

-    $dist_dif = 1000;

-

-    if ($dist <= 5000) $dist_dif = 500;

-    if ($dist <= 1000) $dist_dif = 100;

-    if ($dist <= 500) $dist_dif = 50;

-    if ($dist <= 100) $dist_dif = 10;

-    if ($dist <= 50) $dist_dif = 5;

-

-    ?>

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

+		$dist = get_option('gd_search_dist');

+	} else {

+		$dist = 500;

+	}

+	$dist_dif = 1000;

+

+	if ($dist <= 5000) $dist_dif = 500;

+	if ($dist <= 1000) $dist_dif = 100;

+	if ($dist <= 500) $dist_dif = 50;

+	if ($dist <= 100) $dist_dif = 10;

+	if ($dist <= 50) $dist_dif = 5;

+

+	?>

     <script type="text/javascript">

 

         jQuery(function ($) {

@@ -527,15 +527,15 @@ 
 function geodir_add_sharelocation_scripts()

 {

 

-    $default_search_for_text = SEARCH_FOR_TEXT;

-    if (get_option('geodir_search_field_default_text'))

-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+	$default_search_for_text = SEARCH_FOR_TEXT;

+	if (get_option('geodir_search_field_default_text'))

+		$default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

 

-    $default_near_text = NEAR_TEXT;

-    if (get_option('geodir_near_field_default_text'))

-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+	$default_near_text = NEAR_TEXT;

+	if (get_option('geodir_near_field_default_text'))

+		$default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

 

-    ?>

+	?>

 

 

     <script type="text/javascript">

@@ -613,14 +613,14 @@ 
                 } else {

 

                     Sgeocoder.geocode({'address': address<?php

-                    if($near_add = get_option('geodir_search_near_addition')){echo '+", '.$near_add.'"';}

-                    if($near_add2 =

-                    /**

-                     * Adds any extra info to the near search box query when trying to geolocate it via google api.

-                     *

-                     * @since 1.0.0

-                     */

-                    apply_filters('geodir_search_near_addition','')){echo $near_add2;}//gt_advanced_near_search();?>},

+					if($near_add = get_option('geodir_search_near_addition')){echo '+", '.$near_add.'"';}

+					if($near_add2 =

+					/**

+					 * Adds any extra info to the near search box query when trying to geolocate it via google api.

+					 *

+					 * @since 1.0.0

+					 */

+					apply_filters('geodir_search_near_addition','')){echo $near_add2;}//gt_advanced_near_search();?>},

                         function (results, status) {

                             if (status == google.maps.GeocoderStatus.OK) {

                                 updateSearchPosition(results[0].geometry.location, $form);

@@ -699,30 +699,30 @@ 
  */

 function geodir_show_badges_on_image($which, $post, $link)

 {

-    $return = '';

-    switch ($which) {

-        case 'featured':

-            /**

-             * Filter the featured image badge html that appears in the listings pages over the thumbnail.

-             *

-             * @since 1.0.0

-             * @param object $post The post object.

-             * @param string $link The link to the post.

-             */

-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

-            break;

-        case 'new' :

-            /**

-             * Filter the new image badge html that appears in the listings pages over the thumbnail.

-             *

-             * @since 1.0.0

-             * @param object $post The post object.

-             * @param string $link The link to the post.

-             */

-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

-            break;

-

-    }

+	$return = '';

+	switch ($which) {

+		case 'featured':

+			/**

+			 * Filter the featured image badge html that appears in the listings pages over the thumbnail.

+			 *

+			 * @since 1.0.0

+			 * @param object $post The post object.

+			 * @param string $link The link to the post.

+			 */

+			$return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

+			break;

+		case 'new' :

+			/**

+			 * Filter the new image badge html that appears in the listings pages over the thumbnail.

+			 *

+			 * @since 1.0.0

+			 * @param object $post The post object.

+			 * @param string $link The link to the post.

+			 */

+			$return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

+			break;

+

+	}

     

-    return $return;

+	return $return;

 }

geodirectory-widgets/geodirectory_bestof_widget.php

Braces +9 added lines, -5 removed lines

@@ -118,10 +118,11 @@ 
         $instance['listing_width'] = strip_tags($new_instance['listing_width']);
         $instance['list_sort'] = strip_tags($new_instance['list_sort']);
         $instance['character_count'] = $new_instance['character_count'];
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
-        else
-            $instance['add_location_filter'] = '0';
+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+        } else {
+                    $instance['add_location_filter'] = '0';
+        }
 
         return $instance;
     }
@@ -279,7 +280,10 @@ 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
                 <?php _e('Enable Location Filter:', 'geodirectory');?>
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
+	echo 'checked="checked"';
+}
+?>
                        value="1"/>
             </label>
         </p>

Spacing +11 added lines, -11 removed lines

@@ -202,7 +202,7 @@ 
         }
 
 
-        echo $before_title . __($title,'geodirectory') . $after_title;
+        echo $before_title . __($title, 'geodirectory') . $after_title;
 
         //term navigation - start
         echo '<div class="geodir-tabs gd-bestof-tabs" id="gd-bestof-tabs" style="position:relative;">';
@@ -378,7 +378,7 @@ 
      */
     public function form($instance)
     {
-        $instance = wp_parse_args((array)$instance,
+        $instance = wp_parse_args((array) $instance,
             array(
                 'title' => '',
                 'post_type' => '',
@@ -403,7 +403,7 @@ 
 
         ?>
         <p>
-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
+            <label 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"
@@ -413,7 +413,7 @@ 
 
         <p>
             <label
-                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory'); ?>
 
                 <?php $postypes = geodir_get_posttypes();
                 /**
@@ -445,7 +445,7 @@ 
         <p>
 
             <label
-                for="<?php echo $this->get_field_id('post_limit'); ?>"><?php _e('Number of posts:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('post_limit'); ?>"><?php _e('Number of posts:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('post_limit'); ?>"
                        name="<?php echo $this->get_field_name('post_limit'); ?>" type="text"
@@ -456,7 +456,7 @@ 
         <p>
 
             <label
-                for="<?php echo $this->get_field_id('categ_limit'); ?>"><?php _e('Number of categories:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('categ_limit'); ?>"><?php _e('Number of categories:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('categ_limit'); ?>"
                        name="<?php echo $this->get_field_name('categ_limit'); ?>" type="text"
@@ -466,7 +466,7 @@ 
 
         <p>
             <label
-                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory'); ?>
                 <input class="widefat" id="<?php echo $this->get_field_id('character_count'); ?>"
                        name="<?php echo $this->get_field_name('character_count'); ?>" type="text"
                        value="<?php echo esc_attr($character_count); ?>"/>
@@ -474,7 +474,7 @@ 
         </p>
         <p>
             <label
-                for="<?php echo $this->get_field_id('tab_layout'); ?>"><?php _e('Tab Layout:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('tab_layout'); ?>"><?php _e('Tab Layout:', 'geodirectory'); ?>
 
                 <select class="widefat" id="<?php echo $this->get_field_id('tab_layout'); ?>"
                         name="<?php echo $this->get_field_name('tab_layout'); ?>">
@@ -495,7 +495,7 @@ 
 
         <p>
             <label
-                for="<?php echo $this->get_field_id('excerpt_type'); ?>"><?php _e('Excerpt Type:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('excerpt_type'); ?>"><?php _e('Excerpt Type:', 'geodirectory'); ?>
 
                 <select class="widefat" id="<?php echo $this->get_field_id('excerpt_type'); ?>"
                         name="<?php echo $this->get_field_name('excerpt_type'); ?>">
@@ -512,9 +512,9 @@ 
 
         <p>
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
-                <?php _e('Enable Location Filter:', 'geodirectory');?>
+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>
                        value="1"/>
             </label>
         </p>

Indentation +523 added lines, -523 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * GeoDirectory Best of widget
- *
- * @since 1.3.9
- *
- * @package GeoDirectory
- */
+	 * GeoDirectory Best of widget
+	 *
+	 * @since 1.3.9
+	 *
+	 * @package GeoDirectory
+	 */
 
 /**
  * GeoDirectory Best of widget widget class.
@@ -14,280 +14,280 @@ 
  */
 class geodir_bestof_widget extends WP_Widget
 {
-    /**
-     * Register the best of widget with WordPress.
-     *
-     * @since 1.3.9
-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
-     */
-    public function __construct()
-    {
-        $widget_ops = array('classname' => 'geodir_bestof_widget', 'description' => __('GD > Best of widget', 'geodirectory'));
-        parent::__construct(
-            'bestof_widget', // Base ID
-            __('GD > Best of widget', 'geodirectory'), // Name
-            $widget_ops// Args
-        );
-    }
-
-    /**
-     * Front-end display content for best of widget.
-     *
-     * @since 1.3.9
-     * @since 1.5.1 Added filter to view all link.
-     * @since 1.5.1 Declare function public.
-     *
-     * @param array $args Widget arguments.
-     * @param array $instance Saved values from database.
-     */
-    public function widget($args, $instance)
-    {
-        extract($args);
-        /**
-         * Filter the best of widget tab layout.
-         *
-         * @since 1.3.9
-         *
-         * @param string $instance ['tab_layout'] Best of widget tab layout name.
-         */
-        $tab_layout = empty($instance['tab_layout']) ? 'bestof-tabs-on-top' : apply_filters('bestof_widget_tab_layout', $instance['tab_layout']);
-        echo '<div class="bestof-widget-tab-layout ' . $tab_layout . '">';
-        echo $before_widget;
-        $loc_terms = geodir_get_current_location_terms();
-        if (!empty($loc_terms)) {
-            $cur_location = ' : ' . geodir_ucwords(str_replace('-', ' ', end($loc_terms)));
-        } else {
-            $cur_location = '';
-        }
-
-        /**
-         * Filter the current location name.
-         *
-         * @since 1.3.9
-         *
-         * @param string $cur_location Current location name.
-         */
-        $cur_location = apply_filters('bestof_widget_cur_location', $cur_location);
-
-        /**
-         * Filter the widget title.
-         *
-         * @since 1.3.9
-         *
-         * @param string $instance ['title'] The widget title.
-         */
-        $title = empty($instance['title']) ? wp_sprintf(__('Best of %s', 'geodirectory'), get_bloginfo('name') . $cur_location) : apply_filters('bestof_widget_title', __($instance['title'], 'geodirectory'));
-
-        /**
-         * Filter the post type.
-         *
-         * @since 1.3.9
-         *
-         * @param string $instance ['post_type'] The post type.
-         */
-        $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('bestof_widget_post_type', $instance['post_type']);
-
-        /**
-         * Filter the excerpt type.
-         *
-         * @since 1.5.4
-         *
-         * @param string $instance ['excerpt_type'] The excerpt type.
-         */
-        $excerpt_type = empty($instance['excerpt_type']) ? 'show-desc' : apply_filters('bestof_widget_excerpt_type', $instance['excerpt_type']);
-
-
-        /**
-         * Filter the listing limit.
-         *
-         * @since 1.3.9
-         *
-         * @param int $instance ['post_limit'] No. of posts to display.
-         */
-        $post_limit = empty($instance['post_limit']) ? '5' : apply_filters('bestof_widget_post_limit', $instance['post_limit']);
-
-        /**
-         * Filter the category limit.
-         *
-         * @since 1.3.9
-         *
-         * @param int $instance ['categ_limit'] No. of categories to display.
-         */
-        $categ_limit = empty($instance['categ_limit']) ? '3' : apply_filters('bestof_widget_categ_limit', $instance['categ_limit']);
-        $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false;
-
-        /**
-         * Filter the use of location filter.
-         *
-         * @since 1.3.9
-         *
-         * @param int|bool $instance ['add_location_filter'] Filter listings using current location.
-         */
-        $add_location_filter = empty($instance['add_location_filter']) ? '1' : apply_filters('bestof_widget_location_filter', $instance['add_location_filter']);
-
-        // set post type to current viewing post type
-        if ($use_viewing_post_type) {
-            $current_post_type = geodir_get_current_posttype();
-            if ($current_post_type != '' && $current_post_type != $post_type) {
-                $post_type = $current_post_type;
-            }
-        }
-
-        if (isset($instance['character_count'])) {
-            /**
-             * Filter the widget's excerpt character count.
-             *
-             * @since 1.3.9
-             *
-             * @param int $instance ['character_count'] Excerpt character count.
-             */
-            $character_count = apply_filters('bestof_widget_list_character_count', $instance['character_count']);
-        } else {
-            $character_count = '';
-        }
-
-        $category_taxonomy = geodir_get_taxonomies($post_type);
-
-        $term_args = array(
-            'hide_empty' => true,
-            'parent' => 0
-        );
-
-        if (is_tax()) {
-            $taxonomy = get_query_var('taxonomy');
-            $cur_term = get_query_var('term');
-            $term_data = get_term_by('name', $cur_term, $taxonomy);
-            $term_args['parent'] = $term_data->term_id;
-        }
-
-        $terms = get_terms($category_taxonomy[0], $term_args);
-
-        $term_reviews = geodir_count_reviews_by_terms();
-        $a_terms = array();
-        foreach ($terms as $term) {
-
-
-            if ($term->count > 0) {
-                if (isset($term_reviews[$term->term_id])) {
-                    $term->review_count = $term_reviews[$term->term_id];
-                } else {
-                    $term->review_count = '0';
-                }
-
-                $a_terms[] = $term;
-            }
-
-        }
-
-
-        $terms = geodir_sort_terms($a_terms, 'review_count');
-
-        $query_args = array(
-            'posts_per_page' => $post_limit,
-            'is_geodir_loop' => true,
-            'post_type' => $post_type,
-            'gd_location' => $add_location_filter ? true : false,
-            'order_by' => 'high_review'
-        );
-        if ($character_count >= 0) {
-            $query_args['excerpt_length'] = $character_count;
-        }
-
-        $layout = array();
-        if ($tab_layout == 'bestof-tabs-as-dropdown') {
-            $layout[] = $tab_layout;
-        } else {
-            $layout[] = 'bestof-tabs-as-dropdown';
-            $layout[] = $tab_layout;
-        }
-
-
-        echo $before_title . __($title,'geodirectory') . $after_title;
-
-        //term navigation - start
-        echo '<div class="geodir-tabs gd-bestof-tabs" id="gd-bestof-tabs" style="position:relative;">';
-
-        $final_html = '';
-        foreach ($layout as $tab_layout) {
-            $nav_html = '';
-            $is_dropdown = ($tab_layout == 'bestof-tabs-as-dropdown') ? true : false;
-
-            if ($is_dropdown) {
-                $nav_html .= '<select id="geodir_bestof_tab_dd" class="chosen_select" name="geodir_bestof_tab_dd" data-placeholder="' . esc_attr(__('Select Category', 'geodirectory')) . '">';
-            } else {
-                $nav_html .= '<dl class="geodir-tab-head geodir-bestof-cat-list">';
-                $nav_html .= '<dt></dt>';
-            }
-
-
-            $term_icon = geodir_get_term_icon();
-            $cat_count = 0;
-            if (!empty($terms)) {
-                foreach ($terms as $cat) {
-                    $cat_count++;
-                    if ($cat_count > $categ_limit) {
-                        break;
-                    }
-                    if ($is_dropdown) {
-                        $selected = ($cat_count == 1) ? 'selected="selected"' : '';
-                        $nav_html .= '<option ' . $selected . ' value="' . $cat->term_id . '">' . geodir_ucwords($cat->name) . '</option>';
-                    } else {
-                        if ($cat_count == 1) {
-                            $nav_html .= '<dd class="geodir-tab-active">';
-                        } else {
-                            $nav_html .= '<dd class="">';
-                        }
-                        $term_icon_url = !empty($term_icon) && isset($term_icon[$cat->term_id]) ? $term_icon[$cat->term_id] : '';
-                        $nav_html .= '<a data-termid="' . $cat->term_id . '" href="' . get_term_link($cat, $cat->taxonomy) . '">';
-                        $nav_html .= '<img alt="' . $cat->name . ' icon" class="bestof-cat-icon" src="' . $term_icon_url . '"/>';
-                        $nav_html .= '<span>';
-                        $nav_html .= geodir_ucwords($cat->name);
-                        $nav_html .= '<small>';
-                        if (isset($cat->review_count)) {
-                            $num_reviews = $cat->review_count;
-                            if ($num_reviews == 0) {
-                                $reviews = __('No Reviews', 'geodirectory');
-                            } elseif ($num_reviews > 1) {
-                                $reviews = $num_reviews . __(' Reviews', 'geodirectory');
-                            } else {
-                                $reviews = __('1 Review', 'geodirectory');
-                            }
-                            $nav_html .= $reviews;
-                        }
-                        $nav_html .= '</small>';
-                        $nav_html .= '</span>';
-                        $nav_html .= '</a>';
-                        $nav_html .= '</dd>';
-                    }
-                }
-            }
-
-            if ($is_dropdown) {
-                $nav_html .= '</select>';
-            } else {
-                $nav_html .= '</dl>';
-            }
-            $final_html .= $nav_html;
-        }
-        if ($terms) {
-            echo $final_html;
-        }
-        echo '</div>';
-        //term navigation - end
-
-        //first term listings by default - start
-        $first_term = '';
-        if ($terms) {
-            $first_term = $terms[0];
-            $tax_query = array(
-                'taxonomy' => $category_taxonomy[0],
-                'field' => 'id',
-                'terms' => $first_term->term_id
-            );
-            $query_args['tax_query'] = array($tax_query);
-        }
-
-        ?>
+	/**
+	 * Register the best of widget with WordPress.
+	 *
+	 * @since 1.3.9
+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
+	 */
+	public function __construct()
+	{
+		$widget_ops = array('classname' => 'geodir_bestof_widget', 'description' => __('GD > Best of widget', 'geodirectory'));
+		parent::__construct(
+			'bestof_widget', // Base ID
+			__('GD > Best of widget', 'geodirectory'), // Name
+			$widget_ops// Args
+		);
+	}
+
+	/**
+	 * Front-end display content for best of widget.
+	 *
+	 * @since 1.3.9
+	 * @since 1.5.1 Added filter to view all link.
+	 * @since 1.5.1 Declare function public.
+	 *
+	 * @param array $args Widget arguments.
+	 * @param array $instance Saved values from database.
+	 */
+	public function widget($args, $instance)
+	{
+		extract($args);
+		/**
+		 * Filter the best of widget tab layout.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param string $instance ['tab_layout'] Best of widget tab layout name.
+		 */
+		$tab_layout = empty($instance['tab_layout']) ? 'bestof-tabs-on-top' : apply_filters('bestof_widget_tab_layout', $instance['tab_layout']);
+		echo '<div class="bestof-widget-tab-layout ' . $tab_layout . '">';
+		echo $before_widget;
+		$loc_terms = geodir_get_current_location_terms();
+		if (!empty($loc_terms)) {
+			$cur_location = ' : ' . geodir_ucwords(str_replace('-', ' ', end($loc_terms)));
+		} else {
+			$cur_location = '';
+		}
+
+		/**
+		 * Filter the current location name.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param string $cur_location Current location name.
+		 */
+		$cur_location = apply_filters('bestof_widget_cur_location', $cur_location);
+
+		/**
+		 * Filter the widget title.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param string $instance ['title'] The widget title.
+		 */
+		$title = empty($instance['title']) ? wp_sprintf(__('Best of %s', 'geodirectory'), get_bloginfo('name') . $cur_location) : apply_filters('bestof_widget_title', __($instance['title'], 'geodirectory'));
+
+		/**
+		 * Filter the post type.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param string $instance ['post_type'] The post type.
+		 */
+		$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('bestof_widget_post_type', $instance['post_type']);
+
+		/**
+		 * Filter the excerpt type.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param string $instance ['excerpt_type'] The excerpt type.
+		 */
+		$excerpt_type = empty($instance['excerpt_type']) ? 'show-desc' : apply_filters('bestof_widget_excerpt_type', $instance['excerpt_type']);
+
+
+		/**
+		 * Filter the listing limit.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param int $instance ['post_limit'] No. of posts to display.
+		 */
+		$post_limit = empty($instance['post_limit']) ? '5' : apply_filters('bestof_widget_post_limit', $instance['post_limit']);
+
+		/**
+		 * Filter the category limit.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param int $instance ['categ_limit'] No. of categories to display.
+		 */
+		$categ_limit = empty($instance['categ_limit']) ? '3' : apply_filters('bestof_widget_categ_limit', $instance['categ_limit']);
+		$use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false;
+
+		/**
+		 * Filter the use of location filter.
+		 *
+		 * @since 1.3.9
+		 *
+		 * @param int|bool $instance ['add_location_filter'] Filter listings using current location.
+		 */
+		$add_location_filter = empty($instance['add_location_filter']) ? '1' : apply_filters('bestof_widget_location_filter', $instance['add_location_filter']);
+
+		// set post type to current viewing post type
+		if ($use_viewing_post_type) {
+			$current_post_type = geodir_get_current_posttype();
+			if ($current_post_type != '' && $current_post_type != $post_type) {
+				$post_type = $current_post_type;
+			}
+		}
+
+		if (isset($instance['character_count'])) {
+			/**
+			 * Filter the widget's excerpt character count.
+			 *
+			 * @since 1.3.9
+			 *
+			 * @param int $instance ['character_count'] Excerpt character count.
+			 */
+			$character_count = apply_filters('bestof_widget_list_character_count', $instance['character_count']);
+		} else {
+			$character_count = '';
+		}
+
+		$category_taxonomy = geodir_get_taxonomies($post_type);
+
+		$term_args = array(
+			'hide_empty' => true,
+			'parent' => 0
+		);
+
+		if (is_tax()) {
+			$taxonomy = get_query_var('taxonomy');
+			$cur_term = get_query_var('term');
+			$term_data = get_term_by('name', $cur_term, $taxonomy);
+			$term_args['parent'] = $term_data->term_id;
+		}
+
+		$terms = get_terms($category_taxonomy[0], $term_args);
+
+		$term_reviews = geodir_count_reviews_by_terms();
+		$a_terms = array();
+		foreach ($terms as $term) {
+
+
+			if ($term->count > 0) {
+				if (isset($term_reviews[$term->term_id])) {
+					$term->review_count = $term_reviews[$term->term_id];
+				} else {
+					$term->review_count = '0';
+				}
+
+				$a_terms[] = $term;
+			}
+
+		}
+
+
+		$terms = geodir_sort_terms($a_terms, 'review_count');
+
+		$query_args = array(
+			'posts_per_page' => $post_limit,
+			'is_geodir_loop' => true,
+			'post_type' => $post_type,
+			'gd_location' => $add_location_filter ? true : false,
+			'order_by' => 'high_review'
+		);
+		if ($character_count >= 0) {
+			$query_args['excerpt_length'] = $character_count;
+		}
+
+		$layout = array();
+		if ($tab_layout == 'bestof-tabs-as-dropdown') {
+			$layout[] = $tab_layout;
+		} else {
+			$layout[] = 'bestof-tabs-as-dropdown';
+			$layout[] = $tab_layout;
+		}
+
+
+		echo $before_title . __($title,'geodirectory') . $after_title;
+
+		//term navigation - start
+		echo '<div class="geodir-tabs gd-bestof-tabs" id="gd-bestof-tabs" style="position:relative;">';
+
+		$final_html = '';
+		foreach ($layout as $tab_layout) {
+			$nav_html = '';
+			$is_dropdown = ($tab_layout == 'bestof-tabs-as-dropdown') ? true : false;
+
+			if ($is_dropdown) {
+				$nav_html .= '<select id="geodir_bestof_tab_dd" class="chosen_select" name="geodir_bestof_tab_dd" data-placeholder="' . esc_attr(__('Select Category', 'geodirectory')) . '">';
+			} else {
+				$nav_html .= '<dl class="geodir-tab-head geodir-bestof-cat-list">';
+				$nav_html .= '<dt></dt>';
+			}
+
+
+			$term_icon = geodir_get_term_icon();
+			$cat_count = 0;
+			if (!empty($terms)) {
+				foreach ($terms as $cat) {
+					$cat_count++;
+					if ($cat_count > $categ_limit) {
+						break;
+					}
+					if ($is_dropdown) {
+						$selected = ($cat_count == 1) ? 'selected="selected"' : '';
+						$nav_html .= '<option ' . $selected . ' value="' . $cat->term_id . '">' . geodir_ucwords($cat->name) . '</option>';
+					} else {
+						if ($cat_count == 1) {
+							$nav_html .= '<dd class="geodir-tab-active">';
+						} else {
+							$nav_html .= '<dd class="">';
+						}
+						$term_icon_url = !empty($term_icon) && isset($term_icon[$cat->term_id]) ? $term_icon[$cat->term_id] : '';
+						$nav_html .= '<a data-termid="' . $cat->term_id . '" href="' . get_term_link($cat, $cat->taxonomy) . '">';
+						$nav_html .= '<img alt="' . $cat->name . ' icon" class="bestof-cat-icon" src="' . $term_icon_url . '"/>';
+						$nav_html .= '<span>';
+						$nav_html .= geodir_ucwords($cat->name);
+						$nav_html .= '<small>';
+						if (isset($cat->review_count)) {
+							$num_reviews = $cat->review_count;
+							if ($num_reviews == 0) {
+								$reviews = __('No Reviews', 'geodirectory');
+							} elseif ($num_reviews > 1) {
+								$reviews = $num_reviews . __(' Reviews', 'geodirectory');
+							} else {
+								$reviews = __('1 Review', 'geodirectory');
+							}
+							$nav_html .= $reviews;
+						}
+						$nav_html .= '</small>';
+						$nav_html .= '</span>';
+						$nav_html .= '</a>';
+						$nav_html .= '</dd>';
+					}
+				}
+			}
+
+			if ($is_dropdown) {
+				$nav_html .= '</select>';
+			} else {
+				$nav_html .= '</dl>';
+			}
+			$final_html .= $nav_html;
+		}
+		if ($terms) {
+			echo $final_html;
+		}
+		echo '</div>';
+		//term navigation - end
+
+		//first term listings by default - start
+		$first_term = '';
+		if ($terms) {
+			$first_term = $terms[0];
+			$tax_query = array(
+				'taxonomy' => $category_taxonomy[0],
+				'field' => 'id',
+				'terms' => $first_term->term_id
+			);
+			$query_args['tax_query'] = array($tax_query);
+		}
+
+		?>
         <input type="hidden" id="bestof_widget_post_type" name="bestof_widget_post_type"
                value="<?php echo $post_type; ?>">
         <input type="hidden" id="bestof_widget_excerpt_type" name="bestof_widget_excerpt_type"
@@ -298,110 +298,110 @@ 
                value="<?php echo $category_taxonomy[0]; ?>">
         <input type="hidden" id="bestof_widget_location_filter" name="bestof_widget_location_filter"
                value="<?php if ($add_location_filter) {
-                   echo 1;
-               } else {
-                   echo 0;
-               } ?>">
+				   echo 1;
+			   } else {
+				   echo 0;
+			   } ?>">
         <input type="hidden" id="bestof_widget_char_count" name="bestof_widget_char_count"
                value="<?php echo $character_count; ?>">
         <div class="geo-bestof-contentwrap geodir-tabs-content" style="position: relative; z-index: 0;">
             <p id="geodir-bestof-loading" class="geodir-bestof-loading"><i class="fa fa-cog fa-spin"></i></p>
             <?php
-            echo '<div id="geodir-bestof-places">';
-            if ($terms) {
-                $view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($first_term, $first_term->taxonomy));
-                /**
-                 * Filter the page link to view all lisitngs.
-                 *
-                 * @since 1.5.1
-                 *
-                 * @param array $view_all_link View all listings page link.
-                 * @param array $post_type The Post type.
-                 * @param array $first_term The category term object.
-                 */
-                $view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $first_term);
-
-                echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $first_term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
-            }
-            if ($excerpt_type == 'show-reviews') {
-                add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-            }
-            geodir_bestof_places_by_term($query_args);
-            if ($excerpt_type == 'show-reviews') {
-                remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-            }
-            echo "</div>";
-            ?>
+			echo '<div id="geodir-bestof-places">';
+			if ($terms) {
+				$view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($first_term, $first_term->taxonomy));
+				/**
+				 * Filter the page link to view all lisitngs.
+				 *
+				 * @since 1.5.1
+				 *
+				 * @param array $view_all_link View all listings page link.
+				 * @param array $post_type The Post type.
+				 * @param array $first_term The category term object.
+				 */
+				$view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $first_term);
+
+				echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $first_term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
+			}
+			if ($excerpt_type == 'show-reviews') {
+				add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+			}
+			geodir_bestof_places_by_term($query_args);
+			if ($excerpt_type == 'show-reviews') {
+				remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+			}
+			echo "</div>";
+			?>
         </div>
         <?php //first term listings by default - end
-        ?>
+		?>
         <?php echo $after_widget;
-        echo "</div>";
-    }
-
-    /**
-     * Sanitize best of widget form values as they are saved.
-     *
-     * @since 1.3.9
-     * @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)
-    {
-        $instance = $old_instance;
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['post_type'] = strip_tags($new_instance['post_type']);
-        $instance['post_limit'] = strip_tags($new_instance['post_limit']);
-        $instance['categ_limit'] = strip_tags($new_instance['categ_limit']);
-        $instance['character_count'] = $new_instance['character_count'];
-        $instance['tab_layout'] = $new_instance['tab_layout'];
-        $instance['excerpt_type'] = $new_instance['excerpt_type'];
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
-        else
-            $instance['add_location_filter'] = '0';
-        $instance['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;
-        return $instance;
-    }
-
-    /**
-     * Back-end best of widget settings form.
-     *
-     * @since 1.3.9
-     * @since 1.5.1 Declare function public.
-     *
-     * @param array $instance Previously saved values from database.
-     */
-    public function form($instance)
-    {
-        $instance = wp_parse_args((array)$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' => ''
-            )
-        );
-        $title = strip_tags($instance['title']);
-        $post_type = strip_tags($instance['post_type']);
-        $post_limit = strip_tags($instance['post_limit']);
-        $categ_limit = strip_tags($instance['categ_limit']);
-        $character_count = strip_tags($instance['character_count']);
-        $tab_layout = strip_tags($instance['tab_layout']);
-        $excerpt_type = strip_tags($instance['excerpt_type']);
-        $add_location_filter = strip_tags($instance['add_location_filter']);
-        $use_viewing_post_type = isset($instance['use_viewing_post_type']) && $instance['use_viewing_post_type'] ? true : false;
-
-        ?>
+		echo "</div>";
+	}
+
+	/**
+	 * Sanitize best of widget form values as they are saved.
+	 *
+	 * @since 1.3.9
+	 * @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)
+	{
+		$instance = $old_instance;
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['post_type'] = strip_tags($new_instance['post_type']);
+		$instance['post_limit'] = strip_tags($new_instance['post_limit']);
+		$instance['categ_limit'] = strip_tags($new_instance['categ_limit']);
+		$instance['character_count'] = $new_instance['character_count'];
+		$instance['tab_layout'] = $new_instance['tab_layout'];
+		$instance['excerpt_type'] = $new_instance['excerpt_type'];
+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+		else
+			$instance['add_location_filter'] = '0';
+		$instance['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;
+		return $instance;
+	}
+
+	/**
+	 * Back-end best of widget settings form.
+	 *
+	 * @since 1.3.9
+	 * @since 1.5.1 Declare function public.
+	 *
+	 * @param array $instance Previously saved values from database.
+	 */
+	public function form($instance)
+	{
+		$instance = wp_parse_args((array)$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' => ''
+			)
+		);
+		$title = strip_tags($instance['title']);
+		$post_type = strip_tags($instance['post_type']);
+		$post_limit = strip_tags($instance['post_limit']);
+		$categ_limit = strip_tags($instance['categ_limit']);
+		$character_count = strip_tags($instance['character_count']);
+		$tab_layout = strip_tags($instance['tab_layout']);
+		$excerpt_type = strip_tags($instance['excerpt_type']);
+		$add_location_filter = strip_tags($instance['add_location_filter']);
+		$use_viewing_post_type = isset($instance['use_viewing_post_type']) && $instance['use_viewing_post_type'] ? true : false;
+
+		?>
         <p>
             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
 
@@ -416,14 +416,14 @@ 
                 for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory');?>
 
                 <?php $postypes = geodir_get_posttypes();
-                /**
-                 * Filter the post types to display in widget.
-                 *
-                 * @since 1.3.9
-                 *
-                 * @param array $postypes Post types array.
-                 */
-                $postypes = apply_filters('geodir_post_type_list_in_p_widget', $postypes); ?>
+				/**
+				 * Filter the post types to display in widget.
+				 *
+				 * @since 1.3.9
+				 *
+				 * @param array $postypes Post types array.
+				 */
+				$postypes = apply_filters('geodir_post_type_list_in_p_widget', $postypes); ?>
 
                 <select class="widefat" id="<?php echo $this->get_field_id('post_type'); ?>"
                         name="<?php echo $this->get_field_name('post_type'); ?>"
@@ -432,9 +432,9 @@ 
                     <?php foreach ($postypes as $postypes_obj) { ?>
 
                         <option <?php if ($post_type == $postypes_obj) {
-                            echo 'selected="selected"';
-                        } ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);
-                            echo ucfirst($extvalue[1]); ?></option>
+							echo 'selected="selected"';
+						} ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);
+							echo ucfirst($extvalue[1]); ?></option>
 
                     <?php } ?>
 
@@ -480,14 +480,14 @@ 
                         name="<?php echo $this->get_field_name('tab_layout'); ?>">
 
                     <option <?php if ($tab_layout == 'bestof-tabs-on-top') {
-                        echo 'selected="selected"';
-                    } ?> value="bestof-tabs-on-top"><?php _e('Tabs on Top', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="bestof-tabs-on-top"><?php _e('Tabs on Top', 'geodirectory'); ?></option>
                     <option <?php if ($tab_layout == 'bestof-tabs-on-left') {
-                        echo 'selected="selected"';
-                    } ?> value="bestof-tabs-on-left"><?php _e('Tabs on Left', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="bestof-tabs-on-left"><?php _e('Tabs on Left', 'geodirectory'); ?></option>
                     <option <?php if ($tab_layout == 'bestof-tabs-as-dropdown') {
-                        echo 'selected="selected"';
-                    } ?>
+						echo 'selected="selected"';
+					} ?>
                         value="bestof-tabs-as-dropdown"><?php _e('Tabs as Dropdown', 'geodirectory'); ?></option>
                 </select>
             </label>
@@ -501,11 +501,11 @@ 
                         name="<?php echo $this->get_field_name('excerpt_type'); ?>">
 
                     <option <?php if ($excerpt_type == 'show-desc') {
-                        echo 'selected="selected"';
-                    } ?> value="show-desc"><?php _e('Show Description', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="show-desc"><?php _e('Show Description', 'geodirectory'); ?></option>
                     <option <?php if ($excerpt_type == 'show-reviews') {
-                        echo 'selected="selected"';
-                    } ?> value="show-reviews"><?php _e('Show Reviews if Available', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="show-reviews"><?php _e('Show Reviews if Available', 'geodirectory'); ?></option>
                 </select>
             </label>
         </p>
@@ -524,12 +524,12 @@ 
                 for="<?php echo $this->get_field_id('use_viewing_post_type'); ?>"><?php _e('Use current viewing post type:', 'geodirectory'); ?>
                 <input type="checkbox" id="<?php echo $this->get_field_id('use_viewing_post_type'); ?>"
                        name="<?php echo $this->get_field_name('use_viewing_post_type'); ?>" <?php if ($use_viewing_post_type) {
-                    echo 'checked="checked"';
-                } ?>  value="1"/>
+					echo 'checked="checked"';
+				} ?>  value="1"/>
             </label>
         </p>
     <?php
-    }
+	}
 } // class geodir_bestof_widget
 
 register_widget('geodir_bestof_widget');
@@ -549,68 +549,68 @@ 
  */
 function geodir_bestof_places_by_term($query_args)
 {
-    global $gd_session;
-
-    /**
-     * This action called before querying widget listings.
-     *
-     * @since 1.0.0
-     */
-    do_action('geodir_bestof_get_widget_listings_before');
-
-    $widget_listings = geodir_get_widget_listings($query_args);
-
-    /**
-     * This action called after querying widget listings.
-     *
-     * @since 1.0.0
-     */
-    do_action('geodir_bestof_get_widget_listings_after');
-
-    $character_count = isset($query_args['excerpt_length']) ? $query_args['excerpt_length'] : '';
-
-    if (!isset($character_count)) {
-        /** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
-        $character_count = $character_count == '' ? 50 : apply_filters('bestof_widget_character_count', $character_count);
-    }
-
-    /** This filter is documented in geodirectory-functions/general_functions.php */
-    $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
-
-    global $post, $map_jason, $map_canvas_arr, $gridview_columns_widget, $geodir_is_widget_listing;
-    $current_post = $post;
-    $current_map_jason = $map_jason;
-    $current_map_canvas_arr = $map_canvas_arr;
-    $current_grid_view = $gridview_columns_widget;
-    $gridview_columns_widget = null;
-
-    $gd_listing_view_set = $gd_session->get('gd_listing_view') ? true : false;
-    $gd_listing_view_old = $gd_listing_view_set ? $gd_session->get('gd_listing_view') : '';
-
-    $gd_session->set('gd_listing_view', '1');
-    $geodir_is_widget_listing = true;
-
-    /**
-     * Includes the template for the listing listview.
-     *
-     * @since 1.3.9
-     */
-    include($template);
-
-    $geodir_is_widget_listing = false;
-
-    $GLOBALS['post'] = $current_post;
-    if (!empty($current_post)) {
-        setup_postdata($current_post);
-    }
-    if ($gd_listing_view_set) { // Set back previous value
-        $gd_session->set('gd_listing_view', $gd_listing_view_old);
-    } else {
-        $gd_session->un_set('gd_listing_view');
-    }
-    $map_jason = $current_map_jason;
-    $map_canvas_arr = $current_map_canvas_arr;
-    $gridview_columns_widget = $current_grid_view;
+	global $gd_session;
+
+	/**
+	 * This action called before querying widget listings.
+	 *
+	 * @since 1.0.0
+	 */
+	do_action('geodir_bestof_get_widget_listings_before');
+
+	$widget_listings = geodir_get_widget_listings($query_args);
+
+	/**
+	 * This action called after querying widget listings.
+	 *
+	 * @since 1.0.0
+	 */
+	do_action('geodir_bestof_get_widget_listings_after');
+
+	$character_count = isset($query_args['excerpt_length']) ? $query_args['excerpt_length'] : '';
+
+	if (!isset($character_count)) {
+		/** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
+		$character_count = $character_count == '' ? 50 : apply_filters('bestof_widget_character_count', $character_count);
+	}
+
+	/** This filter is documented in geodirectory-functions/general_functions.php */
+	$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
+
+	global $post, $map_jason, $map_canvas_arr, $gridview_columns_widget, $geodir_is_widget_listing;
+	$current_post = $post;
+	$current_map_jason = $map_jason;
+	$current_map_canvas_arr = $map_canvas_arr;
+	$current_grid_view = $gridview_columns_widget;
+	$gridview_columns_widget = null;
+
+	$gd_listing_view_set = $gd_session->get('gd_listing_view') ? true : false;
+	$gd_listing_view_old = $gd_listing_view_set ? $gd_session->get('gd_listing_view') : '';
+
+	$gd_session->set('gd_listing_view', '1');
+	$geodir_is_widget_listing = true;
+
+	/**
+	 * Includes the template for the listing listview.
+	 *
+	 * @since 1.3.9
+	 */
+	include($template);
+
+	$geodir_is_widget_listing = false;
+
+	$GLOBALS['post'] = $current_post;
+	if (!empty($current_post)) {
+		setup_postdata($current_post);
+	}
+	if ($gd_listing_view_set) { // Set back previous value
+		$gd_session->set('gd_listing_view', $gd_listing_view_old);
+	} else {
+		$gd_session->un_set('gd_listing_view');
+	}
+	$map_jason = $current_map_jason;
+	$map_canvas_arr = $current_map_canvas_arr;
+	$gridview_columns_widget = $current_grid_view;
 }
 
 //Ajax functions
@@ -627,51 +627,51 @@ 
  */
 function geodir_bestof_callback()
 {
-    check_ajax_referer('geodir-bestof-nonce', 'geodir_bestof_nonce');
-    //set variables
-    $post_type = strip_tags(esc_sql($_POST['post_type']));
-    $post_limit = strip_tags(esc_sql($_POST['post_limit']));
-    $character_count = strip_tags(esc_sql($_POST['char_count']));
-    $taxonomy = strip_tags(esc_sql($_POST['taxonomy']));
-    $add_location_filter = strip_tags(esc_sql($_POST['add_location_filter']));
-    $term_id = strip_tags(esc_sql($_POST['term_id']));
-    $excerpt_type = strip_tags(esc_sql($_POST['excerpt_type']));
-
-    $query_args = array(
-        'posts_per_page' => $post_limit,
-        'is_geodir_loop' => true,
-        'post_type' => $post_type,
-        'gd_location' => $add_location_filter ? true : false,
-        'order_by' => 'high_review'
-    );
-
-    if ($character_count >= 0) {
-        $query_args['excerpt_length'] = $character_count;
-    }
-
-    $tax_query = array(
-        'taxonomy' => $taxonomy,
-        'field' => 'id',
-        'terms' => $term_id
-    );
-
-    $query_args['tax_query'] = array($tax_query);
-    if ($term_id && $taxonomy) {
-        $term = get_term_by('id', $term_id, $taxonomy);
-        $view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($term));
-        /** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
-        $view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $term);
-
-        echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
-    }
-    if ($excerpt_type == 'show-reviews') {
-        add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-    }
-    geodir_bestof_places_by_term($query_args);
-    if ($excerpt_type == 'show-reviews') {
-        remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-    }
-    wp_die();
+	check_ajax_referer('geodir-bestof-nonce', 'geodir_bestof_nonce');
+	//set variables
+	$post_type = strip_tags(esc_sql($_POST['post_type']));
+	$post_limit = strip_tags(esc_sql($_POST['post_limit']));
+	$character_count = strip_tags(esc_sql($_POST['char_count']));
+	$taxonomy = strip_tags(esc_sql($_POST['taxonomy']));
+	$add_location_filter = strip_tags(esc_sql($_POST['add_location_filter']));
+	$term_id = strip_tags(esc_sql($_POST['term_id']));
+	$excerpt_type = strip_tags(esc_sql($_POST['excerpt_type']));
+
+	$query_args = array(
+		'posts_per_page' => $post_limit,
+		'is_geodir_loop' => true,
+		'post_type' => $post_type,
+		'gd_location' => $add_location_filter ? true : false,
+		'order_by' => 'high_review'
+	);
+
+	if ($character_count >= 0) {
+		$query_args['excerpt_length'] = $character_count;
+	}
+
+	$tax_query = array(
+		'taxonomy' => $taxonomy,
+		'field' => 'id',
+		'terms' => $term_id
+	);
+
+	$query_args['tax_query'] = array($tax_query);
+	if ($term_id && $taxonomy) {
+		$term = get_term_by('id', $term_id, $taxonomy);
+		$view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($term));
+		/** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
+		$view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $term);
+
+		echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
+	}
+	if ($excerpt_type == 'show-reviews') {
+		add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+	}
+	geodir_bestof_places_by_term($query_args);
+	if ($excerpt_type == 'show-reviews') {
+		remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+	}
+	wp_die();
 }
 
 //Javascript
@@ -684,8 +684,8 @@ 
  */
 function geodir_bestof_js()
 {
-    $ajax_nonce = wp_create_nonce("geodir-bestof-nonce");
-    ?>
+	$ajax_nonce = wp_create_nonce("geodir-bestof-nonce");
+	?>
     <script type="text/javascript">
         jQuery(document).ready(function () {
             jQuery('.geodir-bestof-cat-list a, #geodir_bestof_tab_dd').on("click change", function (e) {
@@ -758,18 +758,18 @@ 
 
 function best_of_show_review_in_excerpt($excerpt)
 {
-    global $wpdb, $post;
-    $review_table = GEODIR_REVIEW_TABLE;
-    $request = "SELECT comment_ID FROM $review_table WHERE post_id = $post->ID ORDER BY post_date DESC, id DESC LIMIT 1";
-    $comments = $wpdb->get_results($request);
-
-    if ($comments) {
-        foreach ($comments as $comment) {
-            // Set the extra comment info needed.
-            $comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");
-            $comment_content = $comment_extra->comment_content;
-            $excerpt = strip_tags($comment_content);
-        }
-    }
-    return $excerpt;
+	global $wpdb, $post;
+	$review_table = GEODIR_REVIEW_TABLE;
+	$request = "SELECT comment_ID FROM $review_table WHERE post_id = $post->ID ORDER BY post_date DESC, id DESC LIMIT 1";
+	$comments = $wpdb->get_results($request);
+
+	if ($comments) {
+		foreach ($comments as $comment) {
+			// Set the extra comment info needed.
+			$comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");
+			$comment_content = $comment_extra->comment_content;
+			$excerpt = strip_tags($comment_content);
+		}
+	}
+	return $excerpt;
 }
\ No newline at end of file

geodirectory_widgets.php

Spacing +16 added lines, -16 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>

@@ -519,7 +519,7 @@ 
                 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>

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

@@ -993,7 +993,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 +893 added lines, -893 removed lines

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

 /**

- * GeoDirectory Widgets

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * GeoDirectory Widgets

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 

 /**

  * Registers GeoDirectory sidebar.

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

+

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

-        }

+			$geodir_sidebars[] = 'geodir_home_top';

+		}

 

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

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

-        }

+			$geodir_sidebars[] = 'geodir_home_content';

+		}

 

-        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_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_left';

-        }

+			$geodir_sidebars[] = 'geodir_home_right';

+		}

 

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

 

-            $geodir_sidebars[] = 'geodir_home_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_home_left';

+		}

 

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

-        /* Home page sidebars end*/

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

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

 

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

-        /* Listing page sidebars start*/

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

+			$geodir_sidebars[] = 'geodir_home_bottom';

+		}

 

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

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

+		/* Home page sidebars end*/

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

 

-            $geodir_sidebars[] = 'geodir_listing_top';

-        }

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

+		/* Listing page sidebars start*/

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

 

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

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

-        }

+			$geodir_sidebars[] = 'geodir_listing_top';

+		}

 

-        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_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_right_sidebar';

-        }

+			$geodir_sidebars[] = 'geodir_listing_left_sidebar';

+		}

 

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

 

-            $geodir_sidebars[] = 'geodir_listing_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_listing_right_sidebar';

+		}

 

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

-        /* Listing page sidebars start*/

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

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

 

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

-        /* Search page sidebars start*/

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

+			$geodir_sidebars[] = 'geodir_listing_bottom';

+		}

 

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

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

+		/* Listing page sidebars start*/

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

 

-            $geodir_sidebars[] = 'geodir_search_top';

-        }

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

+		/* Search page sidebars start*/

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

 

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

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

-        }

+			$geodir_sidebars[] = 'geodir_search_top';

+		}

 

-        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_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_right_sidebar';

-        }

+			$geodir_sidebars[] = 'geodir_search_left_sidebar';

+		}

 

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

 

-            $geodir_sidebars[] = 'geodir_search_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_search_right_sidebar';

+		}

 

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

-        /* Search page sidebars end*/

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

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

 

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

-        /* 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_bottom';

+		}

 

-            $geodir_sidebars[] = 'geodir_detail_top';

-        }

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

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

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

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

+			$geodir_sidebars[] = 'geodir_detail_top';

+		}

 

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

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

-        }

+		$geodir_sidebars[] = 'geodir_detail_sidebar';

 

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

-        /* Detail/Single 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));

 

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

-        /* Author page sidebars start       */

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

+			$geodir_sidebars[] = 'geodir_detail_bottom';

+		}

 

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

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

+		/* Detail/Single page sidebars end*/

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

 

-            $geodir_sidebars[] = 'geodir_author_top';

-        }

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

+		/* Author page sidebars start       */

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

 

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

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

-        }

+			$geodir_sidebars[] = 'geodir_author_top';

+		}

 

-        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_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_right_sidebar';

-        }

+			$geodir_sidebars[] = 'geodir_author_left_sidebar';

+		}

 

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

 

-            $geodir_sidebars[] = 'geodir_author_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_author_right_sidebar';

+		}

 

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

-        /* Author page sidebars end         */

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

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

 

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

-        /* Add listing page sidebars start       */

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

+			$geodir_sidebars[] = 'geodir_author_bottom';

+		}

 

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

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

+		/* Author page sidebars end         */

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

 

-        $geodir_sidebars[] = 'geodir_add_listing_sidebar';

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

+		/* Add listing page sidebars start       */

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

 

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

-        /* Add listing page sidebars end         */

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

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

-            }

-

-            /**

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

+			}

+

+			/**

+			 * 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_template_actions.php

Braces +31 added lines, -24 removed lines

@@ -714,8 +714,9 @@ 
 

                         if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {

                             if ($term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {

-                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '')

-                                    $term_icon = $term_icon_url['src'];

+                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '') {
+                                                                    $term_icon = $term_icon_url['src'];
+                                }
                                 break;

                             }

                         }

@@ -1246,8 +1247,9 @@ 
         echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

     }

 

-    if (isset($taxonomies[$post_type . '_tags']))

-        echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

+    if (isset($taxonomies[$post_type . '_tags'])) {
+            echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';
+    }
 

     ?>

     </p><?php

@@ -1598,23 +1600,21 @@ 
     if(geodir_is_page('pt')){

         $gd_page = 'pt';

         $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

-    }

-    elseif(geodir_is_page('listing')){

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

         $gd_page = 'listing';

         global $wp_query;

         $current_term = $wp_query->get_queried_object();

         if (strpos($current_term->taxonomy,'_tags') !== false) {

             $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

         }

 

-    }

-    elseif(geodir_is_page('author')){

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

         $gd_page = 'author';

         if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -2025,8 +2025,9 @@ 
  */

 function geodir_action_add_listing_page_title()

 {

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

-        $listing_type = sanitize_text_field($_REQUEST['listing_type']);

+    if (isset($_REQUEST['listing_type']) && $_REQUEST['listing_type'] != '') {
+            $listing_type = sanitize_text_field($_REQUEST['listing_type']);
+    }
     /** This action is documented in geodirectory_template_actions.php */

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

     /** This action is documented in geodirectory_template_actions.php */

@@ -2038,7 +2039,7 @@ 
         $gd_page = 'add-listing';

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

             $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

-        }elseif(isset($listing_type)){

+        } elseif(isset($listing_type)){

             $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

         }

 

@@ -2321,8 +2322,9 @@ 
         $totImg = 0;

         if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

             $post = (object)$gd_session->get('listing');

-            if (isset($post->post_images))

-                $curImages = trim($post->post_images, ",");

+            if (isset($post->post_images)) {
+                            $curImages = trim($post->post_images, ",");
+            }
 

 

             if ($curImages != '') {

@@ -2350,10 +2352,13 @@ 
             $totImg = count((array)$thumb_img_arr);

         }

 

-        if ($curImages != '')

-            $svalue = $curImages; // this will be initial value of the above form field. Image urls.

-        else

-            $svalue = '';

+        if ($curImages != '') {
+                    $svalue = $curImages;
+        }
+        // this will be initial value of the above form field. Image urls.

+        else {
+                    $svalue = '';
+        }
 

         $image_limit = $package_info->image_limit;

         $show_image_input_box = ($image_limit != '0');

@@ -2563,8 +2568,9 @@ 
     </script><?php

 

     global $errors;

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

-        $errors->add('claim_login', LOGIN_CLAIM);

+    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim') {
+            $errors->add('claim_login', LOGIN_CLAIM);
+    }
 

     if (!empty($errors)) {

         foreach ($errors as $errorsObj) {

@@ -2668,8 +2674,9 @@ 
 

     if (!empty($term)) {

         $current_term = get_term_by('slug', $term, $taxonomy[0]);

-        if (!empty($current_term))

-            $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

+        if (!empty($current_term)) {
+                    $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";
+        }
     }

 

 

@@ -2687,7 +2694,7 @@ 
         $gd_page = 'author';

         if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

Spacing +78 added lines, -78 removed lines

@@ -676,7 +676,7 @@ 
         }

     }

 

-    $post = (object)$_REQUEST;

+    $post = (object) $_REQUEST;

 

 

     if (isset($post->video)) {

@@ -1019,7 +1019,7 @@ 
                     $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

 

                     if ($image && $width && $height) {

-                        $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

+                        $image = (object) array('src' => $image, 'width' => $width, 'height' => $height);

                     }

 

                     if (isset($image->src)) {

@@ -1052,9 +1052,9 @@ 
                 } else {

                     $spacer_height = ((400 - $image->height) / 2);

                 }

-                $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

+                $caption = ''; //(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

                 $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                $main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

+                $main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />' . $caption . '</li>';

                 $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

                 $slides++;

             }

@@ -1090,7 +1090,7 @@ 
  */

 function geodir_action_details_taxonomies()

 {

-    global $preview, $post;?>

+    global $preview, $post; ?>

     <p class="geodir_post_taxomomies clearfix">

     <?php

     $taxonomies = array();

@@ -1168,12 +1168,12 @@ 
                          * @param string $tag_link The tag link html.

                          * @param object $term The tag term object.

                          */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     } else {

                         $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

                         /** This action is documented in geodirectory-template_actions.php */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     }

                     $terms[] = $term;

@@ -1183,7 +1183,7 @@ 
             if (!isset($listing_label)) {

                 $listing_label = '';

             }

-            $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+            $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);

         endif;

 

     }

@@ -1219,7 +1219,7 @@ 
                          * @param string $term_link The link html to the category.

                          * @param object $term The category term object.

                          */

-                        $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

+                        $term_link = apply_filters('geodir_details_taxonomies_cat_link', $term_link, $term);

                         $links[] = $term_link;

                         $terms[] = $term;

                     }

@@ -1237,7 +1237,7 @@ 
         if (!isset($listing_label)) {

             $listing_label = '';

         }

-        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);

 

     }

 

@@ -1250,7 +1250,7 @@ 
      * @param string $listing_label The post type label.

      * @param string $listing_label The post type label with ucwords function.

      */

-    $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

+    $taxonomies = apply_filters('geodir_details_taxonomies_output', $taxonomies, $post_type, $listing_label, geodir_ucwords($listing_label));

 

     if (isset($taxonomies[$post_taxonomy])) {

         echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

@@ -1278,11 +1278,11 @@ 
  * @param object $post Optional. The post object or blank.

  * @package GeoDirectory

  */

-function geodir_action_details_micordata($post='')

+function geodir_action_details_micordata($post = '')

 {

 

     global $preview;

-    if(empty($post)){global $post;}

+    if (empty($post)) {global $post; }

     if ($preview || !geodir_is_page('detail')) {

         return;

     }

@@ -1303,7 +1303,7 @@ 
                 "description" => $review->comment_content,

                 "reviewRating" => array(

                     "@type" => "Rating",

-                    "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

+                    "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

                     "ratingValue" => geodir_get_commentoverall($review->comment_ID),

                     "worstRating" => "1"

                 )

@@ -1331,13 +1331,13 @@ 
     }

     //print_r($post);

     // external links

-    $external_links =  array();

+    $external_links = array();

     $external_links[] = $post->geodir_website;

     $external_links[] = $post->geodir_twitter;

     $external_links[] = $post->geodir_facebook;

     $external_links = array_filter($external_links);

 

-    if(!empty($external_links)){

+    if (!empty($external_links)) {

         $external_links = array_values($external_links);

     }

 

@@ -1347,16 +1347,16 @@ 
 

     // schema type

     $schema_type = 'LocalBusiness';

-    if(isset($post->default_category) && $post->default_category){

+    if (isset($post->default_category) && $post->default_category) {

         $schema_type = get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

-        if(!$schema_type && $post->post_type=='gd_event'){$schema_type = 'Event';}

+        if (!$schema_type && $post->post_type == 'gd_event') {$schema_type = 'Event'; }

     }

 

     $schema = array();

     $schema['@context'] = "http://schema.org";

     $schema['@type'] = $schema_type;

     $schema['name'] = $post->post_name;

-    $schema['description'] = wp_strip_all_tags( $post->post_content, true );

+    $schema['description'] = wp_strip_all_tags($post->post_content, true);

     $schema['telephone'] = $post->geodir_contact;

     $schema['url'] = $c_url;

     $schema['sameAs'] = $external_links;

@@ -1370,7 +1370,7 @@ 
         "postalCode" => $post->post_zip

     );

 

-    if($post->post_latitude && $post->post_longitude) {

+    if ($post->post_latitude && $post->post_longitude) {

         $schema['geo'] = array(

             "@type" => "GeoCoordinates",

             "latitude" => $post->post_latitude,

@@ -1378,7 +1378,7 @@ 
         );

     }

 

-    if($post_avgratings) {

+    if ($post_avgratings) {

         $schema['aggregateRating'] = array(

             "@type" => "AggregateRating",

             "ratingValue" => $post_avgratings,

@@ -1397,7 +1397,7 @@ 
      * @param array $schema The array of schema data to be filtered.

      * @param object $post The post object.

      */

-    $schema = apply_filters('geodir_details_schema', $schema,$post);

+    $schema = apply_filters('geodir_details_schema', $schema, $post);

 

 

     echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

@@ -1605,26 +1605,26 @@ 
 

 

     $title = $list_title;

-    if(geodir_is_page('pt')){

+    if (geodir_is_page('pt')) {

         $gd_page = 'pt';

-        $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

+        $title = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

     }

-    elseif(geodir_is_page('listing')){

+    elseif (geodir_is_page('listing')) {

         $gd_page = 'listing';

         global $wp_query;

         $current_term = $wp_query->get_queried_object();

-        if (strpos($current_term->taxonomy,'_tags') !== false) {

+        if (strpos($current_term->taxonomy, '_tags') !== false) {

             $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

         }

 

     }

-    elseif(geodir_is_page('author')){

+    elseif (geodir_is_page('author')) {

         $gd_page = 'author';

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

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -1638,7 +1638,7 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

     echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

         /**

@@ -1683,7 +1683,7 @@ 
         if ($cat_description) {

             ?>

 

-            <div class="term_description"><?php echo $cat_description;?></div> <?php

+            <div class="term_description"><?php echo $cat_description; ?></div> <?php

         }

 

     }

@@ -1968,7 +1968,7 @@ 
      */

     do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');

     $extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');

-    echo '<div class="clearfix '.$extra_class.'">';

+    echo '<div class="clearfix ' . $extra_class . '">';

     /**

      * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages.

      *

@@ -2044,11 +2044,11 @@ 
 

     $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

 

-    if(geodir_is_page('add-listing')){

+    if (geodir_is_page('add-listing')) {

         $gd_page = 'add-listing';

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

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

             $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

-        }elseif(isset($listing_type)){

+        }elseif (isset($listing_type)) {

             $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

         }

 

@@ -2062,7 +2062,7 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

     echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

     echo $title;

@@ -2078,7 +2078,7 @@ 
  */

 function geodir_action_add_listing_page_mandatory()

 {?>

-    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT;?></p>

+    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT; ?></p>

 <?php

 }

 

@@ -2113,7 +2113,7 @@ 
 

     if (isset($_REQUEST['backandedit'])) {

         global $post;

-        $post = (object)$gd_session->get('listing');

+        $post = (object) $gd_session->get('listing');

         $listing_type = $post->listing_type;

         $title = $post->post_title;

         $desc = $post->post_desc;

@@ -2145,15 +2145,15 @@ 
         $user_login = true;

     }

     ?>

-    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>" method="post" enctype="multipart/form-data">

-        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/>

-        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/>

+    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id()); ?>" method="post" enctype="multipart/form-data">

+        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type); ?>"/>

+        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type); ?>"/>

         <?php if ($page_id) { ?>

-        <input type="hidden" name="add_listing_page_id" value="<?php echo $page_id;?>"/>

+        <input type="hidden" name="add_listing_page_id" value="<?php echo $page_id; ?>"/>

         <?php } if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { ?>

-            <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']);?>"/>

+            <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']); ?>"/>

         <?php } if (isset($_REQUEST['backandedit'])) { ?>

-            <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/>

+            <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']); ?>"/>

         <?php

         } 

         /**

@@ -2165,7 +2165,7 @@ 
          */

         do_action('geodir_before_detail_fields');

         ?>

-        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5>

+        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT; ?></h5>

         <?php

         /**

          * Called at the top of the add listing page form for frontend.

@@ -2177,10 +2177,10 @@ 
         do_action('geodir_before_main_form_fields');

         ?>

         <div id="geodir_post_title_row" class="required_field geodir_form_row clearfix gd-fieldset-details">

-            <label><?php echo PLACE_TITLE_TEXT;?><span>*</span> </label>

+            <label><?php echo PLACE_TITLE_TEXT; ?><span>*</span> </label>

             <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield"

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

-            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

         </div>

         <?php

         $show_editor = get_option('geodir_tiny_editor_on_add_listing');

@@ -2215,7 +2215,7 @@ 
         $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

         

         $desc_class = '';

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

+        if ($desc_limit === '' || (int) $desc_limit > 0) {

             /**

              * Called on the add listing page form for frontend just before the description field.

              *

@@ -2228,8 +2228,8 @@ 
             $desc_class = ' hidden';

         }

         ?>

-        <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>">

-            <label><?php echo PLACE_DESC_TEXT;?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

+        <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class; ?>">

+            <label><?php echo PLACE_DESC_TEXT; ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

             <?php

             if (!empty($show_editor) && in_array($listing_type, $show_editor)) {

                 $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

@@ -2238,16 +2238,16 @@ 
                     <?php wp_editor($desc, "post_desc", $editor_settings); ?>

                 </div>

             <?php if ($desc_limit != '') { ?>

-                <script type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit;?>");</script>

+                <script type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit; ?>");</script>

             <?php } } else { ?>

                 <textarea field_type="textarea" name="post_desc" id="post_desc" class="geodir_textarea" maxlength="<?php echo $desc_limit; ?>"><?php echo $desc; ?></textarea>

             <?php } if ($desc_limit_msg != '') { ?>

                 <span class="geodir_message_note"><?php echo $desc_limit_msg; ?></span>

             <?php } ?>

-            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory'); ?></span>

         </div>

         <?php

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

+        if ($desc_limit === '' || (int) $desc_limit > 0) {

             /**

              * Called on the add listing page form for frontend just after the description field.

              *

@@ -2286,7 +2286,7 @@ 
         $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

         

         $tags_class = '';

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+        if ($kw_tags_count === '' || (int) $kw_tags_count > 0) {

             /**

              * Called on the add listing page form for frontend just before the tags field.

              *

@@ -2297,14 +2297,14 @@ 
             $tags_class = ' hidden';

         }

         ?>

-        <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>">

+        <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class; ?>">

             <label><?php echo TAGKW_TEXT; ?></label>

             <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield"

-                   maxlength="<?php echo $kw_tags_count;?>"/>

-            <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span>

+                   maxlength="<?php echo $kw_tags_count; ?>"/>

+            <span class="geodir_message_note"><?php echo $kw_tags_msg; ?></span>

         </div>

         <?php

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+        if ($kw_tags_count === '' || (int) $kw_tags_count > 0) {

             /**

              * Called on the add listing page form for frontend just after the tags field.

              *

@@ -2330,7 +2330,7 @@ 
         $thumb_img_arr = array();

         $totImg = 0;

         if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

-            $post = (object)$gd_session->get('listing');

+            $post = (object) $gd_session->get('listing');

             if (isset($post->post_images))

                 $curImages = trim($post->post_images, ",");

 

@@ -2343,7 +2343,7 @@ 
             $listing_type = $post->listing_type;

 

         } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            $post = geodir_get_post_info((int)$_REQUEST['pid']);

+            $post = geodir_get_post_info((int) $_REQUEST['pid']);

             $listing_type = $post->post_type;

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

 

@@ -2357,7 +2357,7 @@ 
                 //$curImages = $img->src.",";

             }

 

-            $totImg = count((array)$thumb_img_arr);

+            $totImg = count((array) $thumb_img_arr);

         }

 

         if ($curImages != '')

@@ -2378,7 +2378,7 @@ 
         if ($show_image_input_box) {

             ?>

 

-            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?>

+            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT; ?>

                 <?php if ($image_limit == 1) {

                     echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

                 } ?>

@@ -2401,7 +2401,7 @@ 
                 <div

                     class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

                     id="<?php echo $id; ?>plupload-upload-ui">

-                    <h4><?php _e('Drop files to upload', 'geodirectory');?></h4><br/>

+                    <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4><br/>

                     <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                            value="<?php esc_attr_e('Select Files', 'geodirectory'); ?>" class="geodir_button"/>

                     <span class="ajaxnonceplu"

@@ -2418,7 +2418,7 @@ 
                      id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">

                 </div>

                 <span

-                    id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>

+                    id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>

                 <span id="<?php echo $id; ?>upload-error" style="display:none"></span>

             </div>

 

@@ -2430,7 +2430,7 @@ 
          *

          * @since 1.0.0

          */

-        do_action('geodir_after_main_form_fields');?>

+        do_action('geodir_after_main_form_fields'); ?>

 

 

         <!-- add captcha code -->

@@ -2441,7 +2441,7 @@ 
         </script>

         <noscript>

             <div>

-                <label><?php _e('Type 64 into this box', 'geodirectory');?></label>

+                <label><?php _e('Type 64 into this box', 'geodirectory'); ?></label>

                 <input type="text" id="geodir_spamblocker_top_form" name="geodir_spamblocker" value="" maxlength="10"/>

             </div>

         </noscript>

@@ -2451,10 +2451,10 @@ 
         <!-- end captcha code -->

 

         <div id="geodir-add-listing-submit" class="geodir_form_row clear_both" style="padding:2px;text-align:center;">

-            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON;?>"

-                   class="geodir_button" <?php echo $submit_button;?>/>

+            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON; ?>"

+                   class="geodir_button" <?php echo $submit_button; ?>/>

             <span class="geodir_message_note"

-                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory');?></span>

+                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory'); ?></span>

         </div>

 

     </form>

@@ -2516,7 +2516,7 @@ 
         class="<?php

         /** This action is documented in geodirectory_template_actions.php */

         echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

-        <?php dynamic_sidebar('Reg/Login Top Section');?>

+        <?php dynamic_sidebar('Reg/Login Top Section'); ?>

     </div><!-- clearfix ends here-->

 <?php

 }

@@ -2538,7 +2538,7 @@ 
 

     ?>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2555,7 +2555,7 @@ 
         <?php } ?>

     </script>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2693,11 +2693,11 @@ 
     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

 

     $title = $list_title;

-    if(geodir_is_page('author')){

+    if (geodir_is_page('author')) {

         $gd_page = 'author';

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

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -2711,7 +2711,7 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

     echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

         /**

@@ -2925,7 +2925,7 @@ 
     $post_type_info = get_post_type_object($gd_post_type);

 

     $pt_name = '';

-    if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

+    if (isset($post_type_info->labels->name)) {$pt_name = $post_type_info->labels->name; }

 

     if (is_search()) {

         $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

Indentation +1686 added lines, -1686 removed lines

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

 /**

- * Template functions that affect the output of most GeoDirectory pages

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * Template functions that affect the output of most GeoDirectory pages

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 ###############################################

 ########### DYNAMIC CONTENT ###################

 ###############################################

@@ -17,10 +17,10 @@ 
  */

 function gd_compat_styles()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo "<style id='gd-compat-styles' type='text/css'>";

-    echo $tc['geodir_theme_compat_css'];

-    echo "</style>";

+	$tc = get_option('theme_compatibility_setting');

+	echo "<style id='gd-compat-styles' type='text/css'>";

+	echo $tc['geodir_theme_compat_css'];

+	echo "</style>";

 }

 

 /**

@@ -31,10 +31,10 @@ 
  */

 function gd_compat_script()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo "<script>";

-    echo $tc['geodir_theme_compat_js'];

-    echo " </script>";

+	$tc = get_option('theme_compatibility_setting');

+	echo "<script>";

+	echo $tc['geodir_theme_compat_js'];

+	echo " </script>";

 }

 

 /**

@@ -47,8 +47,8 @@ 
  */

 function geodir_top_content_add_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo $tc['geodir_top_content_add'];

+	$tc = get_option('theme_compatibility_setting');

+	echo $tc['geodir_top_content_add'];

 }

 

 /**

@@ -61,8 +61,8 @@ 
  */

 function geodir_before_main_content_add_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo $tc['geodir_before_main_content_add'];

+	$tc = get_option('theme_compatibility_setting');

+	echo $tc['geodir_before_main_content_add'];

 }

 

 /**

@@ -75,8 +75,8 @@ 
  */

 function geodir_full_page_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_full_page_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_full_page_class_filter'];

 }

 

 /**

@@ -89,8 +89,8 @@ 
  */

 function geodir_before_widget_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_before_widget_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_before_widget_filter'];

 }

 

 /**

@@ -103,8 +103,8 @@ 
  */

 function geodir_after_widget_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_after_widget_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_after_widget_filter'];

 }

 

 /**

@@ -117,8 +117,8 @@ 
  */

 function geodir_before_title_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_before_title_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_before_title_filter'];

 }

 

 /**

@@ -131,8 +131,8 @@ 
  */

 function geodir_after_title_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_after_title_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_after_title_filter'];

 }

 

 /**

@@ -145,8 +145,8 @@ 
  */

 function geodir_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_menu_li_class_filter'];

 }

 

 /**

@@ -159,8 +159,8 @@ 
  */

 function geodir_sub_menu_ul_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_ul_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_ul_class_filter'];

 }

 

 /**

@@ -173,8 +173,8 @@ 
  */

 function geodir_sub_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_li_class_filter'];

 }

 

 /**

@@ -187,8 +187,8 @@ 
  */

 function geodir_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_menu_a_class_filter'];

 }

 

 /**

@@ -201,8 +201,8 @@ 
  */

 function geodir_sub_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_a_class_filter'];

 }

 

 /**

@@ -215,8 +215,8 @@ 
  */

 function geodir_location_switcher_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_li_class_filter'];

 }

 

 /**

@@ -229,8 +229,8 @@ 
  */

 function geodir_location_switcher_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_a_class_filter'];

 }

 

 /**

@@ -243,8 +243,8 @@ 
  */

 function geodir_location_switcher_menu_sub_ul_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

 }

 

 /**

@@ -257,8 +257,8 @@ 
  */

 function geodir_location_switcher_menu_sub_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_sub_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_sub_li_class_filter'];

 }

 

 

@@ -275,106 +275,106 @@ 
 function geodir_content_actions_dynamic()

 {

 

-    $tc = get_option('theme_compatibility_setting');

-    if (empty($tc)) {

-        return;

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (empty($tc)) {

+		return;

+	}

 

-    //php

-    if (!empty($tc['geodir_theme_compat_code'])) {

-        include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

-    }

+	//php

+	if (!empty($tc['geodir_theme_compat_code'])) {

+		include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

+	}

 

-    //geodir_full_page_class

-    if (!empty($tc['geodir_full_page_class_filter'])) {

-        add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);

-    }

+	//geodir_full_page_class

+	if (!empty($tc['geodir_full_page_class_filter'])) {

+		add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);

+	}

 

-    //widget before filter

-    if (!empty($tc['geodir_before_widget_filter'])) {

-        add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);

-    }

+	//widget before filter

+	if (!empty($tc['geodir_before_widget_filter'])) {

+		add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);

+	}

 

-    //widget after filter

-    if (!empty($tc['geodir_after_widget_filter'])) {

-        add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);

-    }

+	//widget after filter

+	if (!empty($tc['geodir_after_widget_filter'])) {

+		add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);

+	}

 

-    //widget before title filter

-    if (!empty($tc['geodir_before_title_filter'])) {

-        add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);

-    }

+	//widget before title filter

+	if (!empty($tc['geodir_before_title_filter'])) {

+		add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);

+	}

 

-    //widget before title filter

-    if (!empty($tc['geodir_after_title_filter'])) {

-        add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);

-    }

+	//widget before title filter

+	if (!empty($tc['geodir_after_title_filter'])) {

+		add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);

+	}

 

-    //menu li class

-    if (!empty($tc['geodir_menu_li_class_filter'])) {

-        add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);

-    }

+	//menu li class

+	if (!empty($tc['geodir_menu_li_class_filter'])) {

+		add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);

+	}

 

-    //menu ul class

-    if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {

-        add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);

-    }

+	//menu ul class

+	if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {

+		add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);

+	}

 

-    //menu sub li class

-    if (!empty($tc['geodir_sub_menu_li_class_filter'])) {

-        add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);

-    }

+	//menu sub li class

+	if (!empty($tc['geodir_sub_menu_li_class_filter'])) {

+		add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);

+	}

 

-    //menu a class

-    if (!empty($tc['geodir_menu_a_class_filter'])) {

-        add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);

-    }

+	//menu a class

+	if (!empty($tc['geodir_menu_a_class_filter'])) {

+		add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);

+	}

 

-    //menu sub a class

-    if (!empty($tc['geodir_sub_menu_a_class_filter'])) {

-        add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);

-    }

+	//menu sub a class

+	if (!empty($tc['geodir_sub_menu_a_class_filter'])) {

+		add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);

+	}

 

-    //location menu li class

-    if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);

-    }

+	//location menu li class

+	if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);

+	}

 

-    //location menu sub ul class

-    if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);

-    }

+	//location menu sub ul class

+	if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);

+	}

 

-    //location menu sub li class

-    if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);

-    }

+	//location menu sub li class

+	if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);

+	}

 

-    //location menu a class

-    if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);

-    }

+	//location menu a class

+	if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);

+	}

 

-    // compat styles

-    if (!empty($tc['geodir_theme_compat_css'])) {

-        add_action('wp_head', 'gd_compat_styles');

-    }

+	// compat styles

+	if (!empty($tc['geodir_theme_compat_css'])) {

+		add_action('wp_head', 'gd_compat_styles');

+	}

 

-    // compat js

-    if (!empty($tc['geodir_theme_compat_js'])) {

-        add_action('wp_footer', 'gd_compat_script');

-    }

+	// compat js

+	if (!empty($tc['geodir_theme_compat_js'])) {

+		add_action('wp_footer', 'gd_compat_script');

+	}

 

 

-    // geodir_top_content_add

-    if (!empty($tc['geodir_top_content_add'])) {

-        add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);

-    }

+	// geodir_top_content_add

+	if (!empty($tc['geodir_top_content_add'])) {

+		add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);

+	}

 

-    // geodir_before_main_content_add

-    if (!empty($tc['geodir_before_main_content_add'])) {

-        add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);

-    }

+	// geodir_before_main_content_add

+	if (!empty($tc['geodir_before_main_content_add'])) {

+		add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);

+	}

 

 

 }

@@ -397,23 +397,23 @@ 
  */

 function geodir_action_wrapper_open($type = '', $id = '', $class = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_open_replace'])) {

-        $text = $tc['geodir_wrapper_open_replace'];

-    } else {

-        $text = '<div id="[id]" class="[class]">';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_open_replace'])) {

+		$text = $tc['geodir_wrapper_open_replace'];

+	} else {

+		$text = '<div id="[id]" class="[class]">';

+	}

 

-    if (!empty($tc['geodir_wrapper_open_id'])) {

-        $id = $tc['geodir_wrapper_open_id'];

-    }

-    if (!empty($tc['geodir_wrapper_open_class'])) {

-        $class = $tc['geodir_wrapper_open_class'];

-    }

+	if (!empty($tc['geodir_wrapper_open_id'])) {

+		$id = $tc['geodir_wrapper_open_id'];

+	}

+	if (!empty($tc['geodir_wrapper_open_class'])) {

+		$class = $tc['geodir_wrapper_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

+	$text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the wrapperdiv closing tag

@@ -428,14 +428,14 @@ 
  */

 function geodir_action_wrapper_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_close_replace'])) {

-        $text = $tc['geodir_wrapper_close_replace'];

-    } else {

-        $text = '</div><!-- wrapper ends here-->';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_close_replace'])) {

+		$text = $tc['geodir_wrapper_close_replace'];

+	} else {

+		$text = '</div><!-- wrapper ends here-->';

+	}

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the content div opening tag

@@ -451,35 +451,35 @@ 
  */

 function geodir_action_wrapper_content_open($type = '', $id = '', $class = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_content_open_replace'])) {

-        $text = $tc['geodir_wrapper_content_open_replace'];

-    } else {

-        $text = '<div id="[id]" class="[class]" role="main" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_wrapper_content_open_id'])) {

-        $id = $tc['geodir_wrapper_content_open_id'];

-    }

-    if (!empty($tc['geodir_wrapper_content_open_class'])) {

-        $class = $tc['geodir_wrapper_content_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_content_open_replace'])) {

+		$text = $tc['geodir_wrapper_content_open_replace'];

+	} else {

+		$text = '<div id="[id]" class="[class]" role="main" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_wrapper_content_open_id'])) {

+		$id = $tc['geodir_wrapper_content_open_id'];

+	}

+	if (!empty($tc['geodir_wrapper_content_open_class'])) {

+		$class = $tc['geodir_wrapper_content_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -493,13 +493,13 @@ 
  */

 function geodir_action_wrapper_content_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_content_close_replace'])) {

-        $text = $tc['geodir_wrapper_content_close_replace'];

-    } else {

-        $text = '</div><!-- content ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_content_close_replace'])) {

+		$text = $tc['geodir_wrapper_content_close_replace'];

+	} else {

+		$text = '</div><!-- content ends here-->';

+	}

+	echo $text;

 }

 

 // action for adding the <article> opening tag

@@ -517,24 +517,24 @@ 
  */

 function geodir_action_article_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    $class = implode(" ", $class);

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_article_open_replace'])) {

-        $text = $tc['geodir_article_open_replace'];

-    } else {

-        $text = '<article  id="[id]" class="[class]" >';

-    }

+	$class = implode(" ", $class);

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_article_open_replace'])) {

+		$text = $tc['geodir_article_open_replace'];

+	} else {

+		$text = '<article  id="[id]" class="[class]" >';

+	}

 

-    if (!empty($tc['geodir_article_open_id'])) {

-        $id = $tc['geodir_article_open_id'];

-    }

-    if (!empty($tc['geodir_article_open_class'])) {

-        $class = $tc['geodir_article_open_class'];

-    }

+	if (!empty($tc['geodir_article_open_id'])) {

+		$id = $tc['geodir_article_open_id'];

+	}

+	if (!empty($tc['geodir_article_open_class'])) {

+		$class = $tc['geodir_article_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);

+	$text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -548,13 +548,13 @@ 
  */

 function geodir_action_article_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_article_close_replace'])) {

-        $text = $tc['geodir_article_close_replace'];

-    } else {

-        $text = '</article><!-- article ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_article_close_replace'])) {

+		$text = $tc['geodir_article_close_replace'];

+	} else {

+		$text = '</article><!-- article ends here-->';

+	}

+	echo $text;

 }

 

 // action for adding the sidebar opening tag

@@ -571,35 +571,35 @@ 
  */

 function geodir_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_right_open_replace'])) {

-        $text = $tc['geodir_sidebar_right_open_replace'];

-    } else {

-        $text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_sidebar_right_open_id'])) {

-        $id = $tc['geodir_sidebar_right_open_id'];

-    }

-    if (!empty($tc['geodir_sidebar_right_open_class'])) {

-        $class = $tc['geodir_sidebar_right_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_right_open_replace'])) {

+		$text = $tc['geodir_sidebar_right_open_replace'];

+	} else {

+		$text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_sidebar_right_open_id'])) {

+		$id = $tc['geodir_sidebar_right_open_id'];

+	}

+	if (!empty($tc['geodir_sidebar_right_open_class'])) {

+		$class = $tc['geodir_sidebar_right_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -613,13 +613,13 @@ 
  */

 function geodir_action_sidebar_right_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_right_close_replace'])) {

-        $text = $tc['geodir_sidebar_right_close_replace'];

-    } else {

-        $text = '</aside><!-- sidebar ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_right_close_replace'])) {

+		$text = $tc['geodir_sidebar_right_close_replace'];

+	} else {

+		$text = '</aside><!-- sidebar ends here-->';

+	}

+	echo $text;

 }

 

 

@@ -640,121 +640,121 @@ 
  */

 function geodir_action_geodir_set_preview_post()

 {

-    global $post, $preview, $gd_session;

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

-    if (!$preview || $is_backend_preview) {

-        return;

-    }// bail if not previewing

-

-    $listing_type = isset($_REQUEST['listing_type']) ? sanitize_text_field($_REQUEST['listing_type']) : '';

-

-    $fields_info = geodir_get_custom_fields_type($listing_type);

-

-    foreach ($_REQUEST as $pkey => $pval) {

-        if ($pkey == 'geodir_video') {

-            $tags = '<iframe>';

-        } else if ($pkey == 'post_desc') {

-            $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

-        } else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {

-            $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

-        } else if (is_array($_REQUEST[$pkey])) {

-            $tags = 'skip_field';

-        } else {

-            $tags = '';

-        }

-        /**

-         * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page.

-         *

-         * @since 1.0.0

-         * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'.

-         * @param string|array $pkey The field id/name. If array then value is set as "skip_field".

-         */

-        $tags = apply_filters('geodir_save_post_key', $tags, $pkey);

-

-        if ($tags != 'skip_field') {

-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);

-        }

-    }

-

-    $post = (object)$_REQUEST;

-

-

-    if (isset($post->video)) {

-        $post->video = stripslashes($post->video);

-    }

-

-    if (isset($post->Video2)) {

-        $post->Video2 = stripslashes($post->Video2);

-    }

-

-    $post_type = $post->listing_type;

-    $post_type_info = get_post_type_object($post_type);

-

-    $listing_label = $post_type_info->labels->singular_name;

-

-    $term_icon = '';

-

-    if (!empty($post->post_category)) {

-        foreach ($post->post_category as $post_taxonomy => $post_term) {

-

-            if ($post_term != '' && !is_array($post_term)) {

-                $post_term = explode(',', trim($post_term, ','));

-            }

+	global $post, $preview, $gd_session;

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

+	if (!$preview || $is_backend_preview) {

+		return;

+	}// bail if not previewing

+

+	$listing_type = isset($_REQUEST['listing_type']) ? sanitize_text_field($_REQUEST['listing_type']) : '';

+

+	$fields_info = geodir_get_custom_fields_type($listing_type);

+

+	foreach ($_REQUEST as $pkey => $pval) {

+		if ($pkey == 'geodir_video') {

+			$tags = '<iframe>';

+		} else if ($pkey == 'post_desc') {

+			$tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

+		} else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {

+			$tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

+		} else if (is_array($_REQUEST[$pkey])) {

+			$tags = 'skip_field';

+		} else {

+			$tags = '';

+		}

+		/**

+		 * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page.

+		 *

+		 * @since 1.0.0

+		 * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'.

+		 * @param string|array $pkey The field id/name. If array then value is set as "skip_field".

+		 */

+		$tags = apply_filters('geodir_save_post_key', $tags, $pkey);

+

+		if ($tags != 'skip_field') {

+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);

+		}

+	}

+

+	$post = (object)$_REQUEST;

+

+

+	if (isset($post->video)) {

+		$post->video = stripslashes($post->video);

+	}

+

+	if (isset($post->Video2)) {

+		$post->Video2 = stripslashes($post->Video2);

+	}

+

+	$post_type = $post->listing_type;

+	$post_type_info = get_post_type_object($post_type);

+

+	$listing_label = $post_type_info->labels->singular_name;

+

+	$term_icon = '';

+

+	if (!empty($post->post_category)) {

+		foreach ($post->post_category as $post_taxonomy => $post_term) {

+

+			if ($post_term != '' && !is_array($post_term)) {

+				$post_term = explode(',', trim($post_term, ','));

+			}

 

-            if (is_array($post_term)) {

-                $post_term = array_unique($post_term);

-            }

+			if (is_array($post_term)) {

+				$post_term = array_unique($post_term);

+			}

 

-            if (!empty($post_term)) {

-                foreach ($post_term as $cat_id) {

-                    $cat_id = trim($cat_id);

-

-                    if ($cat_id != '') {

-                        $term_icon = get_option('geodir_default_marker_icon');

-

-                        if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {

-                            if ($term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {

-                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '')

-                                    $term_icon = $term_icon_url['src'];

-                                break;

-                            }

-                        }

-                    }

-                }

-            }

-        }

-    }

+			if (!empty($post_term)) {

+				foreach ($post_term as $cat_id) {

+					$cat_id = trim($cat_id);

+

+					if ($cat_id != '') {

+						$term_icon = get_option('geodir_default_marker_icon');

+

+						if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {

+							if ($term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {

+								if (isset($term_icon_url['src']) && $term_icon_url['src'] != '')

+									$term_icon = $term_icon_url['src'];

+								break;

+							}

+						}

+					}

+				}

+			}

+		}

+	}

 

-    $post_latitude = isset($post->post_latitude) ? $post->post_latitude : '';

-    $post_longitude = isset($post->post_longitude) ? $post->post_longitude : '';

+	$post_latitude = isset($post->post_latitude) ? $post->post_latitude : '';

+	$post_longitude = isset($post->post_longitude) ? $post->post_longitude : '';

 

-    $srcharr = array("'", "/", "-", '"', '\\');

-    $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

+	$srcharr = array("'", "/", "-", '"', '\\');

+	$replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

 

-    $json_title = str_replace($srcharr, $replarr, $post->post_title);

+	$json_title = str_replace($srcharr, $replarr, $post->post_title);

 

-    $json = '{';

-    $json .= '"post_preview": "1",';

-    $json .= '"t": "' . $json_title . '",';

-    $json .= '"lt": "' . $post_latitude . '",';

-    $json .= '"ln": "' . $post_longitude . '",';

-    $json .= '"i":"' . $term_icon . '"';

-    $json .= '}';

+	$json = '{';

+	$json .= '"post_preview": "1",';

+	$json .= '"t": "' . $json_title . '",';

+	$json .= '"lt": "' . $post_latitude . '",';

+	$json .= '"ln": "' . $post_longitude . '",';

+	$json .= '"i":"' . $term_icon . '"';

+	$json .= '}';

 

-    $post->marker_json = $json;

+	$post->marker_json = $json;

 

-    $gd_session->set('listing', $_REQUEST);

+	$gd_session->set('listing', $_REQUEST);

 

-    // we need to define a few things to trick the setup_postdata

-    if (!isset($post->ID)) {

-        $post->ID = '';

-        $post->post_author = '';

-        $post->post_date = '';

-        $post->post_content = '';

-        $post->default_category = '';

-        $post->post_type = '';

-    }

-    setup_postdata($post);

+	// we need to define a few things to trick the setup_postdata

+	if (!isset($post->ID)) {

+		$post->ID = '';

+		$post->post_author = '';

+		$post->post_date = '';

+		$post->post_content = '';

+		$post->default_category = '';

+		$post->post_type = '';

+	}

+	setup_postdata($post);

 }

 

 /**

@@ -766,15 +766,15 @@ 
  */

 function geodir_action_geodir_preview_code()

 {

-    global $preview;

+	global $preview;

 

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

 

-    if (!$preview || $is_backend_preview) {

-        return;

-    }// bail if not previewing

+	if (!$preview || $is_backend_preview) {

+		return;

+	}// bail if not previewing

 

-    geodir_get_template_part('preview', 'buttons');

+	geodir_get_template_part('preview', 'buttons');

 }

 

 // action for adding the details page top widget area

@@ -790,20 +790,20 @@ 
  */

 function geodir_action_geodir_sidebar_detail_top($class = '')

 {

-    if (get_option('geodir_show_detail_top_section')) { ?>

+	if (get_option('geodir_show_detail_top_section')) { ?>

         <div

             class="<?php

-            /**

-             * Filter the div class for the wrapper of the full width widget areas.

-             *

-             * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas.

-             *

-             * @since 1.0.0

-             * @param string $class The class of the div.

-             * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section',

-             *               'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'.

-             */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">

+			/**

+			 * Filter the div class for the wrapper of the full width widget areas.

+			 *

+			 * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas.

+			 *

+			 * @since 1.0.0

+			 * @param string $class The class of the div.

+			 * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section',

+			 *               'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'.

+			 */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">

             <?php dynamic_sidebar('geodir_detail_top'); ?>

         </div>

     <?php }

@@ -827,11 +827,11 @@ 
  */

 function geodir_action_geodir_sidebar_detail_bottom_section($class = '')

 {

-    if (get_option('geodir_show_detail_bottom_section')) { ?>

+	if (get_option('geodir_show_detail_bottom_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">

             <?php dynamic_sidebar('geodir_detail_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -845,7 +845,7 @@ 
  */

 function geodir_details_sidebar_widget_area()

 {

-    dynamic_sidebar('geodir_detail_sidebar');

+	dynamic_sidebar('geodir_detail_sidebar');

 }

 

 /**

@@ -856,12 +856,12 @@ 
  */

 function geodir_details_sidebar_place_details()

 {

-    /**

-     * Used to add items to the details page sidebar.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_detail_page_sidebar');

+	/**

+	 * Used to add items to the details page sidebar.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_detail_page_sidebar');

 }

 

 add_action('geodir_detail_sidebar_inside', 'geodir_details_sidebar_place_details', 10);

@@ -876,68 +876,68 @@ 
  */

 function geodir_action_details_sidebar()

 {

-    // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-    if (get_option('geodir_detail_sidebar_left_section')) {

-        /**

-         * Called before the details page left sidebar is opened.

-         *

-         * This is used to add opening wrapper HTML to the details page left sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'.

-         * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'.

-         * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

-         */

-        do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'http://schema.org/WPSideBar');

-        ?>

+	// this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

+	if (get_option('geodir_detail_sidebar_left_section')) {

+		/**

+		 * Called before the details page left sidebar is opened.

+		 *

+		 * This is used to add opening wrapper HTML to the details page left sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'.

+		 * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'.

+		 * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

+		 */

+		do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'http://schema.org/WPSideBar');

+		?>

         <div class="geodir-content-left geodir-sidebar-wrap"><?php

-        /**

-         * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar.

-         *

-         * This is used to add all info to the details page sidebars.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_detail_sidebar_inside');

-        ?></div><!-- end geodir-content-left --><?php

-        /**

-         * Called after the details page left sidebar.

-         *

-         * This is used to add closing wrapper HTML to the details page left sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         */

-        do_action('geodir_sidebar_left_close', 'details-page');

-    } else {

-        /**

-         * Called before the details page right sidebar is opened.

-         *

-         * This is used to add opening wrapper HTML to the details page right sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'.

-         * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'.

-         * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'.

-         * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

-         */

-        do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');

-        ?>

+		/**

+		 * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar.

+		 *

+		 * This is used to add all info to the details page sidebars.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_detail_sidebar_inside');

+		?></div><!-- end geodir-content-left --><?php

+		/**

+		 * Called after the details page left sidebar.

+		 *

+		 * This is used to add closing wrapper HTML to the details page left sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 */

+		do_action('geodir_sidebar_left_close', 'details-page');

+	} else {

+		/**

+		 * Called before the details page right sidebar is opened.

+		 *

+		 * This is used to add opening wrapper HTML to the details page right sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'.

+		 * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'.

+		 * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'.

+		 * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

+		 */

+		do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');

+		?>

         <div class="geodir-content-right geodir-sidebar-wrap"><?php

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_detail_sidebar_inside');

-        ?></div><!-- end geodir-content-right --><?php

-        /**

-         * Called after the details page right sidebar.

-         *

-         * This is used to add closing wrapper HTML to the details page right sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         */

-        do_action('geodir_sidebar_right_close', 'details-page');

-    }

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_detail_sidebar_inside');

+		?></div><!-- end geodir-content-right --><?php

+		/**

+		 * Called after the details page right sidebar.

+		 *

+		 * This is used to add closing wrapper HTML to the details page right sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 */

+		do_action('geodir_sidebar_right_close', 'details-page');

+	}

 }

 

 add_action('geodir_page_title', 'geodir_action_page_title', 10);

@@ -951,21 +951,21 @@ 
  */

 function geodir_action_page_title()

 {

-    /**

-     * Filter the page title HTML h1 class.

-     *

-     * @since 1.0.0

-     * @param string $class The class to use. Default is 'entry-title fn'.

-     */

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

-    /**

-     * Filter the page title HTML header wrapper class.

-     *

-     * @since 1.0.0

-     * @param string $class The class to use. Default is 'entry-header'.

-     */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

+	/**

+	 * Filter the page title HTML h1 class.

+	 *

+	 * @since 1.0.0

+	 * @param string $class The class to use. Default is 'entry-title fn'.

+	 */

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

+	/**

+	 * Filter the page title HTML header wrapper class.

+	 *

+	 * @since 1.0.0

+	 * @param string $class The class to use. Default is 'entry-header'.

+	 */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

 }

 

 

@@ -982,87 +982,87 @@ 
  */

 function geodir_action_details_slider()

 {

-    global $preview, $post;

-

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend

-

-    if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {

-        $preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

+	global $preview, $post;

 

-        $preview_post_images = array();

-        if ($preview_get_images) {

-            foreach ($preview_get_images as $row) {

-                $preview_post_images[] = $row->src;

-            }

-        }

-        if (!empty($preview_post_images)) {

-            $post->post_images = implode(',', $preview_post_images);

-        }

-    }

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend

 

-    if ($preview) {

-        $post_images = array();

-        if (isset($post->post_images) && !empty($post->post_images)) {

-            $post->post_images = trim($post->post_images, ",");

-            $post_images = explode(",", $post->post_images);

-        }

+	if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {

+		$preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

 

-        $main_slides = '';

-        $nav_slides = '';

-        $slides = 0;

-

-        if (!empty($post_images)) {

-            foreach ($post_images as $image) {

-                if (!empty($image)) {

-                    $sizes = getimagesize(trim($image));

-                    $width = !empty($sizes) && isset($sizes[0]) ? $sizes[0] : 0;

-                    $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

-

-                    if ($image && $width && $height) {

-                        $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

-                    }

-

-                    if (isset($image->src)) {

-                        if ($image->height >= 400) {

-                            $spacer_height = 0;

-                        } else {

-                            $spacer_height = ((400 - $image->height) / 2);

-                        }

-

-                        $image_title = isset($image->title) ? $image->title : '';

-

-                        $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                        $main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>';

-                        $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>';

-                        $slides++;

-                    }

-                }

-            }// endfore

-        } //end if

-    } else {

-        $main_slides = '';

-        $nav_slides = '';

-        $post_images = geodir_get_images($post->ID, 'thumbnail', false); // Hide default image on listing preview/detail page.

-        $slides = 0;

-

-        if (!empty($post_images)) {

-            foreach ($post_images as $image) {

-                if ($image->height >= 400) {

-                    $spacer_height = 0;

-                } else {

-                    $spacer_height = ((400 - $image->height) / 2);

-                }

-                $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

-                $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                $main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

-                $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

-                $slides++;

-            }

-        }// endfore

-    }

+		$preview_post_images = array();

+		if ($preview_get_images) {

+			foreach ($preview_get_images as $row) {

+				$preview_post_images[] = $row->src;

+			}

+		}

+		if (!empty($preview_post_images)) {

+			$post->post_images = implode(',', $preview_post_images);

+		}

+	}

+

+	if ($preview) {

+		$post_images = array();

+		if (isset($post->post_images) && !empty($post->post_images)) {

+			$post->post_images = trim($post->post_images, ",");

+			$post_images = explode(",", $post->post_images);

+		}

+

+		$main_slides = '';

+		$nav_slides = '';

+		$slides = 0;

+

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				if (!empty($image)) {

+					$sizes = getimagesize(trim($image));

+					$width = !empty($sizes) && isset($sizes[0]) ? $sizes[0] : 0;

+					$height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

+

+					if ($image && $width && $height) {

+						$image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

+					}

+

+					if (isset($image->src)) {

+						if ($image->height >= 400) {

+							$spacer_height = 0;

+						} else {

+							$spacer_height = ((400 - $image->height) / 2);

+						}

+

+						$image_title = isset($image->title) ? $image->title : '';

+

+						$main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

+						$main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>';

+						$nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>';

+						$slides++;

+					}

+				}

+			}// endfore

+		} //end if

+	} else {

+		$main_slides = '';

+		$nav_slides = '';

+		$post_images = geodir_get_images($post->ID, 'thumbnail', false); // Hide default image on listing preview/detail page.

+		$slides = 0;

+

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				if ($image->height >= 400) {

+					$spacer_height = 0;

+				} else {

+					$spacer_height = ((400 - $image->height) / 2);

+				}

+				$caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

+				$main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

+				$main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

+				$nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

+				$slides++;

+			}

+		}// endfore

+	}

 

-    if (!empty($post_images)) {

-        ?>

+	if (!empty($post_images)) {

+		?>

         <div class="geodir_flex-container">

             <div class="geodir_flex-loader"><i class="fa fa-refresh fa-spin"></i></div>

             <div id="geodir_slider" class="geodir_flexslider ">

@@ -1075,7 +1075,7 @@ 
             <?php } ?>

         </div>

     <?php

-    }

+	}

 }

 

 add_action('geodir_details_taxonomies', 'geodir_action_details_taxonomies', 10);

@@ -1090,176 +1090,176 @@ 
  */

 function geodir_action_details_taxonomies()

 {

-    global $preview, $post;?>

+	global $preview, $post;?>

     <p class="geodir_post_taxomomies clearfix">

     <?php

-    $taxonomies = array();

-

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

-

-    if ($preview && !$is_backend_preview) {

-        $post_type = $post->listing_type;

-        $post_taxonomy = $post_type . 'category';

-        $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

-    } else {

-        $post_type = $post->post_type;

-        $post_taxonomy = $post_type . 'category';

-    }

+	$taxonomies = array();

+

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

+

+	if ($preview && !$is_backend_preview) {

+		$post_type = $post->listing_type;

+		$post_taxonomy = $post_type . 'category';

+		$post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

+	} else {

+		$post_type = $post->post_type;

+		$post_taxonomy = $post_type . 'category';

+	}

 //{	

-    $post_type_info = get_post_type_object($post_type);

-    $listing_label = __($post_type_info->labels->singular_name, 'geodirectory');

-

-    if (!empty($post->post_tags)) {

-

-        if (taxonomy_exists($post_type . '_tags')):

-            $links = array();

-            $terms = array();

-            // to limit post tags

-            $post_tags = trim($post->post_tags, ",");

-            $post_id = isset($post->ID) ? $post->ID : '';

-            /**

-             * Filter the post tags.

-             *

-             * Allows you to filter the post tags output on the details page of a post.

-             *

-             * @since 1.0.0

-             * @param string $post_tags A comma seperated list of tags.

-             * @param int $post_id The current post id.

-             */

-            $post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);

-

-            $post->post_tags = $post_tags;

-            $post_tags = explode(",", trim($post->post_tags, ","));

-

-            foreach ($post_tags as $post_term) {

-

-                // fix slug creation order for tags & location

-                $post_term = trim($post_term);

-

-                $priority_location = false;

-                if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

-                    $term = get_term_by('name', $post_term, $post_type . '_tags');

-                } else {

-                    $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

-                    $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

-                    $post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL;

-                    $match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false;

-                    $match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false;

-                    $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

-                    if ($match_country || $match_region || $match_city) {

-                        $priority_location = true;

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

-                    } else {

-                        $insert_term = wp_insert_term($post_term, $post_type . '_tags');

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

-                    }

-                }

-

-                if (!is_wp_error($term) && is_object($term)) {

-

-                    // fix tag link on detail page

-                    if ($priority_location) {

-

-                        $tag_link = "<a href=''>$post_term</a>";

-                        /**

-                         * Filter the tag name on the details page.

-                         *

-                         * @since 1.5.6

-                         * @param string $tag_link The tag link html.

-                         * @param object $term The tag term object.

-                         */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

-                        $links[] = $tag_link;

-                    } else {

-                        $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

-                        /** This action is documented in geodirectory-template_actions.php */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

-                        $links[] = $tag_link;

-                    }

-                    $terms[] = $term;

-                }

-                //

-            }

-            if (!isset($listing_label)) {

-                $listing_label = '';

-            }

-            $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

-        endif;

-

-    }

-

-    if (!empty($post->{$post_taxonomy})) {

-        $links = array();

-        $terms = array();

-        $termsOrdered = array();

-        if (!is_array($post->{$post_taxonomy})) {

-            $post_term = explode(",", trim($post->{$post_taxonomy}, ","));

-        } else {

-            $post_term = $post->{$post_taxonomy};

+	$post_type_info = get_post_type_object($post_type);

+	$listing_label = __($post_type_info->labels->singular_name, 'geodirectory');

+

+	if (!empty($post->post_tags)) {

+

+		if (taxonomy_exists($post_type . '_tags')):

+			$links = array();

+			$terms = array();

+			// to limit post tags

+			$post_tags = trim($post->post_tags, ",");

+			$post_id = isset($post->ID) ? $post->ID : '';

+			/**

+			 * Filter the post tags.

+			 *

+			 * Allows you to filter the post tags output on the details page of a post.

+			 *

+			 * @since 1.0.0

+			 * @param string $post_tags A comma seperated list of tags.

+			 * @param int $post_id The current post id.

+			 */

+			$post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);

+

+			$post->post_tags = $post_tags;

+			$post_tags = explode(",", trim($post->post_tags, ","));

+

+			foreach ($post_tags as $post_term) {

+

+				// fix slug creation order for tags & location

+				$post_term = trim($post_term);

+

+				$priority_location = false;

+				if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

+					$term = get_term_by('name', $post_term, $post_type . '_tags');

+				} else {

+					$post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

+					$post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

+					$post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL;

+					$match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false;

+					$match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false;

+					$match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

+					if ($match_country || $match_region || $match_city) {

+						$priority_location = true;

+						$term = get_term_by('name', $post_term, $post_type . '_tags');

+					} else {

+						$insert_term = wp_insert_term($post_term, $post_type . '_tags');

+						$term = get_term_by('name', $post_term, $post_type . '_tags');

+					}

+				}

+

+				if (!is_wp_error($term) && is_object($term)) {

+

+					// fix tag link on detail page

+					if ($priority_location) {

+

+						$tag_link = "<a href=''>$post_term</a>";

+						/**

+						 * Filter the tag name on the details page.

+						 *

+						 * @since 1.5.6

+						 * @param string $tag_link The tag link html.

+						 * @param object $term The tag term object.

+						 */

+						$tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+						$links[] = $tag_link;

+					} else {

+						$tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

+						/** This action is documented in geodirectory-template_actions.php */

+						$tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+						$links[] = $tag_link;

+					}

+					$terms[] = $term;

+				}

+				//

+			}

+			if (!isset($listing_label)) {

+				$listing_label = '';

+			}

+			$taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+		endif;

+

+	}

+

+	if (!empty($post->{$post_taxonomy})) {

+		$links = array();

+		$terms = array();

+		$termsOrdered = array();

+		if (!is_array($post->{$post_taxonomy})) {

+			$post_term = explode(",", trim($post->{$post_taxonomy}, ","));

+		} else {

+			$post_term = $post->{$post_taxonomy};

 			

 			if ($preview && !$is_backend_preview) {

 				$post_term = geodir_add_parent_terms($post_term, $post_taxonomy);

 			}

-        }

+		}

+

+		$post_term = array_unique($post_term);

+		if (!empty($post_term)) {

+			foreach ($post_term as $post_term) {

+				$post_term = trim($post_term);

+

+				if ($post_term != ''):

+					$term = get_term_by('id', $post_term, $post_taxonomy);

+

+					if (is_object($term)) {

+						$term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

+						/**

+						 * Filter the category name on the details page.

+						 *

+						 * @since 1.5.6

+						 * @param string $term_link The link html to the category.

+						 * @param object $term The category term object.

+						 */

+						$term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

+						$links[] = $term_link;

+						$terms[] = $term;

+					}

+				endif;

+			}

+			// order alphabetically

+			asort($links);

+			foreach (array_keys($links) as $key) {

+				$termsOrdered[$key] = $terms[$key];

+			}

+			$terms = $termsOrdered;

 

-        $post_term = array_unique($post_term);

-        if (!empty($post_term)) {

-            foreach ($post_term as $post_term) {

-                $post_term = trim($post_term);

-

-                if ($post_term != ''):

-                    $term = get_term_by('id', $post_term, $post_taxonomy);

-

-                    if (is_object($term)) {

-                        $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

-                        /**

-                         * Filter the category name on the details page.

-                         *

-                         * @since 1.5.6

-                         * @param string $term_link The link html to the category.

-                         * @param object $term The category term object.

-                         */

-                        $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

-                        $links[] = $term_link;

-                        $terms[] = $term;

-                    }

-                endif;

-            }

-            // order alphabetically

-            asort($links);

-            foreach (array_keys($links) as $key) {

-                $termsOrdered[$key] = $terms[$key];

-            }

-            $terms = $termsOrdered;

+		}

 

-        }

+		if (!isset($listing_label)) {

+			$listing_label = '';

+		}

+		$taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

 

-        if (!isset($listing_label)) {

-            $listing_label = '';

-        }

-        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

-

-    }

+	}

 

-    /**

-     * Filter the taxonomies array before output.

-     *

-     * @since 1.5.9

-     * @param array $taxonomies The array of cats and tags.

-     * @param string $post_type The post type being output.

-     * @param string $listing_label The post type label.

-     * @param string $listing_label The post type label with ucwords function.

-     */

-    $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

+	/**

+	 * Filter the taxonomies array before output.

+	 *

+	 * @since 1.5.9

+	 * @param array $taxonomies The array of cats and tags.

+	 * @param string $post_type The post type being output.

+	 * @param string $listing_label The post type label.

+	 * @param string $listing_label The post type label with ucwords function.

+	 */

+	$taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

 

-    if (isset($taxonomies[$post_taxonomy])) {

-        echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

-    }

+	if (isset($taxonomies[$post_taxonomy])) {

+		echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

+	}

 

-    if (isset($taxonomies[$post_type . '_tags']))

-        echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

+	if (isset($taxonomies[$post_type . '_tags']))

+		echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

 

-    ?>

+	?>

     </p><?php

 }

 

@@ -1281,126 +1281,126 @@ 
 function geodir_action_details_micordata($post='')

 {

 

-    global $preview;

-    if(empty($post)){global $post;}

-    if ($preview || !geodir_is_page('detail')) {

-        return;

-    }

-

-    // url

-    $c_url = geodir_curPageURL();

-

-    // post reviews

-    $post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));

-    if (empty($post_reviews)) {

-        $reviews = '';

-    } else {

-        foreach ($post_reviews as $review) {

-            $reviews[] = array(

-                "@type" => "Review",

-                "author" => $review->comment_author,

-                "datePublished" => $review->comment_date,

-                "description" => $review->comment_content,

-                "reviewRating" => array(

-                    "@type" => "Rating",

-                    "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

-                    "ratingValue" => geodir_get_commentoverall($review->comment_ID),

-                    "worstRating" => "1"

-                )

-            );

-        }

-

-    }

-

-    // post images

-    $post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

-    if (empty($post_images)) {

-        $images = '';

-    } else {

-        $i_arr = array();

-        foreach ($post_images as $img) {

-            $i_arr[] = $img->src;

-        }

-

-        if (count($i_arr) == 1) {

-            $images = $i_arr[0];

-        } else {

-            $images = $i_arr;

-        }

-

-    }

-    //print_r($post);

-    // external links

-    $external_links =  array();

-    $external_links[] = $post->geodir_website;

-    $external_links[] = $post->geodir_twitter;

-    $external_links[] = $post->geodir_facebook;

-    $external_links = array_filter($external_links);

-

-    if(!empty($external_links)){

-        $external_links = array_values($external_links);

-    }

-

-    // reviews

-    $comment_count = geodir_get_review_count_total($post->ID);

-    $post_avgratings = geodir_get_post_rating($post->ID);

-

-    // schema type

-    $schema_type = 'LocalBusiness';

-    if(isset($post->default_category) && $post->default_category){

-        $schema_type = get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

-        if(!$schema_type && $post->post_type=='gd_event'){$schema_type = 'Event';}

-    }

-

-    $schema = array();

-    $schema['@context'] = "http://schema.org";

-    $schema['@type'] = $schema_type;

-    $schema['name'] = $post->post_name;

-    $schema['description'] = wp_strip_all_tags( $post->post_content, true );

-    $schema['telephone'] = $post->geodir_contact;

-    $schema['url'] = $c_url;

-    $schema['sameAs'] = $external_links;

-    $schema['image'] = $images;

-    $schema['address'] = array(

-        "@type" => "PostalAddress",

-        "streetAddress" => $post->post_address,

-        "addressLocality" => $post->post_city,

-        "addressRegion" => $post->post_region,

-        "addressCountry" => $post->post_country,

-        "postalCode" => $post->post_zip

-    );

-

-    if($post->post_latitude && $post->post_longitude) {

-        $schema['geo'] = array(

-            "@type" => "GeoCoordinates",

-            "latitude" => $post->post_latitude,

-            "longitude" => $post->post_longitude

-        );

-    }

-

-    if($post_avgratings) {

-        $schema['aggregateRating'] = array(

-            "@type" => "AggregateRating",

-            "ratingValue" => $post_avgratings,

-            "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

-            "worstRating" => "1",

-            "ratingCount" => $comment_count

-        );

-    }

-    $schema['review'] = $reviews;

-

-    /**

-     * Allow the schema JSON-LD info to be filtered.

-     *

-     * @since 1.5.4

-     * @since 1.5.7 Added $post variable.

-     * @param array $schema The array of schema data to be filtered.

-     * @param object $post The post object.

-     */

-    $schema = apply_filters('geodir_details_schema', $schema,$post);

-

-

-    echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

+	global $preview;

+	if(empty($post)){global $post;}

+	if ($preview || !geodir_is_page('detail')) {

+		return;

+	}

+

+	// url

+	$c_url = geodir_curPageURL();

+

+	// post reviews

+	$post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));

+	if (empty($post_reviews)) {

+		$reviews = '';

+	} else {

+		foreach ($post_reviews as $review) {

+			$reviews[] = array(

+				"@type" => "Review",

+				"author" => $review->comment_author,

+				"datePublished" => $review->comment_date,

+				"description" => $review->comment_content,

+				"reviewRating" => array(

+					"@type" => "Rating",

+					"bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

+					"ratingValue" => geodir_get_commentoverall($review->comment_ID),

+					"worstRating" => "1"

+				)

+			);

+		}

+

+	}

+

+	// post images

+	$post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

+	if (empty($post_images)) {

+		$images = '';

+	} else {

+		$i_arr = array();

+		foreach ($post_images as $img) {

+			$i_arr[] = $img->src;

+		}

+

+		if (count($i_arr) == 1) {

+			$images = $i_arr[0];

+		} else {

+			$images = $i_arr;

+		}

+

+	}

+	//print_r($post);

+	// external links

+	$external_links =  array();

+	$external_links[] = $post->geodir_website;

+	$external_links[] = $post->geodir_twitter;

+	$external_links[] = $post->geodir_facebook;

+	$external_links = array_filter($external_links);

+

+	if(!empty($external_links)){

+		$external_links = array_values($external_links);

+	}

+

+	// reviews

+	$comment_count = geodir_get_review_count_total($post->ID);

+	$post_avgratings = geodir_get_post_rating($post->ID);

+

+	// schema type

+	$schema_type = 'LocalBusiness';

+	if(isset($post->default_category) && $post->default_category){

+		$schema_type = get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

+		if(!$schema_type && $post->post_type=='gd_event'){$schema_type = 'Event';}

+	}

+

+	$schema = array();

+	$schema['@context'] = "http://schema.org";

+	$schema['@type'] = $schema_type;

+	$schema['name'] = $post->post_name;

+	$schema['description'] = wp_strip_all_tags( $post->post_content, true );

+	$schema['telephone'] = $post->geodir_contact;

+	$schema['url'] = $c_url;

+	$schema['sameAs'] = $external_links;

+	$schema['image'] = $images;

+	$schema['address'] = array(

+		"@type" => "PostalAddress",

+		"streetAddress" => $post->post_address,

+		"addressLocality" => $post->post_city,

+		"addressRegion" => $post->post_region,

+		"addressCountry" => $post->post_country,

+		"postalCode" => $post->post_zip

+	);

+

+	if($post->post_latitude && $post->post_longitude) {

+		$schema['geo'] = array(

+			"@type" => "GeoCoordinates",

+			"latitude" => $post->post_latitude,

+			"longitude" => $post->post_longitude

+		);

+	}

+

+	if($post_avgratings) {

+		$schema['aggregateRating'] = array(

+			"@type" => "AggregateRating",

+			"ratingValue" => $post_avgratings,

+			"bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

+			"worstRating" => "1",

+			"ratingCount" => $comment_count

+		);

+	}

+	$schema['review'] = $reviews;

+

+	/**

+	 * Allow the schema JSON-LD info to be filtered.

+	 *

+	 * @since 1.5.4

+	 * @since 1.5.7 Added $post variable.

+	 * @param array $schema The array of schema data to be filtered.

+	 * @param object $post The post object.

+	 */

+	$schema = apply_filters('geodir_details_schema', $schema,$post);

+

+

+	echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

 

 }

 

@@ -1418,7 +1418,7 @@ 
  */

 function geodir_action_details_next_prev()

 {

-    ?>

+	?>

     <div class="geodir-pos_navigation clearfix">

     <div

         class="geodir-post_left"><?php previous_post_link('%link', '' . __('Previous', 'geodirectory'), false) ?></div>

@@ -1436,15 +1436,15 @@ 
  */

 function geodir_action_before_single_post()

 {

-    global $post;

-    /**

-     * Called at the very start fo the details page output, before the title section.

-     *

-     * @since 1.0.0

-     * @param object $post The current post object.

-     * @global WP_Post|null $post The current post, if available.

-     */

-    do_action('geodir_before_single_post', $post); // extra action	

+	global $post;

+	/**

+	 * Called at the very start fo the details page output, before the title section.

+	 *

+	 * @since 1.0.0

+	 * @param object $post The current post object.

+	 * @global WP_Post|null $post The current post, if available.

+	 */

+	do_action('geodir_before_single_post', $post); // extra action	

 }

 

 /**

@@ -1455,13 +1455,13 @@ 
  */

 function geodir_action_after_single_post($post)

 {

-    /**

-     * Called on the details page after the details page tabs section and before the next/prev buttons.

-     *

-     * @since 1.0.0

-     * @param object $post The current post object.

-     */

-    do_action('geodir_after_single_post', $post); // extra action	

+	/**

+	 * Called on the details page after the details page tabs section and before the next/prev buttons.

+	 *

+	 * @since 1.0.0

+	 * @param object $post The current post object.

+	 */

+	do_action('geodir_after_single_post', $post); // extra action	

 }

 

 add_action('geodir_details_main_content', 'geodir_action_before_single_post', 10);

@@ -1487,167 +1487,167 @@ 
  */

 function geodir_action_listings_title()

 {

-    global $wp, $term;

-

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

-

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

-    }

-

-    $list_title = $add_string_in_title . __(ucfirst($post_type_info->labels->name), 'geodirectory');

-    $single_name = $post_type_info->labels->singular_name;

-

-    $taxonomy = geodir_get_taxonomies($gd_post_type, true);

+	global $wp, $term;

 

-    $gd_country = get_query_var('gd_country');

-    $gd_region = get_query_var('gd_region');

-    $gd_city = get_query_var('gd_city');

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-    if (!empty($term)) {

-        $location_name = '';

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

-            if ($gd_country != '') {

-                $location_name = geodir_sanitize_location_name('gd_country', $gd_country);

-            }

-

-            if ($gd_region != '') {

-                $location_name = geodir_sanitize_location_name('gd_region', $gd_region);

-            }

-

-            if ($gd_city != '') {

-                $location_name = geodir_sanitize_location_name('gd_city', $gd_city);

-            }

-        }

-

-        $current_term = get_term_by('slug', $term, $taxonomy[0]);

-        if (!empty($current_term)) {

-            $current_term_name = __(ucfirst($current_term->name), 'geodirectory');

-            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

-                $location_last_char = substr($location_name, -1);

-                $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

-            } else {

-                $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

-            }

-        } else {

-            if (count($taxonomy) > 1) {

-                $current_term = get_term_by('slug', $term, $taxonomy[1]);

-

-                if (!empty($current_term)) {

-                    $current_term_name = __(ucfirst($current_term->name), 'geodirectory');

-                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

-                        $location_last_char = substr($location_name, -1);

-                        $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                        $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

-                    } else {

-                        $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

-                    }

-                }

-            }

-        }

+	$add_string_in_title = __('All', 'geodirectory') . ' ';

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

+		$add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+	}

 

-    } else {

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

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

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

+	$list_title = $add_string_in_title . __(ucfirst($post_type_info->labels->name), 'geodirectory');

+	$single_name = $post_type_info->labels->singular_name;

 

-        $gd_country_actual = $gd_region_actual = $gd_city_actual = '';

+	$taxonomy = geodir_get_taxonomies($gd_post_type, true);

 

-        if (function_exists('get_actual_location_name')) {

-            $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

-            $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

-            $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

-        }

+	$gd_country = get_query_var('gd_country');

+	$gd_region = get_query_var('gd_region');

+	$gd_city = get_query_var('gd_city');

 

-        if ($gd_city != '') {

-            if ($gd_city_actual != '') {

-                $gd_city = $gd_city_actual;

-            } else {

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

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

-                $gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

-            }

-

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

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

-            if ($gd_region_actual != '') {

-                $gd_region = $gd_region_actual;

-            } else {

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

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

-                $gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

-            }

-

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

-        } else if ($gd_country != '') {

-            if ($gd_country_actual != '') {

-                $gd_country = $gd_country_actual;

-            } else {

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

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

-                $gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

-            }

-

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

-        }

-    }

-

-    if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __(ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

-    }

-    /** This action is documented in geodirectory_template_actions.php */

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

-    /** This action is documented in geodirectory_template_actions.php */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-

-

-    $title = $list_title;

-    if(geodir_is_page('pt')){

-        $gd_page = 'pt';

-        $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

-    }

-    elseif(geodir_is_page('listing')){

-        $gd_page = 'listing';

-        global $wp_query;

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

-        if (strpos($current_term->taxonomy,'_tags') !== false) {

-            $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

-        }else{

-            $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

-        }

+	if (!empty($term)) {

+		$location_name = '';

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

+			if ($gd_country != '') {

+				$location_name = geodir_sanitize_location_name('gd_country', $gd_country);

+			}

 

-    }

-    elseif(geodir_is_page('author')){

-        $gd_page = 'author';

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

-            $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

-            $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

-        }

+			if ($gd_region != '') {

+				$location_name = geodir_sanitize_location_name('gd_region', $gd_region);

+			}

 

-    }

+			if ($gd_city != '') {

+				$location_name = geodir_sanitize_location_name('gd_city', $gd_city);

+			}

+		}

+

+		$current_term = get_term_by('slug', $term, $taxonomy[0]);

+		if (!empty($current_term)) {

+			$current_term_name = __(ucfirst($current_term->name), 'geodirectory');

+			if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+				$location_last_char = substr($location_name, -1);

+				$location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

+				$list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+			} else {

+				$list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+			}

+		} else {

+			if (count($taxonomy) > 1) {

+				$current_term = get_term_by('slug', $term, $taxonomy[1]);

+

+				if (!empty($current_term)) {

+					$current_term_name = __(ucfirst($current_term->name), 'geodirectory');

+					if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+						$location_last_char = substr($location_name, -1);

+						$location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

+						$list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+					} else {

+						$list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+					}

+				}

+			}

+		}

+

+	} else {

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

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

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

+

+		$gd_country_actual = $gd_region_actual = $gd_city_actual = '';

+

+		if (function_exists('get_actual_location_name')) {

+			$gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

+			$gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

+			$gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

+		}

+

+		if ($gd_city != '') {

+			if ($gd_city_actual != '') {

+				$gd_city = $gd_city_actual;

+			} else {

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

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

+				$gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

+			}

 

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

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

+			if ($gd_region_actual != '') {

+				$gd_region = $gd_region_actual;

+			} else {

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

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

+				$gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

+			}

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

-     * @param string $title The page title including variables.

-     * @param string $gd_page The GeoDirectory page type if any.

-     */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

+		} else if ($gd_country != '') {

+			if ($gd_country_actual != '') {

+				$gd_country = $gd_country_actual;

+			} else {

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

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

+				$gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

+			}

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

-        /**

-         * Filter the listing page title.

-         *

-         * @since 1.0.0

-         * @param string $list_title The title for the category page.

-         */

-        apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

+		}

+	}

+

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __(ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+	}

+	/** This action is documented in geodirectory_template_actions.php */

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

+	/** This action is documented in geodirectory_template_actions.php */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+

+

+	$title = $list_title;

+	if(geodir_is_page('pt')){

+		$gd_page = 'pt';

+		$title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

+	}

+	elseif(geodir_is_page('listing')){

+		$gd_page = 'listing';

+		global $wp_query;

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

+		if (strpos($current_term->taxonomy,'_tags') !== false) {

+			$title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

+		}else{

+			$title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

+		}

+

+	}

+	elseif(geodir_is_page('author')){

+		$gd_page = 'author';

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

+			$title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

+		}else{

+			$title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

+		}

+

+	}

+

+

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

+	 * @param string $title The page title including variables.

+	 * @param string $gd_page The GeoDirectory page type if any.

+	 */

+	$title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+		/**

+		 * Filter the listing page title.

+		 *

+		 * @since 1.0.0

+		 * @param string $list_title The title for the category page.

+		 */

+		apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

 }

 

 add_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);

@@ -1660,33 +1660,33 @@ 
  */

 function geodir_action_listings_description()

 {

-    global $wp_query;

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

-

-    $gd_post_type = geodir_get_current_posttype();

-    if (isset($current_term->term_id) && $current_term->term_id != '') {

-

-        $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

-        $saved_data = stripslashes(get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

-        if ($term_desc && !$saved_data) {

-            $saved_data = $term_desc;

-        }

-        /**

-         * Apply the core filter `the_content` filter to the variable string.

-         *

-         * This is a WordPress core filter that does many things.

-         *

-         * @since 1.0.0

-         * @param string $var The string to apply the filter to.

-         */

-        $cat_description = apply_filters('the_content', $saved_data);

-        if ($cat_description) {

-            ?>

+	global $wp_query;

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

+

+	$gd_post_type = geodir_get_current_posttype();

+	if (isset($current_term->term_id) && $current_term->term_id != '') {

+

+		$term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

+		$saved_data = stripslashes(get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

+		if ($term_desc && !$saved_data) {

+			$saved_data = $term_desc;

+		}

+		/**

+		 * Apply the core filter `the_content` filter to the variable string.

+		 *

+		 * This is a WordPress core filter that does many things.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The string to apply the filter to.

+		 */

+		$cat_description = apply_filters('the_content', $saved_data);

+		if ($cat_description) {

+			?>

 

             <div class="term_description"><?php echo $cat_description;?></div> <?php

-        }

+		}

 

-    }

+	}

 }

 

 // action for adding the listings page top widget area

@@ -1705,11 +1705,11 @@ 
  */

 function geodir_action_geodir_sidebar_listings_top()

 {

-    if (get_option('geodir_show_listing_top_section')) { ?>

+	if (get_option('geodir_show_listing_top_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">

             <?php dynamic_sidebar('geodir_listing_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -1732,35 +1732,35 @@ 
  */

 function geodir_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_left_open_replace'])) {

-        $text = $tc['geodir_sidebar_left_open_replace'];

-    } else {

-        $text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_sidebar_left_open_id'])) {

-        $id = $tc['geodir_sidebar_left_open_id'];

-    }

-    if (!empty($tc['geodir_sidebar_left_open_class'])) {

-        $class = $tc['geodir_sidebar_left_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_left_open_replace'])) {

+		$text = $tc['geodir_sidebar_left_open_replace'];

+	} else {

+		$text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_sidebar_left_open_id'])) {

+		$id = $tc['geodir_sidebar_left_open_id'];

+	}

+	if (!empty($tc['geodir_sidebar_left_open_class'])) {

+		$class = $tc['geodir_sidebar_left_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -1776,13 +1776,13 @@ 
  */

 function geodir_action_sidebar_left_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_left_close_replace'])) {

-        $text = $tc['geodir_sidebar_left_close_replace'];

-    } else {

-        $text = '</aside><!-- sidebar ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_left_close_replace'])) {

+		$text = $tc['geodir_sidebar_left_close_replace'];

+	} else {

+		$text = '</aside><!-- sidebar ends here-->';

+	}

+	echo $text;

 }

 

 /**

@@ -1795,7 +1795,7 @@ 
  */

 function geodir_listing_left_section()

 {

-    if (get_option('geodir_show_listing_left_section')) { ?>

+	if (get_option('geodir_show_listing_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_listing_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -1813,20 +1813,20 @@ 
  */

 function geodir_action_listings_sidebar_left()

 {

-    if (get_option('geodir_show_listing_left_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * Calls the listings page (category) left sidebar content.

-         *

-         * All the content for the listings page left sidebar is added via this hook.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_listings_sidebar_left_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_close', 'listings-page');

-    }

+	if (get_option('geodir_show_listing_left_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * Calls the listings page (category) left sidebar content.

+		 *

+		 * All the content for the listings page left sidebar is added via this hook.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_listings_sidebar_left_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_close', 'listings-page');

+	}

 }

 

 /**

@@ -1839,7 +1839,7 @@ 
  */

 function geodir_listing_right_section()

 {

-    if (get_option('geodir_show_listing_right_section')) { ?>

+	if (get_option('geodir_show_listing_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_listing_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -1857,20 +1857,20 @@ 
  */

 function geodir_action_listings_sidebar_right()

 {

-    if (get_option('geodir_show_listing_right_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * Calls the listings page (category) right sidebar content.

-         *

-         * All the content for the listings page right sidebar is added via this hook.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_listings_sidebar_right_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_close', 'listings-page');

-    }

+	if (get_option('geodir_show_listing_right_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * Calls the listings page (category) right sidebar content.

+		 *

+		 * All the content for the listings page right sidebar is added via this hook.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_listings_sidebar_right_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_close', 'listings-page');

+	}

 }

 

 

@@ -1887,23 +1887,23 @@ 
  */

 function geodir_action_main_content_open($type = '', $id = '', $class = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_main_content_open_replace'])) {

-        $text = $tc['geodir_main_content_open_replace'];

-    } else {

-        $text = '<main id="[id]" class="[class]" role="main">';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_main_content_open_replace'])) {

+		$text = $tc['geodir_main_content_open_replace'];

+	} else {

+		$text = '<main id="[id]" class="[class]" role="main">';

+	}

 

-    if (!empty($tc['geodir_main_content_open_id'])) {

-        $id = $tc['geodir_main_content_open_id'];

-    }

-    if (!empty($tc['geodir_main_content_open_class'])) {

-        $class = $tc['geodir_main_content_open_class'];

-    }

+	if (!empty($tc['geodir_main_content_open_id'])) {

+		$id = $tc['geodir_main_content_open_id'];

+	}

+	if (!empty($tc['geodir_main_content_open_class'])) {

+		$class = $tc['geodir_main_content_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

+	$text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -1916,13 +1916,13 @@ 
  */

 function geodir_action_main_content_close()

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_main_content_close_replace'])) {

-        $text = $tc['geodir_main_content_close_replace'];

-    } else {

-        $text = '</main><!-- main ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_main_content_close_replace'])) {

+		$text = $tc['geodir_main_content_close_replace'];

+	} else {

+		$text = '</main><!-- main ends here-->';

+	}

+	echo $text;

 }

 

 /**

@@ -1934,14 +1934,14 @@ 
  */

 function geodir_action_listings_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_listing_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_listing_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_listings_content_inside', 'geodir_action_listings_content_inside', 10);

@@ -1957,47 +1957,47 @@ 
  */

 function geodir_action_listings_content()

 {

-    /**

-     * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc.

-     *

-     * @since 1.0.0

-     * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

-     * @param string $id The id for the div. Usually 'geodir-main-content'.

-     * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

-     * @see 'geodir_main_content_close' Where the oposing closing tag is added.

-     */

-    do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');

-    $extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');

-    echo '<div class="clearfix '.$extra_class.'">';

-    /**

-     * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_listing');

-    echo '</div>';

-

-    /**

-     * This actions calls the listings list content. Used on listings pages and search and author pages.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_listings_content_inside');

-

-    /**

-     * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_listing');

-

-    /**

-     * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc.

-     *

-     * @since 1.0.0

-     * @see 'geodir_main_content_open' Where the oposing opening tag is added.

-     */

-    do_action('geodir_main_content_close', 'listings-page');

+	/**

+	 * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc.

+	 *

+	 * @since 1.0.0

+	 * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

+	 * @param string $id The id for the div. Usually 'geodir-main-content'.

+	 * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

+	 * @see 'geodir_main_content_close' Where the oposing closing tag is added.

+	 */

+	do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');

+	$extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');

+	echo '<div class="clearfix '.$extra_class.'">';

+	/**

+	 * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_listing');

+	echo '</div>';

+

+	/**

+	 * This actions calls the listings list content. Used on listings pages and search and author pages.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_listings_content_inside');

+

+	/**

+	 * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_listing');

+

+	/**

+	 * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_main_content_open' Where the oposing opening tag is added.

+	 */

+	do_action('geodir_main_content_close', 'listings-page');

 }

 

 

@@ -2012,10 +2012,10 @@ 
  */

 function geodir_action_sidebar_listings_bottom_section()

 {

-    if (get_option('geodir_show_listing_bottom_section')) { ?>

+	if (get_option('geodir_show_listing_bottom_section')) { ?>

         <div class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">

             <?php dynamic_sidebar('geodir_listing_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -2035,38 +2035,38 @@ 
  */

 function geodir_action_add_listing_page_title()

 {

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

-        $listing_type = sanitize_text_field($_REQUEST['listing_type']);

-    /** This action is documented in geodirectory_template_actions.php */

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

-    /** This action is documented in geodirectory_template_actions.php */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-

-    $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

-

-    if(geodir_is_page('add-listing')){

-        $gd_page = 'add-listing';

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

-            $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

-        }elseif(isset($listing_type)){

-            $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

-        }

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

+		$listing_type = sanitize_text_field($_REQUEST['listing_type']);

+	/** This action is documented in geodirectory_template_actions.php */

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

+	/** This action is documented in geodirectory_template_actions.php */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+

+	$title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

 

-    }

+	if(geodir_is_page('add-listing')){

+		$gd_page = 'add-listing';

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

+			$title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

+		}elseif(isset($listing_type)){

+			$title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

+		}

 

+	}

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

-     * @param string $title The page title including variables.

-     * @param string $gd_page The GeoDirectory page type if any.

-     */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

-    echo $title;

-    echo '</h1></header>';

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

+	 * @param string $title The page title including variables.

+	 * @param string $gd_page The GeoDirectory page type if any.

+	 */

+	$title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

+	echo $title;

+	echo '</h1></header>';

 }

 

 add_action('geodir_add_listing_page_mandatory', 'geodir_action_add_listing_page_mandatory', 10);

@@ -2097,54 +2097,54 @@ 
  */

 function geodir_action_add_listing_form()

 {

-    global $cat_display, $post_cat, $current_user, $gd_session;

-    $page_id = get_the_ID();

-    $post = '';

-    $title = '';

-    $desc = '';

-    $kw_tags = '';

-    $required_msg = '';

-    $submit_button = '';

-

-    $ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add';

-

-    $thumb_img_arr = array();

-    $curImages = '';

-

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

-        global $post;

-        $post = (object)$gd_session->get('listing');

-        $listing_type = $post->listing_type;

-        $title = $post->post_title;

-        $desc = $post->post_desc;

-        $post_cat = $post->post_category;

-

-        $kw_tags = $post->post_tags;

-        $curImages = isset($post->post_images) ? $post->post_images : '';

-    } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-        global $post, $post_images;

-

-        $post = geodir_get_post_info($_REQUEST['pid']);

-        $thumb_img_arr = geodir_get_images($post->ID);

-        if ($thumb_img_arr) {

-            foreach ($thumb_img_arr as $post_img) {

-                $curImages .= $post_img->src . ',';

-            }

-        }

-

-        $listing_type = $post->post_type;

-        $title = $post->post_title;

-        $desc = $post->post_content;

-        $kw_tags = $post->post_tags;

-        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

-    } else {

-        $listing_type = sanitize_text_field($_REQUEST['listing_type']);

-    }

-

-    if ($current_user->ID != '0') {

-        $user_login = true;

-    }

-    ?>

+	global $cat_display, $post_cat, $current_user, $gd_session;

+	$page_id = get_the_ID();

+	$post = '';

+	$title = '';

+	$desc = '';

+	$kw_tags = '';

+	$required_msg = '';

+	$submit_button = '';

+

+	$ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add';

+

+	$thumb_img_arr = array();

+	$curImages = '';

+

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

+		global $post;

+		$post = (object)$gd_session->get('listing');

+		$listing_type = $post->listing_type;

+		$title = $post->post_title;

+		$desc = $post->post_desc;

+		$post_cat = $post->post_category;

+

+		$kw_tags = $post->post_tags;

+		$curImages = isset($post->post_images) ? $post->post_images : '';

+	} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+		global $post, $post_images;

+

+		$post = geodir_get_post_info($_REQUEST['pid']);

+		$thumb_img_arr = geodir_get_images($post->ID);

+		if ($thumb_img_arr) {

+			foreach ($thumb_img_arr as $post_img) {

+				$curImages .= $post_img->src . ',';

+			}

+		}

+

+		$listing_type = $post->post_type;

+		$title = $post->post_title;

+		$desc = $post->post_content;

+		$kw_tags = $post->post_tags;

+		$kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

+	} else {

+		$listing_type = sanitize_text_field($_REQUEST['listing_type']);

+	}

+

+	if ($current_user->ID != '0') {

+		$user_login = true;

+	}

+	?>

     <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>" method="post" enctype="multipart/form-data">

         <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/>

         <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/>

@@ -2155,27 +2155,27 @@ 
         <?php } if (isset($_REQUEST['backandedit'])) { ?>

             <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/>

         <?php

-        } 

-        /**

-         * Called at the very top of the add listing page form for frontend.

-         *

-         * This is called just before the "Enter Listing Details" text.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_detail_fields');

-        ?>

+		} 

+		/**

+		 * Called at the very top of the add listing page form for frontend.

+		 *

+		 * This is called just before the "Enter Listing Details" text.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_before_detail_fields');

+		?>

         <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5>

         <?php

-        /**

-         * Called at the top of the add listing page form for frontend.

-         *

-         * This is called after the "Enter Listing Details" text.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_main_form_fields');

-        ?>

+		/**

+		 * Called at the top of the add listing page form for frontend.

+		 *

+		 * This is called after the "Enter Listing Details" text.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_before_main_form_fields');

+		?>

         <div id="geodir_post_title_row" class="required_field geodir_form_row clearfix gd-fieldset-details">

             <label><?php echo PLACE_TITLE_TEXT;?><span>*</span> </label>

             <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield"

@@ -2183,57 +2183,57 @@ 
             <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span>

         </div>

         <?php

-        $show_editor = get_option('geodir_tiny_editor_on_add_listing');

-

-        $desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc));

-        $desc_limit = '';

-        /**

-         * Filter the add listing description field character limit number.

-         *

-         * @since 1.0.0

-         * @param int $desc_limit The amount of characters to limit the description to.

-         */

-        $desc_limit = apply_filters('geodir_description_field_desc_limit', $desc_limit);

-        /**

-         * Filter the add listing description field text.

-         *

-         * @since 1.0.0

-         * @param string $desc The text for the description field.

-         * @param int $desc_limit The character limit numer if any.

-         */

-        $desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);

-        $desc_limit_msg = '';

-        /**

-         * Filter the add listing description limit message.

-         *

-         * This is the message shown if there is a limit applied to the amount of characters the description can use.

-         *

-         * @since 1.0.0

-         * @param string $desc_limit_msg The limit message string if any.

-         * @param int $desc_limit The character limit numer if any.

-         */

-        $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

+		$show_editor = get_option('geodir_tiny_editor_on_add_listing');

+

+		$desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc));

+		$desc_limit = '';

+		/**

+		 * Filter the add listing description field character limit number.

+		 *

+		 * @since 1.0.0

+		 * @param int $desc_limit The amount of characters to limit the description to.

+		 */

+		$desc_limit = apply_filters('geodir_description_field_desc_limit', $desc_limit);

+		/**

+		 * Filter the add listing description field text.

+		 *

+		 * @since 1.0.0

+		 * @param string $desc The text for the description field.

+		 * @param int $desc_limit The character limit numer if any.

+		 */

+		$desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);

+		$desc_limit_msg = '';

+		/**

+		 * Filter the add listing description limit message.

+		 *

+		 * This is the message shown if there is a limit applied to the amount of characters the description can use.

+		 *

+		 * @since 1.0.0

+		 * @param string $desc_limit_msg The limit message string if any.

+		 * @param int $desc_limit The character limit numer if any.

+		 */

+		$desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

         

-        $desc_class = '';

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

-            /**

-             * Called on the add listing page form for frontend just before the description field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_before_description_field');

+		$desc_class = '';

+		if ($desc_limit === '' || (int)$desc_limit > 0) {

+			/**

+			 * Called on the add listing page form for frontend just before the description field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_before_description_field');

             

-            $desc_class = ' required_field';

-        } else {

-            $desc_class = ' hidden';

-        }

-        ?>

+			$desc_class = ' required_field';

+		} else {

+			$desc_class = ' hidden';

+		}

+		?>

         <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>">

             <label><?php echo PLACE_DESC_TEXT;?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

             <?php

-            if (!empty($show_editor) && in_array($listing_type, $show_editor)) {

-                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

-            ?>

+			if (!empty($show_editor) && in_array($listing_type, $show_editor)) {

+				$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

+			?>

                 <div class="editor" field_id="post_desc" field_type="editor">

                     <?php wp_editor($desc, "post_desc", $editor_settings); ?>

                 </div>

@@ -2247,56 +2247,56 @@ 
             <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span>

         </div>

         <?php

-        if ($desc_limit === '' || (int)$desc_limit > 0) {

-            /**

-             * Called on the add listing page form for frontend just after the description field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_after_description_field');

-        }

+		if ($desc_limit === '' || (int)$desc_limit > 0) {

+			/**

+			 * Called on the add listing page form for frontend just after the description field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_after_description_field');

+		}

         

-        $kw_tags = esc_attr(stripslashes($kw_tags));

-        $kw_tags_count = TAGKW_TEXT_COUNT;

-        $kw_tags_msg = TAGKW_MSG;

-        /**

-         * Filter the add listing tags character limit.

-         *

-         * @since 1.0.0

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);

-        /**

-         * Filter the add listing tags field value.

-         *

-         * You can use the $_REQUEST values to check if this is a go back and edit value etc.

-         *

-         * @since 1.0.0

-         * @param string $kw_tags The tag field value, usually a comma separated list of tags.

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);

-        /**

-         * Filter the add listing tags field message text.

-         *

-         * @since 1.0.0

-         * @param string $kw_tags_msg The message shown under the field.

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

+		$kw_tags = esc_attr(stripslashes($kw_tags));

+		$kw_tags_count = TAGKW_TEXT_COUNT;

+		$kw_tags_msg = TAGKW_MSG;

+		/**

+		 * Filter the add listing tags character limit.

+		 *

+		 * @since 1.0.0

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);

+		/**

+		 * Filter the add listing tags field value.

+		 *

+		 * You can use the $_REQUEST values to check if this is a go back and edit value etc.

+		 *

+		 * @since 1.0.0

+		 * @param string $kw_tags The tag field value, usually a comma separated list of tags.

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);

+		/**

+		 * Filter the add listing tags field message text.

+		 *

+		 * @since 1.0.0

+		 * @param string $kw_tags_msg The message shown under the field.

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

         

-        $tags_class = '';

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

-            /**

-             * Called on the add listing page form for frontend just before the tags field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_before_listing_tags_field');

-        } else {

-            $tags_class = ' hidden';

-        }

-        ?>

+		$tags_class = '';

+		if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+			/**

+			 * Called on the add listing page form for frontend just before the tags field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_before_listing_tags_field');

+		} else {

+			$tags_class = ' hidden';

+		}

+		?>

         <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>">

             <label><?php echo TAGKW_TEXT; ?></label>

             <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield"

@@ -2304,90 +2304,90 @@ 
             <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span>

         </div>

         <?php

-        if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

-            /**

-             * Called on the add listing page form for frontend just after the tags field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_after_listing_tags_field');

-        }

+		if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {

+			/**

+			 * Called on the add listing page form for frontend just after the tags field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_after_listing_tags_field');

+		}

         

-        $package_info = array();

-        $package_info = geodir_post_package_info($package_info, $post);

+		$package_info = array();

+		$package_info = geodir_post_package_info($package_info, $post);

         

-        geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type);

+		geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type);

         

-        // adjust values here

-        $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

+		// adjust values here

+		$id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

 

-        $multiple = true; // allow multiple files upload

+		$multiple = true; // allow multiple files upload

 

-        $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

+		$width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

-        $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

+		$height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

 

-        $thumb_img_arr = array();

-        $totImg = 0;

-        if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

-            $post = (object)$gd_session->get('listing');

-            if (isset($post->post_images))

-                $curImages = trim($post->post_images, ",");

+		$thumb_img_arr = array();

+		$totImg = 0;

+		if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

+			$post = (object)$gd_session->get('listing');

+			if (isset($post->post_images))

+				$curImages = trim($post->post_images, ",");

 

 

-            if ($curImages != '') {

-                $curImages_array = explode(',', $curImages);

-                $totImg = count($curImages_array);

-            }

-

-            $listing_type = $post->listing_type;

+			if ($curImages != '') {

+				$curImages_array = explode(',', $curImages);

+				$totImg = count($curImages_array);

+			}

 

-        } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            $post = geodir_get_post_info((int)$_REQUEST['pid']);

-            $listing_type = $post->post_type;

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

+			$listing_type = $post->listing_type;

 

-        } else {

-            $listing_type = sanitize_text_field($_REQUEST['listing_type']);

-        }

+		} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			$post = geodir_get_post_info((int)$_REQUEST['pid']);

+			$listing_type = $post->post_type;

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

 

+		} else {

+			$listing_type = sanitize_text_field($_REQUEST['listing_type']);

+		}

 

-        if (!empty($thumb_img_arr)) {

-            foreach ($thumb_img_arr as $img) {

-                //$curImages = $img->src.",";

-            }

 

-            $totImg = count((array)$thumb_img_arr);

-        }

+		if (!empty($thumb_img_arr)) {

+			foreach ($thumb_img_arr as $img) {

+				//$curImages = $img->src.",";

+			}

 

-        if ($curImages != '')

-            $svalue = $curImages; // this will be initial value of the above form field. Image urls.

-        else

-            $svalue = '';

-

-        $image_limit = $package_info->image_limit;

-        $show_image_input_box = ($image_limit != '0');

-        /**

-         * Filter to be able to show/hide the image upload section of the add listing form.

-         *

-         * @since 1.0.0

-         * @param bool $show_image_input_box Set true to show. Set false to not show.

-         * @param string $listing_type The custom post type slug.

-         */

-        $show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);

-        if ($show_image_input_box) {

-            ?>

+			$totImg = count((array)$thumb_img_arr);

+		}

+

+		if ($curImages != '')

+			$svalue = $curImages; // this will be initial value of the above form field. Image urls.

+		else

+			$svalue = '';

+

+		$image_limit = $package_info->image_limit;

+		$show_image_input_box = ($image_limit != '0');

+		/**

+		 * Filter to be able to show/hide the image upload section of the add listing form.

+		 *

+		 * @since 1.0.0

+		 * @param bool $show_image_input_box Set true to show. Set false to not show.

+		 * @param string $listing_type The custom post type slug.

+		 */

+		$show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);

+		if ($show_image_input_box) {

+			?>

 

             <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?>

                 <?php if ($image_limit == 1) {

-                    echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

-                } ?>

+					echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+				} ?>

                 <?php if ($image_limit > 1) {

-                    echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

-                } ?>

+					echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+				} ?>

                 <?php if ($image_limit == '') {

-                    echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

-                } ?>

+					echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+				} ?>

             </h5>

 

             <div class="geodir_form_row clearfix" id="<?php echo $id; ?>dropbox"

@@ -2425,12 +2425,12 @@ 
         <?php } ?>

 

         <?php

-        /**

-         * Called on the add listing page form for frontend just after the image upload field.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_after_main_form_fields');?>

+		/**

+		 * Called on the add listing page form for frontend just after the image upload field.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_after_main_form_fields');?>

 

 

         <!-- add captcha code -->

@@ -2459,7 +2459,7 @@ 
 

     </form>

     <?php

-    wp_reset_query();

+	wp_reset_query();

 }

 

 /**

@@ -2470,7 +2470,7 @@ 
  */

 function geodir_add_listing_sidebar_widget_area()

 {

-    dynamic_sidebar('geodir_add_listing_sidebar');

+	dynamic_sidebar('geodir_add_listing_sidebar');

 }

 

 add_action('geodir_add_listing_sidebar_inside', 'geodir_add_listing_sidebar_widget_area', 10);

@@ -2485,16 +2485,16 @@ 
  */

 function geodir_action_add_listing_sidebar()

 {

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');

-    /**

-     * This is used to add the content to the add listing page sidebar.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_add_listing_sidebar_inside');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_sidebar_right_close', 'details-page');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');

+	/**

+	 * This is used to add the content to the add listing page sidebar.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_add_listing_sidebar_inside');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_sidebar_right_close', 'details-page');

 }

 

 ###############################################

@@ -2511,11 +2511,11 @@ 
  */

 function geodir_action_geodir_sidebar_signup_top()

 {

-    ?>

+	?>

     <div

         class="<?php

-        /** This action is documented in geodirectory_template_actions.php */

-        echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

+		/** This action is documented in geodirectory_template_actions.php */

+		echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

         <?php dynamic_sidebar('Reg/Login Top Section');?>

     </div><!-- clearfix ends here-->

 <?php

@@ -2534,9 +2534,9 @@ 
 function geodir_action_signup_forms()

 {

 

-    global $user_login;

+	global $user_login;

 

-    ?>

+	?>

     <script type="text/javascript">

         <?php if ( $user_login ) { ?>

         setTimeout(function () {

@@ -2572,65 +2572,65 @@ 
         <?php } ?>

     </script><?php

 

-    global $errors;

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

-        $errors->add('claim_login', LOGIN_CLAIM);

-

-    if (!empty($errors)) {

-        foreach ($errors as $errorsObj) {

-            foreach ($errorsObj as $key => $val) {

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

-                    echo "<div class=sucess_msg>" . $val[$i] . '</div>';

-                    $registration_error_msg = 1;

-                }

-            }

-        }

-    }

+	global $errors;

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

+		$errors->add('claim_login', LOGIN_CLAIM);

+

+	if (!empty($errors)) {

+		foreach ($errors as $errorsObj) {

+			foreach ($errorsObj as $key => $val) {

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

+					echo "<div class=sucess_msg>" . $val[$i] . '</div>';

+					$registration_error_msg = 1;

+				}

+			}

+		}

+	}

 

-    if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {

-        ?>

+	if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {

+		?>

 

         <div class="login_form">

             <?php

-            /**

-             * Contains login form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+			/**

+			 * Contains login form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

         </div>

 

     <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up') { ?>

 

         <div class="registration_form">

             <?php

-            /**

-             * Contains registration form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+			/**

+			 * Contains registration form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

         </div>

 

     <?php } else { ?>

 

         <div class="login_form_l">

             <?php

-            /**

-             * Contains login form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+			/**

+			 * Contains login form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

         </div>

         <div class="registration_form_r">

             <?php

-            /**

-             * Contains registration form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+			/**

+			 * Contains registration form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

         </div>

 

     <?php }?>

@@ -2661,66 +2661,66 @@ 
  */

 function geodir_action_author_page_title()

 {

-    global $term;

+	global $term;

 

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

-    }

+	$add_string_in_title = __('All', 'geodirectory') . ' ';

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

+		$add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+	}

 

-    $list_title = $add_string_in_title . $post_type_info->labels->name;

-    $single_name = $post_type_info->labels->singular_name;

+	$list_title = $add_string_in_title . $post_type_info->labels->name;

+	$single_name = $post_type_info->labels->singular_name;

 

-    $taxonomy = geodir_get_taxonomies($gd_post_type);

+	$taxonomy = geodir_get_taxonomies($gd_post_type);

 

-    if (!empty($term)) {

-        $current_term = get_term_by('slug', $term, $taxonomy[0]);

-        if (!empty($current_term))

-            $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

-    }

+	if (!empty($term)) {

+		$current_term = get_term_by('slug', $term, $taxonomy[0]);

+		if (!empty($current_term))

+			$list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

+	}

 

 

-    if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

 

-    }

-    /** This action is documented in geodirectory_template_actions.php */

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

-    /** This action is documented in geodirectory_template_actions.php */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+	}

+	/** This action is documented in geodirectory_template_actions.php */

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

+	/** This action is documented in geodirectory_template_actions.php */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

 

-    $title = $list_title;

-    if(geodir_is_page('author')){

-        $gd_page = 'author';

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

-            $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

-            $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

-        }

+	$title = $list_title;

+	if(geodir_is_page('author')){

+		$gd_page = 'author';

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

+			$title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

+		}else{

+			$title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

+		}

 

-    }

+	}

 

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

-     * @param string $title The page title including variables.

-     * @param string $gd_page The GeoDirectory page type if any.

-     */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

+	 * @param string $title The page title including variables.

+	 * @param string $gd_page The GeoDirectory page type if any.

+	 */

+	$title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

-        /**

-         * Filter the author page title text.

-         *

-         * @since 1.0.0

-         * @param string $list_title The title for the page.

-         */

-        apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+		/**

+		 * Filter the author page title text.

+		 *

+		 * @since 1.0.0

+		 * @param string $list_title The title for the page.

+		 */

+		apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

 }

 

 

@@ -2738,11 +2738,11 @@ 
  */

 function geodir_action_geodir_sidebar_author_top()

 {

-    if (get_option('geodir_show_author_top_section')) { ?>

+	if (get_option('geodir_show_author_top_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">

             <?php dynamic_sidebar('geodir_author_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -2758,7 +2758,7 @@ 
  */

 function geodir_author_left_section()

 {

-    if (get_option('geodir_show_author_left_section')) { ?>

+	if (get_option('geodir_show_author_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_author_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -2779,19 +2779,19 @@ 
  */

 function geodir_action_author_sidebar_left()

 {

-    if (get_option('geodir_show_author_left_section')) {

+	if (get_option('geodir_show_author_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the author page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_author_sidebar_left_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_close', 'author-page');

-    }

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the author page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_author_sidebar_left_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_close', 'author-page');

+	}

 }

 

 /**

@@ -2804,7 +2804,7 @@ 
  */

 function geodir_author_right_section()

 {

-    if (get_option('geodir_show_author_right_section')) { ?>

+	if (get_option('geodir_show_author_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_author_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -2824,18 +2824,18 @@ 
  */

 function geodir_action_author_sidebar_right()

 {

-    if (get_option('geodir_show_author_right_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the author page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_author_sidebar_right_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_close', 'author-page');

-    }

+	if (get_option('geodir_show_author_right_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the author page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_author_sidebar_right_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_close', 'author-page');

+	}

 }

 

 /**

@@ -2847,14 +2847,14 @@ 
  */

 function geodir_action_author_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_author_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_author_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_author_content_inside', 'geodir_action_author_content_inside', 10);

@@ -2869,22 +2869,22 @@ 
  */

 function geodir_action_author_content()

 {

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_open', 'author-page', 'geodir-main-content', 'author-page');

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

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_before_listing');

-    echo '</div>';

-    /**

-     * This is used to add the content to the author page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_author_content_inside');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_after_listing');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_close', 'author-page');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_open', 'author-page', 'geodir-main-content', 'author-page');

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

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_before_listing');

+	echo '</div>';

+	/**

+	 * This is used to add the content to the author page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_author_content_inside');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_after_listing');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_close', 'author-page');

 }

 

 add_action('geodir_sidebar_author_bottom_section', 'geodir_action_sidebar_author_bottom_section', 10);

@@ -2898,11 +2898,11 @@ 
  */

 function geodir_action_sidebar_author_bottom_section()

 {

-    if (get_option('geodir_show_author_bottom_section')) { ?>

+	if (get_option('geodir_show_author_bottom_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">

             <?php dynamic_sidebar('geodir_author_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -2921,23 +2921,23 @@ 
  */

 function geodir_action_search_page_title()

 {

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-    $pt_name = '';

-    if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

+	$pt_name = '';

+	if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

 

-    if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

 

-    }

-    /** This action is documented in geodirectory_template_actions.php */

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

-    /** This action is documented in geodirectory_template_actions.php */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

-        /** This action is documented in geodirectory_template_actions.php */

-        apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

+	}

+	/** This action is documented in geodirectory_template_actions.php */

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

+	/** This action is documented in geodirectory_template_actions.php */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+		/** This action is documented in geodirectory_template_actions.php */

+		apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

 }

 

 // action for adding the listings page top widget area

@@ -2953,11 +2953,11 @@ 
  */

 function geodir_action_geodir_sidebar_search_top()

 {

-    if (get_option('geodir_show_search_top_section')) { ?>

+	if (get_option('geodir_show_search_top_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">

             <?php dynamic_sidebar('geodir_search_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -2973,7 +2973,7 @@ 
  */

 function geodir_search_left_section()

 {

-    if (get_option('geodir_show_search_left_section')) { ?>

+	if (get_option('geodir_show_search_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_search_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -2993,19 +2993,19 @@ 
  */

 function geodir_action_search_sidebar_left()

 {

-    if (get_option('geodir_show_search_left_section')) {

+	if (get_option('geodir_show_search_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the search page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_search_sidebar_left_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_close', 'search-page');

-    }

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the search page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_search_sidebar_left_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_close', 'search-page');

+	}

 }

 

 /**

@@ -3018,7 +3018,7 @@ 
  */

 function geodir_search_right_section()

 {

-    if (get_option('geodir_show_search_right_section')) { ?>

+	if (get_option('geodir_show_search_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_search_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -3038,18 +3038,18 @@ 
  */

 function geodir_action_search_sidebar_right()

 {

-    if (get_option('geodir_show_search_right_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the search page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_search_sidebar_right_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_close', 'search-page');

-    }

+	if (get_option('geodir_show_search_right_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the search page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_search_sidebar_right_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_close', 'search-page');

+	}

 }

 

 

@@ -3064,11 +3064,11 @@ 
  */

 function geodir_action_sidebar_search_bottom_section()

 {

-    if (get_option('geodir_show_search_bottom_section')) { ?>

+	if (get_option('geodir_show_search_bottom_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">

             <?php dynamic_sidebar('geodir_search_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3083,14 +3083,14 @@ 
  */

 function geodir_action_search_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_search_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_search_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_search_content_inside', 'geodir_action_search_content_inside', 10);

@@ -3106,22 +3106,22 @@ 
  */

 function geodir_action_search_content()

 {

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');

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

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_before_listing');

-    echo '</div>';

-    /**

-     * This is used to add the content to the search page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_search_content_inside');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_after_listing');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_close', 'search-page');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');

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

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_before_listing');

+	echo '</div>';

+	/**

+	 * This is used to add the content to the search page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_search_content_inside');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_after_listing');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_close', 'search-page');

 }

 

 ###############################################

@@ -3144,11 +3144,11 @@ 
  */

 function geodir_action_geodir_sidebar_home_top()

 {

-    if (get_option('geodir_show_home_top_section')) { ?>

+	if (get_option('geodir_show_home_top_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">

             <?php dynamic_sidebar('geodir_home_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3164,7 +3164,7 @@ 
  */

 function geodir_home_left_section()

 {

-    if (get_option('geodir_show_home_left_section')) { ?>

+	if (get_option('geodir_show_home_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_home_left'); ?>

         </div><!-- end geodir-content-left -->

@@ -3186,19 +3186,19 @@ 
  */

 function geodir_action_home_sidebar_left()

 {

-    if (get_option('geodir_show_home_left_section')) {

+	if (get_option('geodir_show_home_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the home page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_home_sidebar_left_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_left_close', 'home-page');

-    }

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the home page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_home_sidebar_left_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_left_close', 'home-page');

+	}

 }

 

 /**

@@ -3211,7 +3211,7 @@ 
  */

 function geodir_home_right_section()

 {

-    if (get_option('geodir_show_home_right_section')) { ?>

+	if (get_option('geodir_show_home_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_home_right'); ?>

         </div><!-- end geodir-content-right -->

@@ -3232,18 +3232,18 @@ 
  */

 function geodir_action_home_sidebar_right()

 {

-    if (get_option('geodir_show_home_right_section')) {

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the home page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_home_sidebar_right_inside');

-        /** This action is documented in geodirectory_template_actions.php */

-        do_action('geodir_sidebar_right_close', 'home-page');

-    }

+	if (get_option('geodir_show_home_right_section')) {

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the home page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_home_sidebar_right_inside');

+		/** This action is documented in geodirectory_template_actions.php */

+		do_action('geodir_sidebar_right_close', 'home-page');

+	}

 }

 

 /**

@@ -3254,7 +3254,7 @@ 
  */

 function geodir_action_home_content_inside()

 {

-    dynamic_sidebar('geodir_home_content');

+	dynamic_sidebar('geodir_home_content');

 }

 

 add_action('geodir_home_content_inside', 'geodir_action_home_content_inside', 10);

@@ -3269,28 +3269,28 @@ 
  */

 function geodir_action_home_content()

 {

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');

-    /**

-     * This called before the home page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_home_content');

-    /**

-     * This is used to add the content to the home page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_home_content_inside');

-    /**

-     * This is called after the homepage main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_home_content');

-    /** This action is documented in geodirectory_template_actions.php */

-    do_action('geodir_main_content_close', 'home-page');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');

+	/**

+	 * This called before the home page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_home_content');

+	/**

+	 * This is used to add the content to the home page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_home_content_inside');

+	/**

+	 * This is called after the homepage main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_home_content');

+	/** This action is documented in geodirectory_template_actions.php */

+	do_action('geodir_main_content_close', 'home-page');

 }

 

 add_action('geodir_sidebar_location_bottom_section', 'geodir_action_sidebar_home_bottom_section', 10);

@@ -3305,11 +3305,11 @@ 
  */

 function geodir_action_sidebar_home_bottom_section()

 {

-    if (get_option('geodir_show_home_bottom_section')) { ?>

+	if (get_option('geodir_show_home_bottom_section')) { ?>

         <div

             class="<?php

-            /** This action is documented in geodirectory_template_actions.php */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">

+			/** This action is documented in geodirectory_template_actions.php */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">

             <?php dynamic_sidebar('geodir_home_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3337,13 +3337,13 @@ 
  */

 function geodir_filter_listing_page_title($list_title)

 {

-    if (is_search() && trim(get_search_query()) == '') {

-        $gd_post_type = geodir_get_current_posttype();

-        $post_type_info = get_post_type_object($gd_post_type);

+	if (is_search() && trim(get_search_query()) == '') {

+		$gd_post_type = geodir_get_current_posttype();

+		$post_type_info = get_post_type_object($gd_post_type);

 

-        $list_title = __('Search', 'geodirectory') . ' ' . __(ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

-    }

-    return $list_title;

+		$list_title = __('Search', 'geodirectory') . ' ' . __(ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

+	}

+	return $list_title;

 }

 

 add_action('geodir_message_not_found_on_listing', 'geodir_display_message_not_found_on_listing');

geodirectory-functions/listing_filters.php

Braces +30 added lines, -19 removed lines

@@ -16,7 +16,9 @@ 
  */

 function geodir_session_start()

 {

-    if (!session_id()) session_start();

+    if (!session_id()) {
+    	session_start();
+    }
     global $geodir_add_location_url;

 

     $geodir_add_location_url = NULL;

@@ -86,7 +88,9 @@ 
 

     if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')):

 

-        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

+        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') {
+        	$_REQUEST['scat'] = '';
+        }
         //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

 

         if (isset($_REQUEST['sdist'])) {

@@ -198,8 +202,9 @@ 
         add_filter('posts_fields', 'geodir_posts_fields', 1);

         add_filter('posts_join', 'geodir_posts_join', 1);

         geodir_post_where();

-        if (!is_admin())

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+        if (!is_admin()) {
+                    add_filter('posts_orderby', 'geodir_posts_orderby', 1);
+        }
 

         // advanced filter for popular post view widget

         global $wp_query;

@@ -346,8 +351,9 @@ 
     $sort_by = '';

     $orderby = ' ';

 

-    if (get_query_var('order_by'))

-        $sort_by = get_query_var('order_by');

+    if (get_query_var('order_by')) {
+            $sort_by = get_query_var('order_by');
+    }
 

     /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

         $current_term = $wp_query->get_queried_object();

@@ -367,14 +373,16 @@ 
         $orderby .= " distance,";

     }

 

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

-        $sort_by = esc_attr($_REQUEST['sort_by']);

+    if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) {
+            $sort_by = esc_attr($_REQUEST['sort_by']);
+    }
 

 

     if ($sort_by == '') {

         $default_sort = geodir_get_posts_default_sort($geodir_post_type);

-        if (!empty($default_sort))

-            $sort_by = $default_sort;

+        if (!empty($default_sort)) {
+                    $sort_by = $default_sort;
+        }
     }

 

     /*

@@ -562,8 +570,9 @@ 
 

             add_filter('posts_where', 'searching_filter_where', 1);

 

-            if ($snear != '')

-                add_filter('posts_where', 'searching_filter_where', 1);

+            if ($snear != '') {
+                            add_filter('posts_where', 'searching_filter_where', 1);
+            }
 

             add_filter('posts_orderby', 'geodir_posts_orderby', 1);

 

@@ -731,10 +740,11 @@ 
     }

 

     $better_search_terms = '';

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

-        $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

-    else

-        $post_types = 'gd_place';

+    if (isset($_REQUEST['stype'])) {
+            $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));
+    } else {
+            $post_types = 'gd_place';
+    }
 

     if ($s != '') {

         $keywords = explode(" ", $s);

@@ -762,7 +772,7 @@ 
     if($taxonomies) {

         $taxonomies = implode("','", $taxonomies);

         $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+    } else{$taxonomies='';}

 

     $content_where = $terms_where = '';

 	if ($s != '') {

@@ -878,8 +888,9 @@ 
             $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

             $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

             $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

-        } else

-            $where .= " AND $wpdb->posts.post_author = $user_id";

+        } else {
+                    $where .= " AND $wpdb->posts.post_author = $user_id";
+        }
 

         if ($user_id == (int)get_current_user_id()) {

             $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

Spacing +31 added lines, -31 removed lines

@@ -99,15 +99,15 @@ 
         } //  Distance

 

         if (isset($_REQUEST['sgeo_lat'])) {

-            $mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

+            $mylat = (float) esc_attr($_REQUEST['sgeo_lat']);

         } else {

-            $mylat = (float)geodir_get_current_city_lat();

+            $mylat = (float) geodir_get_current_city_lat();

         } //  Latatude

 

         if (isset($_REQUEST['sgeo_lon'])) {

-            $mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

+            $mylon = (float) esc_attr($_REQUEST['sgeo_lon']);

         } else {

-            $mylon = (float)geodir_get_current_city_lng();

+            $mylon = (float) geodir_get_current_city_lng();

         } //  Distance

 

         if (isset($_REQUEST['snear'])) {

@@ -250,9 +250,9 @@ 
     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

 

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -270,7 +270,7 @@ 
                 $count = 0;

                 foreach ($keywords as $keyword) {

                     $keyword = trim($keyword);

-                    $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+                    $keyword = wp_specialchars_decode($keyword, ENT_QUOTES);

 					$count++;

                     if ($count < count($keywords)) {

                        // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

@@ -285,8 +285,8 @@ 
         } else {

             $gd_titlematch_part = "";

         }

-        $s = stripslashes_deep( $s );

-        $s = wp_specialchars_decode($s,ENT_QUOTES);

+        $s = stripslashes_deep($s);

+        $s = wp_specialchars_decode($s, ENT_QUOTES);

 		$fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));

     }

 

@@ -441,9 +441,9 @@ 
 

     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -512,7 +512,7 @@ 
                 case 'post_date':

                 case 'comment_count':

 

-                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

+                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", " . $table . ".overall_rating " . $order . ", ";

                     break;

 

                 case 'distance':

@@ -577,7 +577,7 @@ 
         }

 

         //if (!geodir_is_page('detail'))

-            add_filter('posts_where', 'geodir_default_where', 1);/**/

+            add_filter('posts_where', 'geodir_default_where', 1); /**/

 

         //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

 

@@ -715,8 +715,8 @@ 
 	}

 	

 	$s = trim($s);

-    $s  = wp_specialchars_decode($s ,ENT_QUOTES);

-    $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

+    $s = wp_specialchars_decode($s, ENT_QUOTES);

+    $s_A = wp_specialchars_decode($s_A, ENT_QUOTES);

 

     $where = '';

     $better_search_terms = '';

@@ -727,9 +727,9 @@ 
 

     if ($s != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -738,7 +738,7 @@ 
         if (!empty($keywords)) {

             foreach ($keywords as $keyword) {

                 $keyword = trim($keyword);

-                $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+                $keyword = wp_specialchars_decode($keyword, ENT_QUOTES);

                 if ($keyword != '') {

                     /**

                      * Filter the search query keywords SQL.

@@ -749,7 +749,7 @@ 
                      * @param array $keywords The array of keywords for the query.

                      * @param string $keyword The single keyword being searched.

                      */

-					$better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);

+					$better_search_terms .= apply_filters("geodir_search_better_search_terms", ' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )', $keywords, $keyword);

                 }

             }

         }

@@ -757,10 +757,10 @@ 
 

     /* get taxonomy */

     $taxonomies = geodir_get_taxonomies($post_types, true);

-    if($taxonomies) {

+    if ($taxonomies) {

         $taxonomies = implode("','", $taxonomies);

         $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+    } else {$taxonomies = ''; }

 

     $content_where = $terms_where = '';

 	if ($s != '') {

@@ -771,7 +771,7 @@ 
          * @package GeoDirectory

          * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

          */

-		$content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

+		$content_where = apply_filters("geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

         /**

          * Filter the search query term values.

          *

@@ -779,7 +779,7 @@ 
          * @package GeoDirectory

          * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

          */

-        $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

+        $terms_where = apply_filters("geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

 	}

 		

     if ($snear != '') {

@@ -840,11 +840,11 @@ 
     }

 	

 	########### WPML ###########

-    if ( function_exists( 'icl_object_id' ) ) {       

+    if (function_exists('icl_object_id')) {       

 		$lang_code = ICL_LANGUAGE_CODE;

 		

 		if ($lang_code && $post_types) {

-            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

+            $where .= " AND icl_t.language_code = '" . $lang_code . "' AND icl_t.element_type IN('post_" . $post_types . "') ";

         }

     }

     ########### WPML ###########

@@ -867,10 +867,10 @@ 
     global $wpdb, $geodir_post_type, $table, $curr;

 

     $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

-    $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

+    $user_id = !empty($curauth->ID) ? (int) $curauth->ID : 0;

     

     if (isset($_REQUEST['stype'])) {

-        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

+        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ", $_REQUEST['stype']);

     } else {

         $where = " AND $wpdb->posts.post_type IN ('gd_place') ";

     }

@@ -883,7 +883,7 @@ 
         } else

             $where .= " AND $wpdb->posts.post_author = $user_id";

 

-        if ($user_id == (int)get_current_user_id()) {

+        if ($user_id == (int) get_current_user_id()) {

             $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

         } else {

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

Indentation +503 added lines, -503 removed lines

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

 /**

- * Contains all function for filtering listing.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * Contains all function for filtering listing.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

  

 /**

  * Starts session if not started.

@@ -16,10 +16,10 @@ 
  */

 function geodir_session_start()

 {

-    if (!session_id()) session_start();

-    global $geodir_add_location_url;

+	if (!session_id()) session_start();

+	global $geodir_add_location_url;

 

-    $geodir_add_location_url = NULL;

+	$geodir_add_location_url = NULL;

 }

 

 /**

@@ -33,18 +33,18 @@ 
  */

 function geodir_modified_query($query)

 {

-    if ($query->is_main_query() && (

-            (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

-            || geodir_is_page('listing')

-            || geodir_is_page('author')

-            || geodir_is_page('search')

-            || geodir_is_page('detail'))

-    ) {

-

-        $query->set('is_geodir_loop', true);

-    }

+	if ($query->is_main_query() && (

+			(geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

+			|| geodir_is_page('listing')

+			|| geodir_is_page('author')

+			|| geodir_is_page('search')

+			|| geodir_is_page('detail'))

+	) {

+

+		$query->set('is_geodir_loop', true);

+	}

 

-    return $query;

+	return $query;

 }

 

 /**

@@ -67,81 +67,81 @@ 
  */

 function set_listing_request()

 {

-    global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA;

+	global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA;

 

 

-    // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce

-    if (!geodir_is_geodir_page()) {

-        return;

-    }

+	// fix woocommerce shop products filtered by language for GD + WPML + Woocommerce

+	if (!geodir_is_geodir_page()) {

+		return;

+	}

 

-    /* remove all pre filters */

-    remove_all_filters('query');

-    remove_all_filters('posts_search');

-    remove_all_filters('posts_fields');

-    remove_all_filters('posts_join');

-    remove_all_filters('posts_orderby');

-    remove_all_filters('posts_where');

+	/* remove all pre filters */

+	remove_all_filters('query');

+	remove_all_filters('posts_search');

+	remove_all_filters('posts_fields');

+	remove_all_filters('posts_join');

+	remove_all_filters('posts_orderby');

+	remove_all_filters('posts_where');

 

 

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

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

 

-        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

-        //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

+		if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

+		//if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

 

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

-            ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000;

-        } elseif (get_option('geodir_search_dist') != '') {

-            $dist = get_option('geodir_search_dist');

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

+			($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000;

+		} elseif (get_option('geodir_search_dist') != '') {

+			$dist = get_option('geodir_search_dist');

 

-        } else {

-            $dist = 25000;

-        } //  Distance

+		} else {

+			$dist = 25000;

+		} //  Distance

 

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

-            $mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

-        } else {

-            $mylat = (float)geodir_get_current_city_lat();

-        } //  Latatude

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

+			$mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

+		} else {

+			$mylat = (float)geodir_get_current_city_lat();

+		} //  Latatude

 

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

-            $mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

-        } else {

-            $mylon = (float)geodir_get_current_city_lng();

-        } //  Distance

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

+			$mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

+		} else {

+			$mylon = (float)geodir_get_current_city_lng();

+		} //  Distance

 

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

-            $snear = trim(esc_attr($_REQUEST['snear']));

-        }

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

+			$snear = trim(esc_attr($_REQUEST['snear']));

+		}

 

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

-            $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s'])));

-        }

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

+			$s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s'])));

+		}

 

-        if ($snear == 'NEAR ME') {

-            $ip = $_SERVER['REMOTE_ADDR'];

-            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

-            $mylat = stripslashes(ucfirst($addr_details[geoplugin_latitude]));

-            $mylon = stripslashes(ucfirst($addr_details[geoplugin_longitude]));

-        }

+		if ($snear == 'NEAR ME') {

+			$ip = $_SERVER['REMOTE_ADDR'];

+			$addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

+			$mylat = stripslashes(ucfirst($addr_details[geoplugin_latitude]));

+			$mylon = stripslashes(ucfirst($addr_details[geoplugin_longitude]));

+		}

 

 

-        if (strstr($s, ',')) {

-            $s_AA = str_replace(" ", "", $s);

-            $s_A = explode(",", $s_AA);

-            $s_A = implode('","', $s_A);

-            $s_A = '"' . $s_A . '"';

-        } else {

-            $s_A = '"' . $s . '"';

-        }

+		if (strstr($s, ',')) {

+			$s_AA = str_replace(" ", "", $s);

+			$s_A = explode(",", $s_AA);

+			$s_A = implode('","', $s_A);

+			$s_A = '"' . $s_A . '"';

+		} else {

+			$s_A = '"' . $s . '"';

+		}

 

-        if (strstr($s, ' ')) {

-            $s_SA = explode(" ", $s);

-        } else {

-            $s_SA = '';

-        }

+		if (strstr($s, ' ')) {

+			$s_SA = explode(" ", $s);

+		} else {

+			$s_SA = '';

+		}

 

-    endif;

+	endif;

 

 

 

@@ -162,56 +162,56 @@ 
  */

 function geodir_listing_loop_filter($query)

 {

-    global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term;

+	global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term;

 

-    // fix wp_reset_query for popular post view widget

-    if (!geodir_is_geodir_page()) {

-        return;

-    }

+	// fix wp_reset_query for popular post view widget

+	if (!geodir_is_geodir_page()) {

+		return;

+	}

 

-    $geodir_post_type = geodir_get_current_posttype();

-

-    if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {

-        $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');

-

-        if (isset($wp_query->query[$taxonomies[0]])) {

-            $request_term = explode("/", $wp_query->query[$taxonomies[0]]);

-            $request_term = end($request_term);

-            if (!term_exists($request_term)) {

-                $args = array('number' => '1',);

-                $terms_arr = get_terms($taxonomies[0], $args);

-                foreach ($terms_arr as $location_term) {

-                    $term_arr = $location_term;

-                    $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));

-                }

-                $wp_query->queried_object_id = 1;

-                $wp_query->queried_object = $term_arr;

-                //print_r($wp_query) ;

-            }

-        }

+	$geodir_post_type = geodir_get_current_posttype();

+

+	if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {

+		$taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');

+

+		if (isset($wp_query->query[$taxonomies[0]])) {

+			$request_term = explode("/", $wp_query->query[$taxonomies[0]]);

+			$request_term = end($request_term);

+			if (!term_exists($request_term)) {

+				$args = array('number' => '1',);

+				$terms_arr = get_terms($taxonomies[0], $args);

+				foreach ($terms_arr as $location_term) {

+					$term_arr = $location_term;

+					$term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));

+				}

+				$wp_query->queried_object_id = 1;

+				$wp_query->queried_object = $term_arr;

+				//print_r($wp_query) ;

+			}

+		}

 

-    }

-    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

-

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

-

-        add_filter('posts_fields', 'geodir_posts_fields', 1);

-        add_filter('posts_join', 'geodir_posts_join', 1);

-        geodir_post_where();

-        if (!is_admin())

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

-

-        // advanced filter for popular post view widget

-        global $wp_query;

-        if (!is_admin()) {

-            if (!empty($wp_query->query['with_pics_only'])) {

-                add_filter('posts_join', 'geodir_filter_widget_join', 1000);

-            }

-            add_filter('posts_where', 'geodir_filter_widget_where', 1000);

-        }

+	}

+	if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

 

-    }

-    return $query;

+		$table = $plugin_prefix . $geodir_post_type . '_detail';

+

+		add_filter('posts_fields', 'geodir_posts_fields', 1);

+		add_filter('posts_join', 'geodir_posts_join', 1);

+		geodir_post_where();

+		if (!is_admin())

+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+

+		// advanced filter for popular post view widget

+		global $wp_query;

+		if (!is_admin()) {

+			if (!empty($wp_query->query['with_pics_only'])) {

+				add_filter('posts_join', 'geodir_filter_widget_join', 1000);

+			}

+			add_filter('posts_where', 'geodir_filter_widget_where', 1000);

+		}

+

+	}

+	return $query;

 }

 

 

@@ -230,67 +230,67 @@ 
  * @return string Modified fields query string.

  */

 function geodir_posts_fields($fields) {

-    global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

+	global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

 

-    // Filter-Location-Manager to add location table.

-    $fields .= ", " . $table . ".* ";

+	// Filter-Location-Manager to add location table.

+	$fields .= ", " . $table . ".* ";

     

 	if ($snear != '' || $gd_session->get('all_near_me')) {

-        $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

+		$DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

         

 		if ($gd_session->get('all_near_me')) {

-            $mylat = $gd_session->get('user_lat');

-            $mylon = $gd_session->get('user_lon');

-        }

-

-        $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

-    }

-

-    global $s;

-    if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

-        $keywords = explode(" ", $s);

-

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

+			$mylat = $gd_session->get('user_lat');

+			$mylon = $gd_session->get('user_lon');

+		}

 

+		$fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";

+	}

 

-        if (count($keywords) > 1) {

-            $parts = array(

-                'AND' => 'gd_alltitlematch_part',

-                'OR' => 'gd_titlematch_part'

-            );

-            $gd_titlematch_part = "";

-            foreach ($parts as $key => $part) {

-                $gd_titlematch_part .= " CASE WHEN ";

-                $count = 0;

-                foreach ($keywords as $keyword) {

-                    $keyword = trim($keyword);

-                    $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+	global $s;

+	if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

+		$keywords = explode(" ", $s);

+

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(mb_strlen($kword, 'UTF-8')<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+

+

+		if (count($keywords) > 1) {

+			$parts = array(

+				'AND' => 'gd_alltitlematch_part',

+				'OR' => 'gd_titlematch_part'

+			);

+			$gd_titlematch_part = "";

+			foreach ($parts as $key => $part) {

+				$gd_titlematch_part .= " CASE WHEN ";

+				$count = 0;

+				foreach ($keywords as $keyword) {

+					$keyword = trim($keyword);

+					$keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

 					$count++;

-                    if ($count < count($keywords)) {

-                       // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

+					if ($count < count($keywords)) {

+					   // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

 						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " ";

-                    } else {

-                        //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

+					} else {

+						//$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

 						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) ";

-                    }

-                }

-                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

-            }

-        } else {

-            $gd_titlematch_part = "";

-        }

-        $s = stripslashes_deep( $s );

-        $s = wp_specialchars_decode($s,ENT_QUOTES);

+					}

+				}

+				$gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

+			}

+		} else {

+			$gd_titlematch_part = "";

+		}

+		$s = stripslashes_deep( $s );

+		$s = wp_specialchars_decode($s,ENT_QUOTES);

 		$fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));

-    }

+	}

 

-    return $fields;

+	return $fields;

 }

 

 

@@ -307,26 +307,26 @@ 
  */

 function geodir_posts_join($join)

 {

-    global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix;

+	global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix;

 

-    ########### WPML ###########

+	########### WPML ###########

 

-    if (function_exists('icl_object_id')) {

-        global $sitepress;

-        $lang_code = ICL_LANGUAGE_CODE;

-        $default_lang_code = $sitepress->get_default_language();

-        if ($lang_code) {

-            $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

-        }

+	if (function_exists('icl_object_id')) {

+		global $sitepress;

+		$lang_code = ICL_LANGUAGE_CODE;

+		$default_lang_code = $sitepress->get_default_language();

+		if ($lang_code) {

+			$join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

+		}

 

-    }

-    ########### WPML ###########

+	}

+	########### WPML ###########

 

-    $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

-    //===old code start

-    //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

+	$join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

+	//===old code start

+	//$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

 

-    return $join;

+	return $join;

 }

 

 

@@ -344,15 +344,15 @@ 
  */

 function geodir_posts_orderby($orderby)

 {

-    global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort;

+	global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort;

 

-    $sort_by = '';

-    $orderby = ' ';

+	$sort_by = '';

+	$orderby = ' ';

 

-    if (get_query_var('order_by'))

-        $sort_by = get_query_var('order_by');

+	if (get_query_var('order_by'))

+		$sort_by = get_query_var('order_by');

 

-    /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

+	/*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

         $current_term = $wp_query->get_queried_object();

     }

 

@@ -366,116 +366,116 @@ 
     }*/

 

 

-    if ($snear != '') {

-        $orderby .= " distance,";

-    }

+	if ($snear != '') {

+		$orderby .= " distance,";

+	}

 

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

-        $sort_by = esc_attr($_REQUEST['sort_by']);

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

+		$sort_by = esc_attr($_REQUEST['sort_by']);

 

 

-    if ($sort_by == '') {

-        $default_sort = geodir_get_posts_default_sort($geodir_post_type);

-        if (!empty($default_sort))

-            $sort_by = $default_sort;

-    }

+	if ($sort_by == '') {

+		$default_sort = geodir_get_posts_default_sort($geodir_post_type);

+		if (!empty($default_sort))

+			$sort_by = $default_sort;

+	}

 

-    /*

+	/*

     if search by term & no location then order always "relevance"

     if search by location then order always "nearest"

     */

-    if (is_main_query() && geodir_is_page('search')) {

-        $search_term = get_query_var('s');

+	if (is_main_query() && geodir_is_page('search')) {

+		$search_term = get_query_var('s');

 

-        if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {

-            $sort_by = 'az';

-        }

+		if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {

+			$sort_by = 'az';

+		}

 

-        if ($snear != '') {

-            $sort_by = 'nearest';

-        }

-    }

+		if ($snear != '') {

+			$sort_by = 'nearest';

+		}

+	}

 

-    switch ($sort_by):

-        case 'newest':

-            $orderby = "$wpdb->posts.post_date desc, ";

-            break;

-        case 'oldest':

-            $orderby = "$wpdb->posts.post_date asc, ";

-            break;

-        case 'low_review':

-        case 'rating_count_asc':

-            $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

-            break;

-        case 'high_review':

-        case 'rating_count_desc':

+	switch ($sort_by):

+		case 'newest':

+			$orderby = "$wpdb->posts.post_date desc, ";

+			break;

+		case 'oldest':

+			$orderby = "$wpdb->posts.post_date asc, ";

+			break;

+		case 'low_review':

+		case 'rating_count_asc':

+			$orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

+			break;

+		case 'high_review':

+		case 'rating_count_desc':

 			$orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

-            break;

-        case 'low_rating':

-            $orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

-            break;

-        case 'high_rating':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

-            break;

-        case 'featured':

-            $orderby = $table . ".is_featured asc, ";

-            break;

-        case 'nearest':

-            $orderby = " distance asc, ";

-            break;

-        case 'farthest':

-            $orderby = " distance desc, ";

-            break;

-        case 'random':

-            $orderby = " rand(), ";

-            break;

-        case 'az':

-            $orderby = "$wpdb->posts.post_title asc, ";

-            break;

-        default:

-

-            break;

-    endswitch;

-

-    global $s;

-

-    if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

-        $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

-        if ($sort_by == 'nearest' || $sort_by == 'farthest') {

-            if (count($keywords) > 1) {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

-            } else {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

-            }

-        } else {

-            if (count($keywords) > 1) {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

-            } else {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

-            }

-        }

-    }

+			break;

+		case 'low_rating':

+			$orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

+			break;

+		case 'high_rating':

+			$orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+			break;

+		case 'featured':

+			$orderby = $table . ".is_featured asc, ";

+			break;

+		case 'nearest':

+			$orderby = " distance asc, ";

+			break;

+		case 'farthest':

+			$orderby = " distance desc, ";

+			break;

+		case 'random':

+			$orderby = " rand(), ";

+			break;

+		case 'az':

+			$orderby = "$wpdb->posts.post_title asc, ";

+			break;

+		default:

+

+			break;

+	endswitch;

+

+	global $s;

+

+	if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

+		$keywords = explode(" ", $s);

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(mb_strlen($kword, 'UTF-8')<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+		if ($sort_by == 'nearest' || $sort_by == 'farthest') {

+			if (count($keywords) > 1) {

+				$orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

+			} else {

+				$orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

+			}

+		} else {

+			if (count($keywords) > 1) {

+				$orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

+			} else {

+				$orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

+			}

+		}

+	}

 

-    /**

-     * Filter order by SQL.

-     *

-     * @since 1.0.0

-     * @param string $orderby The orderby query string.

-     * @param string $sort_by Sortby query string.

-     * @param string $table Listing table name.

-     */

-    $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

+	/**

+	 * Filter order by SQL.

+	 *

+	 * @since 1.0.0

+	 * @param string $orderby The orderby query string.

+	 * @param string $sort_by Sortby query string.

+	 * @param string $table Listing table name.

+	 */

+	$orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

 

-    $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

+	$orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

 

-    return $orderby;

+	return $orderby;

 }

 

 

@@ -493,53 +493,53 @@ 
 function geodir_posts_order_by_custom_sort($orderby, $sort_by, $table)

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    if ($sort_by != '' && !is_search()) {

+	if ($sort_by != '' && !is_search()) {

 

-        $sort_array = explode('_', $sort_by);

+		$sort_array = explode('_', $sort_by);

 

-        $sort_by_count = count($sort_array);

+		$sort_by_count = count($sort_array);

 

-        $order = $sort_array[$sort_by_count - 1];

+		$order = $sort_array[$sort_by_count - 1];

 

-        if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

+		if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

 

-            $sort_by = str_replace('_' . $order, '', $sort_by);

+			$sort_by = str_replace('_' . $order, '', $sort_by);

 

-            switch ($sort_by):

+			switch ($sort_by):

 

-                case 'post_date':

-                case 'comment_count':

+				case 'post_date':

+				case 'comment_count':

 

-                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

-                    break;

+					$orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

+					break;

 

-                case 'distance':

-                    $orderby = $sort_by . " " . $order . ", ";

-                    break;

+				case 'distance':

+					$orderby = $sort_by . " " . $order . ", ";

+					break;

 

 

-                // sort by rating

-                case 'overall_rating':

-                    $orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

+				// sort by rating

+				case 'overall_rating':

+					$orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

 

-                    break;

+					break;

 

 

-                default:

-                    if (geodir_column_exist($table, $sort_by)) {

+				default:

+					if (geodir_column_exist($table, $sort_by)) {

 						$orderby = $table . "." . $sort_by . " " . $order . ", ";

 					}

-                    break;

+					break;

 

-            endswitch;

+			endswitch;

 

-        }

+		}

 

-    }

+	}

 

-    return $orderby;

+	return $orderby;

 }

 

 /**

@@ -554,34 +554,34 @@ 
 {

 

 

-    global $wpdb, $geodir_post_type, $table, $s, $snear;

+	global $wpdb, $geodir_post_type, $table, $s, $snear;

 

-    if (!is_admin()) {

+	if (!is_admin()) {

 

-        if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            add_filter('posts_where', 'geodir_edit_listing_where', 1);

+		if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			add_filter('posts_where', 'geodir_edit_listing_where', 1);

 

-        } elseif ((is_search() && $_REQUEST['geodir_search'])) {

+		} elseif ((is_search() && $_REQUEST['geodir_search'])) {

 

-            add_filter('posts_where', 'searching_filter_where', 1);

+			add_filter('posts_where', 'searching_filter_where', 1);

 

-            if ($snear != '')

-                add_filter('posts_where', 'searching_filter_where', 1);

+			if ($snear != '')

+				add_filter('posts_where', 'searching_filter_where', 1);

 

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);

 

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

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

 

-            add_filter('posts_where', 'author_filter_where', 1);

+			add_filter('posts_where', 'author_filter_where', 1);

 

-        }

+		}

 

-        //if (!geodir_is_page('detail'))

-            add_filter('posts_where', 'geodir_default_where', 1);/**/

+		//if (!geodir_is_page('detail'))

+			add_filter('posts_where', 'geodir_default_where', 1);/**/

 

-        //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

+		//add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

 

-    }

+	}

 }

 

 /**

@@ -596,13 +596,13 @@ 
  */

 function geodir_preview_post_cap($allcaps, $caps, $args)

 {

-    $user_id = get_current_user_id();

-    if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {

+	$user_id = get_current_user_id();

+	if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {

 

-        $allcaps['edit_posts'] = true;

-    }

-    //print_r($allcaps);

-    return $allcaps;

+		$allcaps['edit_posts'] = true;

+	}

+	//print_r($allcaps);

+	return $allcaps;

 }

 

 

@@ -617,9 +617,9 @@ 
  */

 function geodir_edit_listing_where($where)

 {

-    global $wpdb;

-    $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);

-    return $where;

+	global $wpdb;

+	$where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);

+	return $where;

 }

 

 

@@ -636,29 +636,29 @@ 
  */

 function geodir_default_where($where)

 {

-    global $wp_query, $wpdb;

-

-    //print_r($wp_query);

-    ########### WPML ###########

-

-    if (function_exists('icl_object_id')) {

-        global $sitepress, $table_prefix;

-        $lang_code = ICL_LANGUAGE_CODE;

-        $default_lang_code = $sitepress->get_default_language();

-        $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

-        //echo '##########'.$q_post_type;

-        if ($lang_code && $q_post_type) {

-            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

-            //$where .= " AND icl_t.language_code = '$lang_code' ";

-        }

+	global $wp_query, $wpdb;

 

-    }

-    ########### WPML ###########

+	//print_r($wp_query);

+	########### WPML ###########

 

+	if (function_exists('icl_object_id')) {

+		global $sitepress, $table_prefix;

+		$lang_code = ICL_LANGUAGE_CODE;

+		$default_lang_code = $sitepress->get_default_language();

+		$q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

+		//echo '##########'.$q_post_type;

+		if ($lang_code && $q_post_type) {

+			$where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

+			//$where .= " AND icl_t.language_code = '$lang_code' ";

+		}

 

-    return $where = str_replace("0 = 1", "1=1", $where);

+	}

+	########### WPML ###########

 

-    /* ====== old code start ===

+

+	return $where = str_replace("0 = 1", "1=1", $where);

+

+	/* ====== old code start ===

     $where = str_replace("0 = 1", "1=1", $where);

     $country = get_query_var('gd_country');

     $region = get_query_var('gd_region');

@@ -699,108 +699,108 @@ 
  * @return string Modified where query string.

  */

 function searching_filter_where($where) {

-    global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session;

+	global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session;

 	

-    $search_term = 'OR';

-    $search_term = 'AND';

-    $geodir_custom_search = '';

-    $category_search_range = '';

+	$search_term = 'OR';

+	$search_term = 'AND';

+	$geodir_custom_search = '';

+	$category_search_range = '';

 

-    if (is_single() && get_query_var('post_type')) {

+	if (is_single() && get_query_var('post_type')) {

 		return $where;

 	}

 

-    if (is_tax()) {

+	if (is_tax()) {

 		return $where;

 	}

 	

 	$s = trim($s);

-    $s  = wp_specialchars_decode($s ,ENT_QUOTES);

-    $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

-

-    $where = '';

-    $better_search_terms = '';

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

-        $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

-    else

-        $post_types = 'gd_place';

-

-    if ($s != '') {

-        $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

-                    unset($keywords[$kkey]);

-                }

-            }

-        }

+	$s  = wp_specialchars_decode($s ,ENT_QUOTES);

+	$s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

+

+	$where = '';

+	$better_search_terms = '';

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

+		$post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

+	else

+		$post_types = 'gd_place';

 

-        if (!empty($keywords)) {

-            foreach ($keywords as $keyword) {

-                $keyword = trim($keyword);

-                $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

-                if ($keyword != '') {

-                    /**

-                     * Filter the search query keywords SQL.

-                     *

-                     * @since 1.5.9

-                     * @package GeoDirectory

-                     * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`.

-                     * @param array $keywords The array of keywords for the query.

-                     * @param string $keyword The single keyword being searched.

-                     */

+	if ($s != '') {

+		$keywords = explode(" ", $s);

+		if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

+			foreach($keywords as $kkey=>$kword){

+				if(mb_strlen($kword, 'UTF-8')<=$klimit){

+					unset($keywords[$kkey]);

+				}

+			}

+		}

+

+		if (!empty($keywords)) {

+			foreach ($keywords as $keyword) {

+				$keyword = trim($keyword);

+				$keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+				if ($keyword != '') {

+					/**

+					 * Filter the search query keywords SQL.

+					 *

+					 * @since 1.5.9

+					 * @package GeoDirectory

+					 * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`.

+					 * @param array $keywords The array of keywords for the query.

+					 * @param string $keyword The single keyword being searched.

+					 */

 					$better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);

-                }

-            }

-        }

-    }

+				}

+			}

+		}

+	}

 

-    /* get taxonomy */

-    $taxonomies = geodir_get_taxonomies($post_types, true);

-    if($taxonomies) {

-        $taxonomies = implode("','", $taxonomies);

-        $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+	/* get taxonomy */

+	$taxonomies = geodir_get_taxonomies($post_types, true);

+	if($taxonomies) {

+		$taxonomies = implode("','", $taxonomies);

+		$taxonomies = "'" . $taxonomies . "'";

+	}else{$taxonomies='';}

 

-    $content_where = $terms_where = '';

+	$content_where = $terms_where = '';

 	if ($s != '') {

-        /**

-         * Filter the search query content where values.

-         *

-         * @since 1.5.0

-         * @package GeoDirectory

-         * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

-         */

+		/**

+		 * Filter the search query content where values.

+		 *

+		 * @since 1.5.0

+		 * @package GeoDirectory

+		 * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

+		 */

 		$content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

-        /**

-         * Filter the search query term values.

-         *

-         * @since 1.5.0

-         * @package GeoDirectory

-         * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

-         */

-        $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

+		/**

+		 * Filter the search query term values.

+		 *

+		 * @since 1.5.0

+		 * @package GeoDirectory

+		 * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

+		 */

+		$terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

 	}

 		

-    if ($snear != '') {

+	if ($snear != '') {

 

 

-        if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {

-            $dist = $gd_session->get('near_me_range');

-        }

-        $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69);

-        $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69);

-        $lat1 = $mylat - ($dist / 69);

-        $lat2 = $mylat + ($dist / 69);

+		if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {

+			$dist = $gd_session->get('near_me_range');

+		}

+		$lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69);

+		$lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69);

+		$lat1 = $mylat - ($dist / 69);

+		$lat2 = $mylat + ($dist / 69);

 

-        $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : '';

-        $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : '';

-        $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : '';

-        $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : '';

+		$rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : '';

+		$rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : '';

+		$rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : '';

+		$rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : '';

 

 

 

-	    $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

+		$where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

 			                    $content_where 

 								OR ($wpdb->posts.ID IN( 

 										SELECT $wpdb->term_relationships.object_id as post_id 

@@ -817,13 +817,13 @@ 
 						AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 )

 						AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) ";

 

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

-            $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

-            $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;

-        }

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

+			$DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

+			$where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;

+		}

 

-    } else {

-        $where .= " AND (	( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

+	} else {

+		$where .= " AND (	( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

                             $content_where  

 							OR ( $wpdb->posts.ID IN(	

 									SELECT $wpdb->term_relationships.object_id as post_id                     

@@ -837,19 +837,19 @@ 
 					) 

 				AND $wpdb->posts.post_type in ('$post_types')

 				AND ($wpdb->posts.post_status = 'publish') ";

-    }

+	}

 	

 	########### WPML ###########

-    if ( function_exists( 'icl_object_id' ) ) {       

+	if ( function_exists( 'icl_object_id' ) ) {       

 		$lang_code = ICL_LANGUAGE_CODE;

 		

 		if ($lang_code && $post_types) {

-            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

-        }

-    }

-    ########### WPML ###########

+			$where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

+		}

+	}

+	########### WPML ###########

 	

-    return $where;

+	return $where;

 }

 

 

@@ -864,45 +864,45 @@ 
  * @return string Modified where query string.

  */

 function author_filter_where($where) {

-    global $wpdb, $geodir_post_type, $table, $curr;

+	global $wpdb, $geodir_post_type, $table, $curr;

 

-    $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

-    $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

+	$curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

+	$user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

     

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

-        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

-    } else {

-        $where = " AND $wpdb->posts.post_type IN ('gd_place') ";

-    }

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

+		$where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

+	} else {

+		$where = " AND $wpdb->posts.post_type IN ('gd_place') ";

+	}

 

-    if ($user_id > 0) {

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

-            $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

-            $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

-            $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

-        } else

-            $where .= " AND $wpdb->posts.post_author = $user_id";

-

-        if ($user_id == (int)get_current_user_id()) {

-            $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

-        } else {

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

-        }

-    } else {

-        $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' ";

-    }

+	if ($user_id > 0) {

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

+			$user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);

+			$user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';

+			$where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";

+		} else

+			$where .= " AND $wpdb->posts.post_author = $user_id";

+

+		if ($user_id == (int)get_current_user_id()) {

+			$where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

+		} else {

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

+		}

+	} else {

+		$where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' ";

+	}

 

-    ########### WPML ###########

-    if (function_exists('icl_object_id')) {

-        $lang_code = ICL_LANGUAGE_CODE;

-        if ($lang_code) {

-            $where .= " AND icl_t.language_code='" . $lang_code . "' ";

-        }

+	########### WPML ###########

+	if (function_exists('icl_object_id')) {

+		$lang_code = ICL_LANGUAGE_CODE;

+		if ($lang_code) {

+			$where .= " AND icl_t.language_code='" . $lang_code . "' ";

+		}

 

-    }

-    ########### WPML ###########

+	}

+	########### WPML ###########

     

-    return $where;

+	return $where;

 }

 

 /**

@@ -917,11 +917,11 @@ 
  */

 function geodir_filter_widget_join($join)

 {

-    global $wp_query, $table;

-    if (!empty($wp_query->query['with_pics_only'])) {

-        $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

-    }

-    return $join;

+	global $wp_query, $table;

+	if (!empty($wp_query->query['with_pics_only'])) {

+		$join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

+	}

+	return $join;

 }

 

 /**

@@ -936,18 +936,18 @@ 
  */

 function geodir_filter_widget_where($where)

 {

-    global $wp_query, $table;

-    if (!empty($wp_query->query['show_featured_only'])) {

-        $where .= " AND " . $table . ".is_featured = '1'";

-    }

-    if (!empty($wp_query->query['show_special_only'])) {

-        $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

-    }

-    if (!empty($wp_query->query['with_pics_only'])) {

-        $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

-    }

-    if (!empty($wp_query->query['with_videos_only'])) {

-        $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

-    }

-    return $where;

+	global $wp_query, $table;

+	if (!empty($wp_query->query['show_featured_only'])) {

+		$where .= " AND " . $table . ".is_featured = '1'";

+	}

+	if (!empty($wp_query->query['show_special_only'])) {

+		$where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

+	}

+	if (!empty($wp_query->query['with_pics_only'])) {

+		$where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

+	}

+	if (!empty($wp_query->query['with_videos_only'])) {

+		$where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

+	}

+	return $where;

 }
\ No newline at end of file

db-language.php

Indentation +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Translate language string stored in database. Ex: Custom Fields
- *
- * @package GeoDirectory
- * @since 1.4.2
- */
+	 * Translate language string stored in database. Ex: Custom Fields
+	 *
+	 * @package GeoDirectory
+	 * @since 1.4.2
+	 */
 
 // Language keys

geodirectory_shortcodes.php

Indentation +656 added lines, -656 removed lines

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

Spacing +10 added lines, -10 removed lines

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

geodirectory-templates/reg_frm.php

Indentation +39 added lines, -39 removed lines

@@ -9,13 +9,13 @@ 
  * @package GeoDirectory

  */

 if (isset($_GET['redirect_to']) && $_GET['redirect_to'] != '') {

-    $redirect_to = $_GET['redirect_to'];

+	$redirect_to = $_GET['redirect_to'];

 } else {

-    //echo $_SERVER['HTTP_HOST'] ;

-    $redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

-    if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

-        $redirect_to = home_url();

-    }

+	//echo $_SERVER['HTTP_HOST'] ;

+	$redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

+	if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

+		$redirect_to = home_url();

+	}

 }

 ?>

 <div id="sign_up">

@@ -26,28 +26,28 @@ 
         <h4>

             <?php

 

-            /**

-             * Filter the `REGISTRATION_NOW_TEXT` title text on the register form template.

-             *

-             * @since 1.0.0

-             */

-            echo apply_filters('geodir_registration_page_title', REGISTRATION_NOW_TEXT);

+			/**

+			 * Filter the `REGISTRATION_NOW_TEXT` title text on the register form template.

+			 *

+			 * @since 1.0.0

+			 */

+			echo apply_filters('geodir_registration_page_title', REGISTRATION_NOW_TEXT);

 

-            ?>

+			?>

         </h4>

         <?php

-        global $geodir_signup_error;

-        if ($geodir_signup_error != '') {

-            echo '<p class="error_msg">' . $geodir_signup_error . '</p>';

-            unset($geodir_signup_error);

-        } else {

-            if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 1) {

-                echo '<p class="error_msg">' . EMAIL_USERNAME_EXIST_MSG . '</p>';

-            } else if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'regnewusr') {

-                echo '<p class="error_msg">' . REGISTRATION_DESABLED_MSG . '</p>';

-            }

-        }

-        ?>

+		global $geodir_signup_error;

+		if ($geodir_signup_error != '') {

+			echo '<p class="error_msg">' . $geodir_signup_error . '</p>';

+			unset($geodir_signup_error);

+		} else {

+			if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 1) {

+				echo '<p class="error_msg">' . EMAIL_USERNAME_EXIST_MSG . '</p>';

+			} else if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'regnewusr') {

+				echo '<p class="error_msg">' . REGISTRATION_DESABLED_MSG . '</p>';

+			}

+		}

+		?>

 

         <form name="cus_registerform" id="cus_registerform"

               action="<?php echo htmlspecialchars(geodir_curPageURL()); ?>" method="post">

@@ -57,10 +57,10 @@ 
             <div class="form_row clearfix">

                 <input placeholder='<?php echo EMAIL_TEXT; ?>' type="text" name="user_email" id="user_email"

                        class="textfield" value="<?php global $user_email;

-                if (!isset($user_email)) {

-                    $user_email = '';

-                }

-                echo esc_attr(stripslashes($user_email)); ?>" size="25"/>

+				if (!isset($user_email)) {

+					$user_email = '';

+				}

+				echo esc_attr(stripslashes($user_email)); ?>" size="25"/>

 

                 <?php if (!get_option('geodir_allow_cpass')) { ?>

 				<div id="reg_passmail">

@@ -74,8 +74,8 @@ 
                 <div class="form_row clearfix">

                     <input placeholder='<?php echo FIRST_NAME_TEXT; ?>' type="text" name="user_fname" id="user_fname"

                            class="textfield" value="<?php if (isset($user_fname)) {

-                        echo esc_attr(stripslashes($user_fname));

-                    } ?>" size="25"/>

+						echo esc_attr(stripslashes($user_fname));

+					} ?>" size="25"/>

                     <span id="user_fnameInfo"></span>

                 </div>

             </div>

@@ -101,14 +101,14 @@ 
             <?php } ?>

 

             <?php

-            /**

-             * Called just before the register new user button on the register form template.

-             *

-             * Also used by other plugins to add social connect buttons.

-             *

-             * @since 1.0.0

-             */

-            do_action('social_connect_form'); ?>

+			/**

+			 * Called just before the register new user button on the register form template.

+			 *

+			 * Also used by other plugins to add social connect buttons.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('social_connect_form'); ?>

             <input type="submit" name="registernow" value="<?php echo REGISTER_NOW_TEXT; ?>" class="geodir_button"/>

         </form>

     </div>