GeoDirectory / geodirectory

geodirectory-functions/template_functions.php

Indentation +105 added lines, -105 removed lines

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

 /**

- * Template functions

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Template functions

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 /**

  * Locates template based on the template type.

@@ -29,21 +29,21 @@ 
         case 'add-listing':

 

             $sc_post_type = '';

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

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

                 $listing_page_id = $post->ID;

 				

-				$regex_pattern = get_shortcode_regex();

-				preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

+                $regex_pattern = get_shortcode_regex();

+                preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

 				

-				if (!empty($regex_matches) && isset($regex_matches[2]) == 'gd_add_listing' && isset($regex_matches[3])) {

-					$shortcode_atts = shortcode_parse_atts($regex_matches[3]);

-					$sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : '';

-				}

+                if (!empty($regex_matches) && isset($regex_matches[2]) == 'gd_add_listing' && isset($regex_matches[3])) {

+                    $shortcode_atts = shortcode_parse_atts($regex_matches[3]);

+                    $sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : '';

+                }

             } else {

                 $listing_page_id = geodir_add_listing_page_id();

             }

 			

-			$is_wpml = function_exists('icl_object_id') ? true : false;

+            $is_wpml = function_exists('icl_object_id') ? true : false;

 

             if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

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

@@ -55,14 +55,14 @@ 
                 if (!empty($post_types))

                     $post_type = $post_types[0];

 					

-				if($sc_post_type != '' )

-					$post_type = $sc_post_type;

+                if($sc_post_type != '' )

+                    $post_type = $sc_post_type;

 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

-					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

-				} else {

-					wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

-				}

+                    wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

+                } else {

+                    wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

+                }

                 exit();

             }

             return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));

@@ -481,21 +481,21 @@ 
  */

 function geodir_display_message_not_found_on_listing($template_listview = 'listing-listview', $favorite = false) {

     if ($favorite) {

-		$message = __('No favorite listings found which match your selection.', 'geodirectory');

-	} else {

-		$message = __('No listings found which match your selection.', 'geodirectory');

-	}

+        $message = __('No favorite listings found which match your selection.', 'geodirectory');

+    } else {

+        $message = __('No listings found which match your selection.', 'geodirectory');

+    }

 	

-	/**

-	 * Filter the no listing found message.

-	 *

-	 * @since 1.5.5

-	 * @param string $template_listview Listing listview template.

-	 * @param bool $favorite Are favorite listings results?

-	 */

-	$message = apply_filters('geodir_message_listing_not_found', $message, $template_listview, $favorite);

+    /**

+     * Filter the no listing found message.

+     *

+     * @since 1.5.5

+     * @param string $template_listview Listing listview template.

+     * @param bool $favorite Are favorite listings results?

+     */

+    $message = apply_filters('geodir_message_listing_not_found', $message, $template_listview, $favorite);

 	

-	echo '<li class="no-listing">' . $message . '</li>';

+    echo '<li class="no-listing">' . $message . '</li>';

 }

 

 /**

@@ -509,9 +509,9 @@ 
  * @return string Breadcrumb HTML.

  */

 function geodir_strip_breadcrumb_li_wrappers($breadcrumb, $separator) {

-	$breadcrumb = str_replace(array('</li><li>', '</li> <li>'), '', $breadcrumb);

+    $breadcrumb = str_replace(array('</li><li>', '</li> <li>'), '', $breadcrumb);

 	

-	return $breadcrumb;

+    return $breadcrumb;

 }

 

 /**

@@ -522,30 +522,30 @@ 
  * @return string Listing listview class.

  */

 function geodir_convert_listing_view_class($columns = '') {

-	$class = '';

+    $class = '';

 	

-	switch ((int)$columns) {

-		case 1:

-			$class = '';

-		break;

-		case 2:

-			$class = 'gridview_onehalf';

-		break;

-		case 3:

-			$class = 'gridview_onethird';

-		break;

-		case 4:

-			$class = 'gridview_onefourth';

-		break;

-		case 5:

-			$class = 'gridview_onefifth';

-		break;

-		default:

-			$class = '';

-		break;

-	}

+    switch ((int)$columns) {

+        case 1:

+            $class = '';

+        break;

+        case 2:

+            $class = 'gridview_onehalf';

+        break;

+        case 3:

+            $class = 'gridview_onethird';

+        break;

+        case 4:

+            $class = 'gridview_onefourth';

+        break;

+        case 5:

+            $class = 'gridview_onefifth';

+        break;

+        default:

+            $class = '';

+        break;

+    }

 	

-	return $class;

+    return $class;

 }

 

 /**

@@ -558,18 +558,18 @@ 
  * @return bool Modified value for display the excerpt.

  */

 function geodir_show_listing_post_excerpt($display, $view, $post) {

-	if ($view == 'listview') {

-		if (geodir_is_page('author')) {

-			$word_limit = get_option('geodir_author_desc_word_limit');

-		} else {

-			$word_limit = get_option('geodir_desc_word_limit');

-		}

+    if ($view == 'listview') {

+        if (geodir_is_page('author')) {

+            $word_limit = get_option('geodir_author_desc_word_limit');

+        } else {

+            $word_limit = get_option('geodir_desc_word_limit');

+        }

 		

-		if ($word_limit !== '' && ($word_limit == 0 || $word_limit == '0')) {

-			$display = false;

-		}

-	}

-	return $display;

+        if ($word_limit !== '' && ($word_limit == 0 || $word_limit == '0')) {

+            $display = false;

+        }

+    }

+    return $display;

 }

 

 /**

@@ -584,24 +584,24 @@ 
  * @return string Rating icons html content.

  */

 function geodir_font_awesome_rating_form_html($html, $star_texts = array(), $default = '') {

-	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

-		$html = '<select class="gd-fa-rating">';

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

-		if (!empty($star_texts) && is_array($star_texts)) {

-			foreach ($star_texts as $i => $text) {

-				$html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

-			}

-		} else {

-			$html .= '<option value="1">1</option>';

-			$html .= '<option value="2">2</option>';

-			$html .= '<option value="3">3</option>';

-			$html .= '<option value="4">4</option>';

-			$html .= '<option value="5">5</option>';

-		}

-		$html .= '</select>';

-	}

-

-	return $html;

+    if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

+        $html = '<select class="gd-fa-rating">';

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

+        if (!empty($star_texts) && is_array($star_texts)) {

+            foreach ($star_texts as $i => $text) {

+                $html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

+            }

+        } else {

+            $html .= '<option value="1">1</option>';

+            $html .= '<option value="2">2</option>';

+            $html .= '<option value="3">3</option>';

+            $html .= '<option value="4">4</option>';

+            $html .= '<option value="5">5</option>';

+        }

+        $html .= '</select>';

+    }

+

+    return $html;

 }

 

 /**

@@ -616,20 +616,20 @@ 
  * @return string Rating icons html content.

  */

 function geodir_font_awesome_rating_stars_html($html, $rating, $star_count = 5) {

-	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

-		$rating = min($rating, $star_count);

-		$full_stars = floor( $rating );

-		$half_stars = ceil( $rating - $full_stars );

-		$empty_stars = $star_count - $full_stars - $half_stars;

+    if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

+        $rating = min($rating, $star_count);

+        $full_stars = floor( $rating );

+        $half_stars = ceil( $rating - $full_stars );

+        $empty_stars = $star_count - $full_stars - $half_stars;

 		

-		$html = '<div class="gd-star-rating gd-fa-star-rating">';

-		$html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

-		$html .= '</div>';

-	}

-

-	return $html;

+        $html = '<div class="gd-star-rating gd-fa-star-rating">';

+        $html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

+        $html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

+        $html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

+        $html .= '</div>';

+    }

+

+    return $html;

 }

 

 /**

@@ -639,12 +639,12 @@ 
  * @package GeoDirectory

  */

 function geodir_font_awesome_rating_css() {

-	// Font awesome rating style

-	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

-		$full_color = get_option('geodir_reviewrating_fa_full_rating_color', '#757575');

-		if ($full_color != '#757575') {

-			echo '<style type="text/css">.br-theme-fontawesome-stars .br-widget a.br-active:after,.br-theme-fontawesome-stars .br-widget a.br-selected:after,

+    // Font awesome rating style

+    if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

+        $full_color = get_option('geodir_reviewrating_fa_full_rating_color', '#757575');

+        if ($full_color != '#757575') {

+            echo '<style type="text/css">.br-theme-fontawesome-stars .br-widget a.br-active:after,.br-theme-fontawesome-stars .br-widget a.br-selected:after,

 			.gd-star-rating i.fa {color:' . stripslashes($full_color) . '!important;</style>';

-		}

-	}

+        }

+    }

 }
\ No newline at end of file

geodirectory_template_tags.php

Indentation +29 added lines, -29 removed lines

@@ -184,17 +184,17 @@ 
 

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

-	}

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

+    }

 

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

-	} else { // default rating script

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

-		wp_enqueue_script('geodir-jRating-js');

-	}

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

+    } else { // default rating script

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

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

@@ -230,7 +230,7 @@ 
  */

 function geodir_footer_scripts()

 {	

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

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

     echo stripslashes(get_option('geodir_footer_scripts'));

 }

 

@@ -363,9 +363,9 @@ 
         return;

 

     if (!is_single()) {

-		if (function_exists('geodir_location_geo_home_link')) {

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

-		}

+        if (function_exists('geodir_location_geo_home_link')) {

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

+        }

         $numposts = $wp_query->found_posts;

 

 

@@ -376,22 +376,22 @@ 
         }

 

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

+            // 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 != '') {

-				$pagination_info = '<div class="gd-pagination-details">' . wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts) . '</div>';

+            if ($geodir_pagination_more_info != '') {

+                $pagination_info = '<div class="gd-pagination-details">' . wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts) . '</div>';

 				

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

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

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

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

             }

@@ -412,9 +412,9 @@ 
             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);

+        }

     }

 }

 

geodirectory-admin/admin_functions.php

Indentation +891 added lines, -891 removed lines

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

 /**

- * Admin functions.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Admin functions.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 /**

  * Updates option value when GeoDirectory get deactivated.

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

         wp_enqueue_script('geodirectory-goMap-script');

 

-		// font awesome rating script

-		if (get_option('geodir_reviewrating_enable_font_awesome')) {

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

-			wp_enqueue_script('geodir-barrating-js');

-		} else { // default rating script

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

-			wp_enqueue_script('geodir-jRating-js');

-		}

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

+            wp_enqueue_script('geodir-barrating-js');

+        } else { // default rating script

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

+            wp_enqueue_script('geodir-jRating-js');

+        }

 

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

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

@@ -337,13 +337,13 @@ 
                 flush_rewrite_rules(false);

 

                 break;

-			case 'fail':

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

+            case 'fail':

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

 				

-				if ($gderr == 21)

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

-				else

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

+                if ($gderr == 21)

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

+                else

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

                 break;

         }

     }

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

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

 		

-		/**

-		 * Fires before updating geodirectory admin settings.

-		 *

-		 * @since 1.4.2

-		 *

-		 * @param string $current_tab Current tab in geodirectory settings.

-		 * @param array  $geodir_settings Array of geodirectory settings.

-		 */

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

+        /**

+         * Fires before updating geodirectory admin settings.

+         *

+         * @since 1.4.2

+         *

+         * @param string $current_tab Current tab in geodirectory settings.

+         * @param array  $geodir_settings Array of geodirectory settings.

+         */

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

 		

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

             geodir_update_options($geodir_settings[$current_tab]);

@@ -480,11 +480,11 @@ 
                 <?php

 

                     $default_location = geodir_get_default_location();

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

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

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

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

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

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

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

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

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

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

 

                 ?>

                 var geocoder = new google.maps.Geocoder();

@@ -757,7 +757,7 @@ 
  */

 function geodir_update_options($options, $dummy = false)

 {

-   // print_r($_POST);    print_r($options);    exit;

+    // print_r($_POST);    print_r($options);    exit;

 

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

 

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

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

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

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

-                                           } else {

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

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

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

+                                            } else {

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

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

                 </tr><?php

                 break;

 

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

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

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

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

-                                           } else {

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

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

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

+                                            } else {

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

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

                 </tr><?php

                 break;

 

@@ -2293,10 +2293,10 @@ 
                                            id="<?php echo esc_attr($value['id']); ?>" type="text"

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

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

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

-                                           } else {

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

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

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

+                                            } else {

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

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

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

 

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

@@ -2685,22 +2685,22 @@ 
 

             case 'single_select_page' :

                 // WPML

-				$switch_lang = false;

-				$disabled = '';

-				if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

-					global $sitepress;

+                $switch_lang = false;

+                $disabled = '';

+                if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

+                    global $sitepress;

 					

-					$default_lang = $sitepress->get_default_language();

-					$current_lang = $sitepress->get_current_language();

+                    $default_lang = $sitepress->get_default_language();

+                    $current_lang = $sitepress->get_current_language();

 					

-					if ($current_lang != 'all' && $current_lang != $default_lang) {

-						$disabled = "disabled='disabled'";

-						$switch_lang = $current_lang;

-						$sitepress->switch_lang('all', true);

-					}

-				}

-				//

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

+                    if ($current_lang != 'all' && $current_lang != $default_lang) {

+                        $disabled = "disabled='disabled'";

+                        $switch_lang = $current_lang;

+                        $sitepress->switch_lang('all', true);

+                    }

+                }

+                //

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

 

                 $args = array('name' => $value['id'],

                     'id' => $value['id'],

@@ -2721,9 +2721,9 @@ 
                     <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-				if ($switch_lang) {

-					$sitepress->switch_lang($switch_lang, true);

-				}

+                if ($switch_lang) {

+                    $sitepress->switch_lang($switch_lang, true);

+                }

                 break;

             case 'single_select_country' :

                 $countries = $geodirectory->countries->countries;

@@ -3355,22 +3355,22 @@ 
  * @return string Post type ex: gd_place

  */

 function geodir_admin_current_post_type() {

-	global $post, $typenow, $current_screen;

+    global $post, $typenow, $current_screen;

 	

-	$post_type = NULL;

+    $post_type = NULL;

 	

-	if ($post && isset($post->post_type))

-		$post_type = $post->post_type;

-	elseif ($typenow)

-		$post_type = $typenow;

-	elseif ($current_screen && isset($current_screen->post_type))

-		$post_type = $current_screen->post_type;

-	elseif (isset($_REQUEST['post_type']))

-		$post_type = sanitize_key($_REQUEST['post_type']);

-	elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

-		$post_type = get_post_type($_REQUEST['post']);

-

-	return $post_type;

+    if ($post && isset($post->post_type))

+        $post_type = $post->post_type;

+    elseif ($typenow)

+        $post_type = $typenow;

+    elseif ($current_screen && isset($current_screen->post_type))

+        $post_type = $current_screen->post_type;

+    elseif (isset($_REQUEST['post_type']))

+        $post_type = sanitize_key($_REQUEST['post_type']);

+    elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

+        $post_type = get_post_type($_REQUEST['post']);

+

+    return $post_type;

 }

 

 /**

@@ -3385,33 +3385,33 @@ 
  * @param array  $geodir_settings Array of geodirectory settings.

  */

 function geodir_before_update_options($current_tab, $geodir_settings) {

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

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

 		

-	// Permalink settings

-	if ($current_tab == 'permalink_settings') {

-		$listing_prefix = isset($_POST['geodir_listing_prefix']) ? trim($_POST['geodir_listing_prefix']) : '';

-		$location_prefix = isset($_POST['geodir_location_prefix']) ? trim($_POST['geodir_location_prefix']) : '';

+    // Permalink settings

+    if ($current_tab == 'permalink_settings') {

+        $listing_prefix = isset($_POST['geodir_listing_prefix']) ? trim($_POST['geodir_listing_prefix']) : '';

+        $location_prefix = isset($_POST['geodir_location_prefix']) ? trim($_POST['geodir_location_prefix']) : '';

 		

-		// Don't allow same slug url for listing and location

-		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

-			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

-        	wp_redirect($redirect_url);

-			exit;

-		}

+        // Don't allow same slug url for listing and location

+        if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

+            $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

+            wp_redirect($redirect_url);

+            exit;

+        }

 		

-		// Don't allow to update page settings on different language.

-		if (geodir_is_wpml()) {

-			global $sitepress;

-			$current_language = $sitepress->get_current_language();

-			$default_language = $sitepress->get_default_language();

+        // Don't allow to update page settings on different language.

+        if (geodir_is_wpml()) {

+            global $sitepress;

+            $current_language = $sitepress->get_current_language();

+            $default_language = $sitepress->get_default_language();

 			

-			if ($current_language != 'all' && $current_language != $default_language) {

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

-				wp_redirect($redirect_url);

-				exit;

-			}

-		}

-	}

+            if ($current_language != 'all' && $current_language != $default_language) {

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

+                wp_redirect($redirect_url);

+                exit;

+            }

+        }

+    }

 }

 

 

@@ -3442,7 +3442,7 @@ 
  * @return array Array of tab data.

  */

 function geodir_import_export_tab( $tabs ) {

-	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

+    $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

     return $tabs;

 }

 

@@ -3456,8 +3456,8 @@ 
  * @return string Html content.

  */

 function geodir_import_export_page() {

-	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

-	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

+    $nonce = wp_create_nonce( 'geodir_import_export_nonce' );

+    $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

     /**

      * Filter sample category data csv file url.

      *

@@ -3466,9 +3466,9 @@ 
      *

      * @param string $gd_cats_sample_csv Sample category data csv file url.

      */

-	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

+    $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

 	

-	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

+    $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

     /**

      * Filter sample post data csv file url.

      *

@@ -3479,42 +3479,42 @@ 
      */

     $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

 	

-	$gd_posttypes = geodir_get_posttypes( 'array' );

+    $gd_posttypes = geodir_get_posttypes( 'array' );

 	

-	$gd_posttypes_option = '';

-	foreach ( $gd_posttypes as $gd_posttype => $row ) {

-		$gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>';

-	}

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

+    $gd_posttypes_option = '';

+    foreach ( $gd_posttypes as $gd_posttype => $row ) {

+        $gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>';

+    }

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

 	

-	$gd_chunksize_options = array();

-	$gd_chunksize_options[100] = 100;

-	$gd_chunksize_options[200] = 200;

-	$gd_chunksize_options[500] = 500;

-	$gd_chunksize_options[1000] = 1000;

-	$gd_chunksize_options[2000] = 2000;

-	$gd_chunksize_options[5000] = 5000;

-	$gd_chunksize_options[10000] = 10000;

-	$gd_chunksize_options[20000] = 20000;

-	$gd_chunksize_options[50000] = 50000;

-	$gd_chunksize_options[100000] = 100000;

+    $gd_chunksize_options = array();

+    $gd_chunksize_options[100] = 100;

+    $gd_chunksize_options[200] = 200;

+    $gd_chunksize_options[500] = 500;

+    $gd_chunksize_options[1000] = 1000;

+    $gd_chunksize_options[2000] = 2000;

+    $gd_chunksize_options[5000] = 5000;

+    $gd_chunksize_options[10000] = 10000;

+    $gd_chunksize_options[20000] = 20000;

+    $gd_chunksize_options[50000] = 50000;

+    $gd_chunksize_options[100000] = 100000;

 	 

-	 /**

-     * Filter max entries per export csv file.

-     *

-     * @since 1.5.6

-     * @package GeoDirectory

-     *

-     * @param string $gd_chunksize_options Entries options.

-     */

+        /**

+         * Filter max entries per export csv file.

+         *

+         * @since 1.5.6

+         * @package GeoDirectory

+         *

+         * @param string $gd_chunksize_options Entries options.

+         */

     $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

 	

-	$gd_chunksize_option = '';

-	foreach ($gd_chunksize_options as $value => $title) {

-		$gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>';

-	}

+    $gd_chunksize_option = '';

+    foreach ($gd_chunksize_options as $value => $title) {

+        $gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>';

+    }

 	

-	$uploads = wp_upload_dir();

+    $uploads = wp_upload_dir();

 ?>

 </form>

 <div class="inner_content_tab_main gd-import-export">

@@ -3576,13 +3576,13 @@ 
 							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

 						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" />

 							<?php

-							/**

-							 * Called just after the sample CSV download link.

-							 *

-							 * @since 1.0.0

-							 */

-							do_action('geodir_sample_csv_download_link');

-							?>

+                            /**

+                             * Called just after the sample CSV download link.

+                             *

+                             * @since 1.0.0

+                             */

+                            do_action('geodir_sample_csv_download_link');

+                            ?>

 							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span>

 							<div class="filelist"></div>

 						</div>

@@ -3690,14 +3690,14 @@ 
 							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

 						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" />

 						<?php

-						/**

-						 * Called just after the sample CSV download link.

-						 *

-						 * @since 1.0.0

+                        /**

+                         * Called just after the sample CSV download link.

+                         *

+                         * @since 1.0.0

                          * @package GeoDirectory

-						 */

-						do_action('geodir_sample_cats_csv_download_link');

-						?>

+                         */

+                        do_action('geodir_sample_cats_csv_download_link');

+                        ?>

 							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span>

 							<div class="filelist"></div>

 						</div>

@@ -3773,19 +3773,19 @@ 
       </div>

     </div>

 	<?php

-	/**

-	 * Allows you to add more setting to the GD > Import & Export page.

-	 *

-	 * Called after the last setting on the GD > Import & Export page.

-	 * @since 1.4.6

+    /**

+     * Allows you to add more setting to the GD > Import & Export page.

+     *

+     * Called after the last setting on the GD > Import & Export page.

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

-	 * @param array $gd_posttypes GD post types.

+     *

+     * @param array $gd_posttypes GD post types.

      * @param array $gd_chunksize_options File chunk size options.

      * @param string $nonce Wordpress security token for GD import & export.

-	 */

-	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

-	?>

+     */

+    do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

+    ?>

   </div>

 </div>

 <script type="text/javascript">

@@ -5760,32 +5760,32 @@ 
  * @return int|bool Term id when success, false when fail.

  */

 function geodir_imex_insert_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

-		return false;

-	}

+    if ( empty( $taxonomy ) || empty( $term_data ) ) {

+        return false;

+    }

 	

-	$term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

-	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+    $term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

+    $args = array();

+    $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

+    $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

+    $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

 	

-	if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {

-		$term_args = array_merge( $term_data, $args );

-		$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

-		$term_args = wp_parse_args( $term_args, $defaults );

-		$term_args = sanitize_term( $term_args, $taxonomy, 'db' );

-		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

-	}

+    if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {

+        $term_args = array_merge( $term_data, $args );

+        $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

+        $term_args = wp_parse_args( $term_args, $defaults );

+        $term_args = sanitize_term( $term_args, $taxonomy, 'db' );

+        $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

+    }

 	

     if( !empty( $term ) ) {

-		$result = wp_insert_term( $term, $taxonomy, $args );

+        $result = wp_insert_term( $term, $taxonomy, $args );

         if( !is_wp_error( $result ) ) {

             return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

         }

     }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -5812,39 +5812,39 @@ 
  * @return int|bool Term id when success, false when fail.

  */

 function geodir_imex_update_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

-		return false;

-	}

+    if ( empty( $taxonomy ) || empty( $term_data ) ) {

+        return false;

+    }

 	

-	$term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

-	$term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0;

+    $term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

+    $term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0;

 	

-	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+    $args = array();

+    $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

+    $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

+    $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

 	

-	if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

-		$term_data['term_id'] = $term_info['term_id'];

+    if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

+        $term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+        $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

-		if( !is_wp_error( $result ) ) {

+        if( !is_wp_error( $result ) ) {

             return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

         }

-	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-		$term_data['term_id'] = $term_info['term_id'];

+    } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+        $term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+        $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

-		if( !is_wp_error( $result ) ) {

+        if( !is_wp_error( $result ) ) {

             return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

         }

-	} else {

-		return geodir_imex_insert_term( $taxonomy, $term_data );

-	}

+    } else {

+        return geodir_imex_insert_term( $taxonomy, $term_data );

+    }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -5857,21 +5857,21 @@ 
  * @return int Posts count.

  */

 function geodir_get_posts_count( $post_type ) {

-	$posts_count = wp_count_posts( $post_type );

-	$posts_count = array_sum( (array)$posts_count );

+    $posts_count = wp_count_posts( $post_type );

+    $posts_count = array_sum( (array)$posts_count );

 	

-	/**

-	 * Modify returned post counts for the current post type.

-	 *

-	 * @since 1.4.6

+    /**

+     * Modify returned post counts for the current post type.

+     *

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

-	 * @param int $posts_count Post counts.

-	 * @param string $post_type Post type.

-	 */

-	$posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );	 

+     *

+     * @param int $posts_count Post counts.

+     * @param string $post_type Post type.

+     */

+    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );	 

 	

-	return $posts_count;

+    return $posts_count;

 }

 

 /**

@@ -5888,18 +5888,18 @@ 
  * @return int Posts count.

  */

 function geodir_imex_count_events( $posts_count, $post_type ) {

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

-		global $wpdb, $plugin_prefix;

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

+        global $wpdb, $plugin_prefix;

 		

-		$table = $plugin_prefix . $post_type . '_detail';

-		$schedule_table = EVENT_SCHEDULE;

+        $table = $plugin_prefix . $post_type . '_detail';

+        $schedule_table = EVENT_SCHEDULE;

 

-		$query = "SELECT COUNT({$wpdb->posts}.ID) AS total FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s";

+        $query = "SELECT COUNT({$wpdb->posts}.ID) AS total FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s";

 		

-		$posts_count = (int)$wpdb->get_var( $wpdb->prepare( $query, $post_type ) );

-	}

+        $posts_count = (int)$wpdb->get_var( $wpdb->prepare( $query, $post_type ) );

+    }

 	

-	return $posts_count;

+    return $posts_count;

 }

 

 /**

@@ -5919,290 +5919,290 @@ 
  * @return array Array of posts data.

  */

 function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {	

-	global $wp_filesystem;

+    global $wp_filesystem;

 

-	$posts = geodir_get_export_posts( $post_type, $per_page, $page_no );

+    $posts = geodir_get_export_posts( $post_type, $per_page, $page_no );

 

-	$csv_rows = array();

+    $csv_rows = array();

 	

-	if ( !empty( $posts ) ) {

-		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

+    if ( !empty( $posts ) ) {

+        $is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

 		

-		$csv_row = array();

-		$csv_row[] = 'post_id';

-		$csv_row[] = 'post_title';

-		$csv_row[] = 'post_author';

-		$csv_row[] = 'post_content';

-		$csv_row[] = 'post_category';

-		$csv_row[] = 'default_category';

-		$csv_row[] = 'post_tags';

-		$csv_row[] = 'post_type';

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

-			$csv_row[] = 'event_date';

-			$csv_row[] = 'event_enddate';

-			$csv_row[] = 'starttime';

-			$csv_row[] = 'endtime';

+        $csv_row = array();

+        $csv_row[] = 'post_id';

+        $csv_row[] = 'post_title';

+        $csv_row[] = 'post_author';

+        $csv_row[] = 'post_content';

+        $csv_row[] = 'post_category';

+        $csv_row[] = 'default_category';

+        $csv_row[] = 'post_tags';

+        $csv_row[] = 'post_type';

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

+            $csv_row[] = 'event_date';

+            $csv_row[] = 'event_enddate';

+            $csv_row[] = 'starttime';

+            $csv_row[] = 'endtime';

 			

-			$csv_row[] = 'is_recurring_event';

-			$csv_row[] = 'event_duration_days';

-			$csv_row[] = 'recurring_dates';

-			$csv_row[] = 'is_whole_day_event';

-			$csv_row[] = 'event_starttimes';

-			$csv_row[] = 'event_endtimes';

-			$csv_row[] = 'recurring_type';

-			$csv_row[] = 'recurring_interval';

-			$csv_row[] = 'recurring_week_days';

-			$csv_row[] = 'recurring_week_nos';

-			$csv_row[] = 'max_recurring_count';

-			$csv_row[] = 'recurring_end_date';

-		}

-		$csv_row[] = 'post_status';

-		$csv_row[] = 'is_featured';

-		if ($is_payment_plugin) {

-			$csv_row[] = 'package_id';

-			$csv_row[] = 'expire_date';

-		}

-		$csv_row[] = 'geodir_video';

-		$csv_row[] = 'post_address';

-		$csv_row[] = 'post_city';

-		$csv_row[] = 'post_region';

-		$csv_row[] = 'post_country';

-		$csv_row[] = 'post_zip';

-		$csv_row[] = 'post_latitude';

-		$csv_row[] = 'post_longitude';

-		$csv_row[] = 'geodir_timing';

-		$csv_row[] = 'geodir_contact';

-		$csv_row[] = 'geodir_email';

-		$csv_row[] = 'geodir_website';

-		$csv_row[] = 'geodir_twitter';

-		$csv_row[] = 'geodir_facebook';

-		$csv_row[] = 'geodir_video';

-		$csv_row[] = 'geodir_special_offers';

-		// WPML

-		$is_wpml = geodir_is_wpml();

-		if ($is_wpml) {

-			$csv_row[] = 'language';

-			$csv_row[] = 'original_post_id';

-		}

-		// WPML

+            $csv_row[] = 'is_recurring_event';

+            $csv_row[] = 'event_duration_days';

+            $csv_row[] = 'recurring_dates';

+            $csv_row[] = 'is_whole_day_event';

+            $csv_row[] = 'event_starttimes';

+            $csv_row[] = 'event_endtimes';

+            $csv_row[] = 'recurring_type';

+            $csv_row[] = 'recurring_interval';

+            $csv_row[] = 'recurring_week_days';

+            $csv_row[] = 'recurring_week_nos';

+            $csv_row[] = 'max_recurring_count';

+            $csv_row[] = 'recurring_end_date';

+        }

+        $csv_row[] = 'post_status';

+        $csv_row[] = 'is_featured';

+        if ($is_payment_plugin) {

+            $csv_row[] = 'package_id';

+            $csv_row[] = 'expire_date';

+        }

+        $csv_row[] = 'geodir_video';

+        $csv_row[] = 'post_address';

+        $csv_row[] = 'post_city';

+        $csv_row[] = 'post_region';

+        $csv_row[] = 'post_country';

+        $csv_row[] = 'post_zip';

+        $csv_row[] = 'post_latitude';

+        $csv_row[] = 'post_longitude';

+        $csv_row[] = 'geodir_timing';

+        $csv_row[] = 'geodir_contact';

+        $csv_row[] = 'geodir_email';

+        $csv_row[] = 'geodir_website';

+        $csv_row[] = 'geodir_twitter';

+        $csv_row[] = 'geodir_facebook';

+        $csv_row[] = 'geodir_video';

+        $csv_row[] = 'geodir_special_offers';

+        // WPML

+        $is_wpml = geodir_is_wpml();

+        if ($is_wpml) {

+            $csv_row[] = 'language';

+            $csv_row[] = 'original_post_id';

+        }

+        // WPML

 

-		$custom_fields = geodir_imex_get_custom_fields( $post_type );

-		if ( !empty( $custom_fields ) ) {

-			foreach ( $custom_fields as $custom_field ) {

-				$csv_row[] = $custom_field->htmlvar_name;

-			}

-		}

+        $custom_fields = geodir_imex_get_custom_fields( $post_type );

+        if ( !empty( $custom_fields ) ) {

+            foreach ( $custom_fields as $custom_field ) {

+                $csv_row[] = $custom_field->htmlvar_name;

+            }

+        }

 

-		// Export franchise fields

-		$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

-		if ($is_franchise_active) {

-			$csv_row[] = 'gd_is_franchise';

-			$csv_row[] = 'gd_franchise_lock';

-			$csv_row[] = 'franchise';

-		}

+        // Export franchise fields

+        $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+        if ($is_franchise_active) {

+            $csv_row[] = 'gd_is_franchise';

+            $csv_row[] = 'gd_franchise_lock';

+            $csv_row[] = 'franchise';

+        }

 		

-		$csv_rows[] = $csv_row;

+        $csv_rows[] = $csv_row;

 

-		$images_count = 5;

+        $images_count = 5;

         $xx=0;

-		foreach ( $posts as $post ) {$xx++;

-			$post_id = $post['ID'];

+        foreach ( $posts as $post ) {$xx++;

+            $post_id = $post['ID'];

 			

-			$gd_post_info = geodir_get_post_info( $post_id );

-			$post_info = (array)$gd_post_info;

+            $gd_post_info = geodir_get_post_info( $post_id );

+            $post_info = (array)$gd_post_info;

 						

-			$taxonomy_category = $post_type . 'category';

-			$taxonomy_tags = $post_type . '_tags';

+            $taxonomy_category = $post_type . 'category';

+            $taxonomy_tags = $post_type . '_tags';

 			

-			$post_category = '';

-			$default_category_id = $gd_post_info->default_category;

-			$default_category = '';

-			$post_tags = '';

-			$terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );

+            $post_category = '';

+            $default_category_id = $gd_post_info->default_category;

+            $default_category = '';

+            $post_tags = '';

+            $terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );

 			

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

-				$post_category = array();

-				$post_tags = array();

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

+                $post_category = array();

+                $post_tags = array();

 			

-				foreach ( $terms as $term ) {

-					if ( $term->taxonomy == $taxonomy_category ) {

-						$post_category[] = $term->name;

+                foreach ( $terms as $term ) {

+                    if ( $term->taxonomy == $taxonomy_category ) {

+                        $post_category[] = $term->name;

 						

-						if ($default_category_id == $term->term_id) {

-							$default_category = $term->name; // Default category.

-						}

-					}

+                        if ($default_category_id == $term->term_id) {

+                            $default_category = $term->name; // Default category.

+                        }

+                    }

 					

-					if ( $term->taxonomy == $taxonomy_tags ) {

-						$post_tags[] = $term->name;

-					}

-				}

+                    if ( $term->taxonomy == $taxonomy_tags ) {

+                        $post_tags[] = $term->name;

+                    }

+                }

 				

-				if (empty($default_category) && !empty($post_category)) {

-					$default_category = $post_category[0]; // Set first one as default category.

-				}

-				$post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';

-				$post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';

-			}

+                if (empty($default_category) && !empty($post_category)) {

+                    $default_category = $post_category[0]; // Set first one as default category.

+                }

+                $post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';

+                $post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';

+            }

 

-			// Franchise data

-			$franchise_id = NULL;

-			$franchise_info = array();

-			$locked_fields = array();

+            // Franchise data

+            $franchise_id = NULL;

+            $franchise_info = array();

+            $locked_fields = array();

 			

-			if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {

-				$franchise_id = $post_info['franchise'];

-				$gd_franchise_info = geodir_get_post_info($franchise_id);

+            if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {

+                $franchise_id = $post_info['franchise'];

+                $gd_franchise_info = geodir_get_post_info($franchise_id);

 

-				if (geodir_franchise_pkg_is_active($gd_franchise_info)) {

-					$franchise_info = (array)$gd_franchise_info;

-					$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

+                if (geodir_franchise_pkg_is_active($gd_franchise_info)) {

+                    $franchise_info = (array)$gd_franchise_info;

+                    $locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

 					

-					if (!empty($locked_fields)) {

-						foreach( $locked_fields as $locked_field) {

-							if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

-								$post_info[$locked_field] = $franchise_info[$locked_field];

-							}

+                    if (!empty($locked_fields)) {

+                        foreach( $locked_fields as $locked_field) {

+                            if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

+                                $post_info[$locked_field] = $franchise_info[$locked_field];

+                            }

 							

-							if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {

-								$franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );

+                            if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {

+                                $franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );

 			

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

-									$franchise_post_category = array();

-									$franchise_post_tags = array();

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

+                                    $franchise_post_category = array();

+                                    $franchise_post_tags = array();

 								

-									foreach ( $franchise_terms as $franchise_term ) {

-										if ( $franchise_term->taxonomy == $taxonomy_category ) {

-											$franchise_post_category[] = $franchise_term->name;

-										}

+                                    foreach ( $franchise_terms as $franchise_term ) {

+                                        if ( $franchise_term->taxonomy == $taxonomy_category ) {

+                                            $franchise_post_category[] = $franchise_term->name;

+                                        }

 										

-										if ( $franchise_term->taxonomy == $taxonomy_tags ) {

-											$franchise_post_tags[] = $franchise_term->name;

-										}

-									}

+                                        if ( $franchise_term->taxonomy == $taxonomy_tags ) {

+                                            $franchise_post_tags[] = $franchise_term->name;

+                                        }

+                                    }

 									

-									if (in_array($taxonomy_category, $locked_fields)) {

-										$post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';

-									}

-									if (in_array('post_tags', $locked_fields)) {

-										$post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';

-									}

-								}

-							}

-						}

-					}

-				}

-			}

+                                    if (in_array($taxonomy_category, $locked_fields)) {

+                                        $post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';

+                                    }

+                                    if (in_array('post_tags', $locked_fields)) {

+                                        $post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';

+                                    }

+                                }

+                            }

+                        }

+                    }

+                }

+            }

 						

-			$post_images = geodir_get_images( $post_id );

-			$current_images = array();

-			if ( !empty( $post_images ) ) {

-				foreach ( $post_images as $post_image ) {

-					$post_image = (array)$post_image;

-					$image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';

-					if ( $image ) {

-						$current_images[] = $image;

-					}

-				}

+            $post_images = geodir_get_images( $post_id );

+            $current_images = array();

+            if ( !empty( $post_images ) ) {

+                foreach ( $post_images as $post_image ) {

+                    $post_image = (array)$post_image;

+                    $image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';

+                    if ( $image ) {

+                        $current_images[] = $image;

+                    }

+                }

 				

-				$images_count = max( $images_count, count( $current_images ) );

-			}

+                $images_count = max( $images_count, count( $current_images ) );

+            }

 

-			$csv_row = array();

-			$csv_row[] = $post_id; // post_id

-			$csv_row[] = $post_info['post_title']; // post_title

-			$csv_row[] = $post_info['post_author']; // post_author

-			$csv_row[] = $post_info['post_content']; // post_content

-			$csv_row[] = $post_category; // post_category

-			$csv_row[] = $default_category; // default_category

-			$csv_row[] = $post_tags; // post_tags

-			$csv_row[] = $post_type; // post_type

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

-				$event_data = geodir_imex_get_event_data($post, $gd_post_info);

-				$csv_row[] = $event_data['event_date']; // event_date

-				$csv_row[] = $event_data['event_enddate']; // enddate

-				$csv_row[] = $event_data['starttime']; // starttime

-				$csv_row[] = $event_data['endtime']; // endtime

+            $csv_row = array();

+            $csv_row[] = $post_id; // post_id

+            $csv_row[] = $post_info['post_title']; // post_title

+            $csv_row[] = $post_info['post_author']; // post_author

+            $csv_row[] = $post_info['post_content']; // post_content

+            $csv_row[] = $post_category; // post_category

+            $csv_row[] = $default_category; // default_category

+            $csv_row[] = $post_tags; // post_tags

+            $csv_row[] = $post_type; // post_type

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

+                $event_data = geodir_imex_get_event_data($post, $gd_post_info);

+                $csv_row[] = $event_data['event_date']; // event_date

+                $csv_row[] = $event_data['event_enddate']; // enddate

+                $csv_row[] = $event_data['starttime']; // starttime

+                $csv_row[] = $event_data['endtime']; // endtime

 				

-				$csv_row[] = $event_data['is_recurring_event']; // is_recurring

-				$csv_row[] = $event_data['event_duration_days']; // duration_x

-				$csv_row[] = $event_data['recurring_dates']; // recurring_dates

-				$csv_row[] = $event_data['is_whole_day_event']; // all_day

-				$csv_row[] = $event_data['event_starttimes']; // starttimes

-				$csv_row[] = $event_data['event_endtimes']; // endtimes

-				$csv_row[] = $event_data['recurring_type']; // repeat_type

-				$csv_row[] = $event_data['recurring_interval']; // repeat_x

-				$csv_row[] = $event_data['recurring_week_days']; // repeat_days

-				$csv_row[] = $event_data['recurring_week_nos']; // repeat_weeks

-				$csv_row[] = $event_data['max_recurring_count']; // max_repeat

-				$csv_row[] = $event_data['recurring_end_date']; // repeat_end

-			}

-			$csv_row[] = $post_info['post_status']; // post_status

-			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

-			if ($is_payment_plugin) {

-				$csv_row[] = (int)$post_info['package_id']; // package_id

-				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

-			}

-			$csv_row[] = $post_info['geodir_video']; // geodir_video

-			$csv_row[] = $post_info['post_address']; // post_address

-			$csv_row[] = $post_info['post_city']; // post_city

-			$csv_row[] = $post_info['post_region']; // post_region

-			$csv_row[] = $post_info['post_country']; // post_country

-			$csv_row[] = $post_info['post_zip']; // post_zip

-			$csv_row[] = $post_info['post_latitude']; // post_latitude

-			$csv_row[] = $post_info['post_longitude']; // post_longitude

-			$csv_row[] = $post_info['geodir_timing']; // geodir_timing

-			$csv_row[] = $post_info['geodir_contact']; // geodir_contact

-			$csv_row[] = $post_info['geodir_email']; // geodir_email

-			$csv_row[] = $post_info['geodir_website']; // geodir_website

-			$csv_row[] = $post_info['geodir_twitter']; // geodir_twitter

-			$csv_row[] = $post_info['geodir_facebook']; // geodir_facebook

-			$csv_row[] = $post_info['geodir_video']; // geodir_video

-			$csv_row[] = $post_info['geodir_special_offers']; // geodir_special_offers

-			// WPML

-			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );

-				$csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );

-			}

-			// WPML

+                $csv_row[] = $event_data['is_recurring_event']; // is_recurring

+                $csv_row[] = $event_data['event_duration_days']; // duration_x

+                $csv_row[] = $event_data['recurring_dates']; // recurring_dates

+                $csv_row[] = $event_data['is_whole_day_event']; // all_day

+                $csv_row[] = $event_data['event_starttimes']; // starttimes

+                $csv_row[] = $event_data['event_endtimes']; // endtimes

+                $csv_row[] = $event_data['recurring_type']; // repeat_type

+                $csv_row[] = $event_data['recurring_interval']; // repeat_x

+                $csv_row[] = $event_data['recurring_week_days']; // repeat_days

+                $csv_row[] = $event_data['recurring_week_nos']; // repeat_weeks

+                $csv_row[] = $event_data['max_recurring_count']; // max_repeat

+                $csv_row[] = $event_data['recurring_end_date']; // repeat_end

+            }

+            $csv_row[] = $post_info['post_status']; // post_status

+            $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

+            if ($is_payment_plugin) {

+                $csv_row[] = (int)$post_info['package_id']; // package_id

+                $csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

+            }

+            $csv_row[] = $post_info['geodir_video']; // geodir_video

+            $csv_row[] = $post_info['post_address']; // post_address

+            $csv_row[] = $post_info['post_city']; // post_city

+            $csv_row[] = $post_info['post_region']; // post_region

+            $csv_row[] = $post_info['post_country']; // post_country

+            $csv_row[] = $post_info['post_zip']; // post_zip

+            $csv_row[] = $post_info['post_latitude']; // post_latitude

+            $csv_row[] = $post_info['post_longitude']; // post_longitude

+            $csv_row[] = $post_info['geodir_timing']; // geodir_timing

+            $csv_row[] = $post_info['geodir_contact']; // geodir_contact

+            $csv_row[] = $post_info['geodir_email']; // geodir_email

+            $csv_row[] = $post_info['geodir_website']; // geodir_website

+            $csv_row[] = $post_info['geodir_twitter']; // geodir_twitter

+            $csv_row[] = $post_info['geodir_facebook']; // geodir_facebook

+            $csv_row[] = $post_info['geodir_video']; // geodir_video

+            $csv_row[] = $post_info['geodir_special_offers']; // geodir_special_offers

+            // WPML

+            if ($is_wpml) {

+                $csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );

+                $csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );

+            }

+            // WPML

 			

-			if ( !empty( $custom_fields ) ) {

-				foreach ( $custom_fields as $custom_field ) {

-					$csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';

-				}

-			}

+            if ( !empty( $custom_fields ) ) {

+                foreach ( $custom_fields as $custom_field ) {

+                    $csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';

+                }

+            }

 			

-			// Franchise data

-			if ($is_franchise_active) {

-				$gd_is_franchise = '';

-				$locaked_fields = '';

-				$franchise = '';

+            // Franchise data

+            if ($is_franchise_active) {

+                $gd_is_franchise = '';

+                $locaked_fields = '';

+                $franchise = '';

 					

-				if (geodir_franchise_pkg_is_active($gd_post_info)) {

-					$gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );

-					$locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';

-					$locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');

-					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id

-				}

+                if (geodir_franchise_pkg_is_active($gd_post_info)) {

+                    $gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );

+                    $locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';

+                    $locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');

+                    $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id

+                }

 				

-				$csv_row[] = (int)$gd_is_franchise; // gd_is_franchise

-				$csv_row[] = $locaked_fields; // gd_franchise_lock fields

-				$csv_row[] = (int)$franchise; // franchise id

-			}

+                $csv_row[] = (int)$gd_is_franchise; // gd_is_franchise

+                $csv_row[] = $locaked_fields; // gd_franchise_lock fields

+                $csv_row[] = (int)$franchise; // franchise id

+            }

 			

-			for ( $c = 0; $c < $images_count; $c++ ) {

-				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

-			}

+            for ( $c = 0; $c < $images_count; $c++ ) {

+                $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

+            }

 			

-			$csv_rows[] = $csv_row;

+            $csv_rows[] = $csv_row;

 

-		}

+        }

 

-		for ( $c = 0; $c < $images_count; $c++ ) {

-			$csv_rows[0][] = 'IMAGE';

-		}

-	}

-	return $csv_rows;

+        for ( $c = 0; $c < $images_count; $c++ ) {

+            $csv_rows[0][] = 'IMAGE';

+        }

+    }

+    return $csv_rows;

 }

 

 /**

@@ -6221,48 +6221,48 @@ 
  * @return array Array of posts data.

  */

 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

-	global $wpdb, $plugin_prefix;

+    global $wpdb, $plugin_prefix;

 

-	if ( ! post_type_exists( $post_type ) )

-		return new stdClass;

+    if ( ! post_type_exists( $post_type ) )

+        return new stdClass;

 		

-	$table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix . $post_type . '_detail';

 	

-	$limit = '';

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$offset = ( $page_no - 1 ) * $per_page;

+    $limit = '';

+    if ( $per_page > 0 && $page_no > 0 ) {

+        $offset = ( $page_no - 1 ) * $per_page;

 		

-		if ( $offset > 0 ) {

-			$limit = " LIMIT " . $offset . "," . $per_page;

-		} else {

-			$limit = " LIMIT " . $per_page;

-		}

-	}

+        if ( $offset > 0 ) {

+            $limit = " LIMIT " . $offset . "," . $per_page;

+        } else {

+            $limit = " LIMIT " . $per_page;

+        }

+    }

 

-	$query = "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ORDER BY {$wpdb->posts}.ID ASC" . $limit;

-	/**

-	 * Modify returned posts SQL query for the current post type.

-	 *

-	 * @since 1.4.6

+    $query = "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ORDER BY {$wpdb->posts}.ID ASC" . $limit;

+    /**

+     * Modify returned posts SQL query for the current post type.

+     *

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

-	 * @param int $query The SQL query.

-	 * @param string $post_type Post type.

-	 */

-	$query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-

-	$results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

-

-	/**

-	 * Modify returned post results for the current post type.

-	 *

-	 * @since 1.4.6

+     *

+     * @param int $query The SQL query.

+     * @param string $post_type Post type.

+     */

+    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

+

+    $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

+

+    /**

+     * Modify returned post results for the current post type.

+     *

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

-	 * @param object $results An object containing all post ids.

-	 * @param string $post_type Post type.

-	 */

-	return apply_filters( 'geodir_export_posts', $results, $post_type );

+     *

+     * @param object $results An object containing all post ids.

+     * @param string $post_type Post type.

+     */

+    return apply_filters( 'geodir_export_posts', $results, $post_type );

 }

 

 /**

@@ -6280,16 +6280,16 @@ 
  * @return string The SQL query.

  */

 function geodir_imex_get_events_query( $query, $post_type ) {

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

-		global $wpdb, $plugin_prefix;

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

+        global $wpdb, $plugin_prefix;

 		

-		$table = $plugin_prefix . $post_type . '_detail';

-		$schedule_table = EVENT_SCHEDULE;

+        $table = $plugin_prefix . $post_type . '_detail';

+        $schedule_table = EVENT_SCHEDULE;

 

-		$query = "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC";

-	}

+        $query = "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC";

+    }

 	

-	return $query; 

+    return $query; 

 }

 

 /**

@@ -6302,16 +6302,16 @@ 
  * @return int Total terms count.

  */

 function geodir_get_terms_count( $post_type ) {

-	$args = array( 'hide_empty' => 0 );

+    $args = array( 'hide_empty' => 0 );

 	

-	remove_all_filters( 'get_terms' );

+    remove_all_filters( 'get_terms' );

 	

-	$taxonomy = $post_type . 'category';

+    $taxonomy = $post_type . 'category';

 

-	$count_terms = wp_count_terms( $taxonomy, $args );

-	$count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+    $count_terms = wp_count_terms( $taxonomy, $args );

+    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

 	 

-	return $count_terms;

+    return $count_terms;

 }

 

 /**

@@ -6327,76 +6327,76 @@ 
  * @return array Array of terms data.

  */

 function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {

-	$args = array( 'hide_empty' => 0, 'orderby' => 'id' );

+    $args = array( 'hide_empty' => 0, 'orderby' => 'id' );

 	

-	remove_all_filters( 'get_terms' );

+    remove_all_filters( 'get_terms' );

 	

-	$taxonomy = $post_type . 'category';

+    $taxonomy = $post_type . 'category';

 	

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$args['offset'] = ( $page_no - 1 ) * $per_page;

-		$args['number'] = $per_page;

-	}

+    if ( $per_page > 0 && $page_no > 0 ) {

+        $args['offset'] = ( $page_no - 1 ) * $per_page;

+        $args['number'] = $per_page;

+    }

 	

-	$terms = get_terms( $taxonomy, $args );

+    $terms = get_terms( $taxonomy, $args );

 

-	$csv_rows = array();

+    $csv_rows = array();

 	

-	if ( !empty( $terms ) ) {

-		$csv_row = array();

-		$csv_row[] = 'cat_id';

-		$csv_row[] = 'cat_name';

-		$csv_row[] = 'cat_slug';

-		$csv_row[] = 'cat_posttype';

-		$csv_row[] = 'cat_parent';

-		$csv_row[] = 'cat_schema';

-		$csv_row[] = 'cat_description';

-		$csv_row[] = 'cat_top_description';

-		$csv_row[] = 'cat_image';

-		$csv_row[] = 'cat_icon';

-		// WPML

-		$is_wpml = geodir_is_wpml();

-		if ($is_wpml) {

-			$csv_row[] = 'cat_language';

-		}

-		// WPML

+    if ( !empty( $terms ) ) {

+        $csv_row = array();

+        $csv_row[] = 'cat_id';

+        $csv_row[] = 'cat_name';

+        $csv_row[] = 'cat_slug';

+        $csv_row[] = 'cat_posttype';

+        $csv_row[] = 'cat_parent';

+        $csv_row[] = 'cat_schema';

+        $csv_row[] = 'cat_description';

+        $csv_row[] = 'cat_top_description';

+        $csv_row[] = 'cat_image';

+        $csv_row[] = 'cat_icon';

+        // WPML

+        $is_wpml = geodir_is_wpml();

+        if ($is_wpml) {

+            $csv_row[] = 'cat_language';

+        }

+        // WPML

 		

-		$csv_rows[] = $csv_row;

+        $csv_rows[] = $csv_row;

 		

-		foreach ( $terms as $term ) {			

-			$cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );

-			$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+        foreach ( $terms as $term ) {			

+            $cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );

+            $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

 			

-			$cat_image = geodir_get_default_catimage( $term->term_id, $post_type );

-			$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; 

+            $cat_image = geodir_get_default_catimage( $term->term_id, $post_type );

+            $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; 

 			

-			$cat_parent = '';

-			if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {

-				$parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );

-				$cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';

-			}

+            $cat_parent = '';

+            if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {

+                $parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );

+                $cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';

+            }

 			

-			$csv_row = array();

-			$csv_row[] = $term->term_id;

-			$csv_row[] = $term->name;

-			$csv_row[] = $term->slug;

-			$csv_row[] = $post_type;

-			$csv_row[] = $cat_parent;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

-			$csv_row[] = $term->description;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

-			$csv_row[] = $cat_image;

-			$csv_row[] = $cat_icon;

-			// WPML

-			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-			}

-			// WPML

+            $csv_row = array();

+            $csv_row[] = $term->term_id;

+            $csv_row[] = $term->name;

+            $csv_row[] = $term->slug;

+            $csv_row[] = $post_type;

+            $csv_row[] = $cat_parent;

+            $csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

+            $csv_row[] = $term->description;

+            $csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

+            $csv_row[] = $cat_image;

+            $csv_row[] = $cat_icon;

+            // WPML

+            if ($is_wpml) {

+                $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

+            }

+            // WPML

 			

-			$csv_rows[] = $csv_row;

-		}

-	}

-	return $csv_rows;

+            $csv_rows[] = $csv_row;

+        }

+    }

+    return $csv_rows;

 }

 

 /**

@@ -6409,9 +6409,9 @@ 
  * @return string Path to the cache directory.

  */

 function geodir_path_import_export( $relative = true ) {

-	$upload_dir = wp_upload_dir();

+    $upload_dir = wp_upload_dir();

 	

-	return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';

+    return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';

 }

 

 /**

@@ -6428,29 +6428,29 @@ 
  * @return bool true if success otherwise false.

  */

 function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {

-	if ( empty( $csv_data ) ) {

-		return false;

-	}

+    if ( empty( $csv_data ) ) {

+        return false;

+    }

 	

-	global $wp_filesystem;

+    global $wp_filesystem;

 	

-	$mode = $clear ? 'w+' : 'a+';

+    $mode = $clear ? 'w+' : 'a+';

 	

-	if ( function_exists( 'fputcsv' ) ) {

-		$file = fopen( $file_path, $mode );

-		foreach( $csv_data as $csv_row ) {

-			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );

-		}

-		fclose( $file );

-	} else {

-		foreach( $csv_data as $csv_row ) {

-			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$wp_filesystem->put_contents( $file_path, $csv_row );

-		}

-	}

+    if ( function_exists( 'fputcsv' ) ) {

+        $file = fopen( $file_path, $mode );

+        foreach( $csv_data as $csv_row ) {

+            //$csv_row = array_map( 'utf8_decode', $csv_row );

+            $write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );

+        }

+        fclose( $file );

+    } else {

+        foreach( $csv_data as $csv_row ) {

+            //$csv_row = array_map( 'utf8_decode', $csv_row );

+            $wp_filesystem->put_contents( $file_path, $csv_row );

+        }

+    }

 		

-	return true;

+    return true;

 }

 

 /**

@@ -6465,17 +6465,17 @@ 
  * @return int No of file rows.

  */

 function geodir_import_export_line_count( $file ) {

-	global $wp_filesystem;

+    global $wp_filesystem;

 	

-	if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {

-		$contents = $wp_filesystem->get_contents_array( $file );

+    if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {

+        $contents = $wp_filesystem->get_contents_array( $file );

 		

-		if ( !empty( $contents ) && is_array( $contents ) ) {

-			return count( $contents ) - 1;

-		}

-	}

+        if ( !empty( $contents ) && is_array( $contents ) ) {

+            return count( $contents ) - 1;

+        }

+    }

 	

-	return NULL;

+    return NULL;

 }

 

 /**

@@ -6489,12 +6489,12 @@ 
  * @return object Queried object.

  */

 function geodir_imex_get_custom_fields( $post_type ) {

-	global $wpdb;

+    global $wpdb;

 	 

-	$sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );

-	$rows = $wpdb->get_results( $sql );

+    $sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );

+    $rows = $wpdb->get_results( $sql );

 	 

-	return $rows;

+    return $rows;

 }

 

 /**

@@ -6505,11 +6505,11 @@ 
  * @return True if WPML is active else False.

  */

 function geodir_is_wpml() {

-	if (function_exists('icl_object_id')) {

-		return true;

-	}

+    if (function_exists('icl_object_id')) {

+        return true;

+    }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -6524,9 +6524,9 @@ 
  * @return Language code.

  */

 function geodir_get_language_for_element($element_id, $element_type) {

-	global $sitepress;

+    global $sitepress;

 	

-	return $sitepress->get_language_for_element($element_id, $element_type);

+    return $sitepress->get_language_for_element($element_id, $element_type);

 }

 

 /**

@@ -6540,18 +6540,18 @@ 
  * @param int $tr_post_id Translation Post ID.

  */

 function geodir_icl_make_duplicate($master_post_id, $lang, $postarr, $tr_post_id) {

-	$post_type = get_post_type($master_post_id);

+    $post_type = get_post_type($master_post_id);

 

-	if (in_array($post_type, geodir_get_posttypes())) {				

-		// Duplicate post details

-		geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang);

+    if (in_array($post_type, geodir_get_posttypes())) {				

+        // Duplicate post details

+        geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang);

 		

-		// Duplicate taxonomies

-		geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang);

+        // Duplicate taxonomies

+        geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang);

 		

-		// Duplicate post images

-		geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang);

-	}

+        // Duplicate post images

+        geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang);

+    }

 }

 

 /**

@@ -6568,23 +6568,23 @@ 
  * @return bool True for success, False for fail.

  */

 function geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang) {

-	global $wpdb, $plugin_prefix;

+    global $wpdb, $plugin_prefix;

 	

-	$post_type = get_post_type($master_post_id);

-	$post_table = $plugin_prefix . $post_type . '_detail';

+    $post_type = get_post_type($master_post_id);

+    $post_table = $plugin_prefix . $post_type . '_detail';

 	

-	$query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

-	$data = (array)$wpdb->get_row($query);

+    $query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

+    $data = (array)$wpdb->get_row($query);

 	

-	if ( !empty( $data ) ) {

-		$data['post_id'] = $tr_post_id;

-		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

+    if ( !empty( $data ) ) {

+        $data['post_id'] = $tr_post_id;

+        unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

 		

-		$wpdb->update($post_table, $data, array('post_id' => $tr_post_id));		

-		return true;

-	}

+        $wpdb->update($post_table, $data, array('post_id' => $tr_post_id));		

+        return true;

+    }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -6601,40 +6601,40 @@ 
  * @return bool True for success, False for fail.

  */

 function geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang) {

-	global $sitepress, $wpdb;

-	$post_type = get_post_type($master_post_id);

+    global $sitepress, $wpdb;

+    $post_type = get_post_type($master_post_id);

 	

-	remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

+    remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

 

-	$taxonomies = get_object_taxonomies($post_type);

-	foreach ($taxonomies as $taxonomy) {

-		$terms = get_the_terms($master_post_id, $taxonomy);

-		$terms_array = array();

+    $taxonomies = get_object_taxonomies($post_type);

+    foreach ($taxonomies as $taxonomy) {

+        $terms = get_the_terms($master_post_id, $taxonomy);

+        $terms_array = array();

 		

-		if ($terms) {

-			foreach ($terms as $term) {

-				$tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

+        if ($terms) {

+            foreach ($terms as $term) {

+                $tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

 				

-				if (!is_null($tr_id)){

-					// not using get_term - unfiltered get_term

-					$translated_term = $wpdb->get_row($wpdb->prepare("

+                if (!is_null($tr_id)){

+                    // not using get_term - unfiltered get_term

+                    $translated_term = $wpdb->get_row($wpdb->prepare("

 						SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));

 

-					$terms_array[] = $translated_term->term_id;

-				}

-			}

+                    $terms_array[] = $translated_term->term_id;

+                }

+            }

 

-			if (!is_taxonomy_hierarchical($taxonomy)){

-				$terms_array = array_unique( array_map( 'intval', $terms_array ) );

-			}

+            if (!is_taxonomy_hierarchical($taxonomy)){

+                $terms_array = array_unique( array_map( 'intval', $terms_array ) );

+            }

 

-			wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

+            wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

 			

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

-				geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

-			}

-		}

-	}

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

+                geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

+            }

+        }

+    }

 }

 

 /**

@@ -6650,29 +6650,29 @@ 
  * @return bool True for success, False for fail.

  */

 function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {

-	global $wpdb;

+    global $wpdb;

 	

-	$query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

-	$wpdb->query($query);

+    $query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

+    $wpdb->query($query);

 	

-	$query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

-	$post_images = $wpdb->get_results($query);

+    $query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

+    $post_images = $wpdb->get_results($query);

 	

-	if ( !empty( $post_images ) ) {

-		foreach ( $post_images as $post_image) {

-			$image_data = (array)$post_image;

-			unset($image_data['ID']);

-			$image_data['post_id'] = $tr_post_id;

+    if ( !empty( $post_images ) ) {

+        foreach ( $post_images as $post_image) {

+            $image_data = (array)$post_image;

+            unset($image_data['ID']);

+            $image_data['post_id'] = $tr_post_id;

 			

-			$wpdb->insert(GEODIR_ATTACHMENT_TABLE, $image_data);

+            $wpdb->insert(GEODIR_ATTACHMENT_TABLE, $image_data);

 			

-			geodir_set_wp_featured_image($tr_post_id);

-		}

+            geodir_set_wp_featured_image($tr_post_id);

+        }

 		

-		return true;

-	}

+        return true;

+    }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -6686,141 +6686,141 @@ 
  * @return array Event data array.

  */

 function geodir_imex_get_event_data($post, $gd_post_info) {

-	$event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : '';

-	$event_enddate = $event_date;

-	$starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';

-	$endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';

+    $event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : '';

+    $event_enddate = $event_date;

+    $starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';

+    $endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';

 	

-	$is_recurring_event = '';

-	$event_duration_days = '';

-	$is_whole_day_event = '';

-	$recurring_dates = '';

-	$event_starttimes = '';

-	$event_endtimes = '';

-	$recurring_type = '';

-	$recurring_interval = '';

-	$recurring_week_days = '';

-	$recurring_week_nos = '';

-	$max_recurring_count = '';

-	$recurring_end_date = '';

-	$recurring_dates = '';

+    $is_recurring_event = '';

+    $event_duration_days = '';

+    $is_whole_day_event = '';

+    $recurring_dates = '';

+    $event_starttimes = '';

+    $event_endtimes = '';

+    $recurring_type = '';

+    $recurring_interval = '';

+    $recurring_week_days = '';

+    $recurring_week_nos = '';

+    $max_recurring_count = '';

+    $recurring_end_date = '';

+    $recurring_dates = '';

 		

-	$recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();

-	if (!empty($recurring_data)) {

-		$event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date;

-		$event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date;

-		$starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;

-		$endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;

-		$is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';

-		$different_times = !empty($recurring_data['different_times']) ? true : false;

+    $recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();

+    if (!empty($recurring_data)) {

+        $event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date;

+        $event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date;

+        $starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;

+        $endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;

+        $is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';

+        $different_times = !empty($recurring_data['different_times']) ? true : false;

 	

-		$recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );

-		$is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;

+        $recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );

+        $is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;

 			

-		if ($recurring_pkg && $is_recurring) {

-			$recurring_dates = $event_date;

-			$event_enddate = '';

-			$is_recurring_event = 1;

+        if ($recurring_pkg && $is_recurring) {

+            $recurring_dates = $event_date;

+            $event_enddate = '';

+            $is_recurring_event = 1;

 						

-			$recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';

+            $recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';

 			

-			if (!empty($recurring_data['event_recurring_dates'])) {

-				$event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

+            if (!empty($recurring_data['event_recurring_dates'])) {

+                $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

 				

-				if (!empty($event_recurring_dates)) {

-					$recurring_dates = array();

+                if (!empty($event_recurring_dates)) {

+                    $recurring_dates = array();

 					

-					foreach ($event_recurring_dates as $date) {

-						$recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

-					}

+                    foreach ($event_recurring_dates as $date) {

+                        $recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

+                    }

 					

-					$recurring_dates = implode(",", $recurring_dates);

-				}

-			}

+                    $recurring_dates = implode(",", $recurring_dates);

+                }

+            }

 			

-			if ($recurring_type == 'custom') {

-				if (!$is_whole_day_event) {

-					$event_starttimes = $starttime;

-					$event_endtimes = $endtime;

+            if ($recurring_type == 'custom') {

+                if (!$is_whole_day_event) {

+                    $event_starttimes = $starttime;

+                    $event_endtimes = $endtime;

 			

-					if (!empty($recurring_data['starttimes'])) {

-						$times = array();

+                    if (!empty($recurring_data['starttimes'])) {

+                        $times = array();

 						

-						foreach ($recurring_data['starttimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

-						}

+                        foreach ($recurring_data['starttimes'] as $time) {

+                            $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+                        }

 						

-						$event_starttimes = implode(",", $times);

-					}

+                        $event_starttimes = implode(",", $times);

+                    }

 					

-					if (!empty($recurring_data['endtimes'])) {

-						$times = array();

+                    if (!empty($recurring_data['endtimes'])) {

+                        $times = array();

 						

-						foreach ($recurring_data['endtimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

-						}

+                        foreach ($recurring_data['endtimes'] as $time) {

+                            $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+                        }

 						

-						$event_endtimes = implode(",", $times);

-					}

+                        $event_endtimes = implode(",", $times);

+                    }

 					

-					if (!$different_times) {

-						$event_starttimes = '';

-						$event_endtimes = '';

-					}

-				}

-			} else {

-				$event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;

-				$recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

+                    if (!$different_times) {

+                        $event_starttimes = '';

+                        $event_endtimes = '';

+                    }

+                }

+            } else {

+                $event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;

+                $recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

 				

-				if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

-					$week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

+                if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

+                    $week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

 					

-					$days = array();

-					foreach ($recurring_data['repeat_days'] as $day) {

-						if (isset($week_days[$day])) {

-							$days[] = $week_days[$day];

-						}

-					}

+                    $days = array();

+                    foreach ($recurring_data['repeat_days'] as $day) {

+                        if (isset($week_days[$day])) {

+                            $days[] = $week_days[$day];

+                        }

+                    }

 					

-					$recurring_week_days = implode(",", array_unique($days));

-				}

+                    $recurring_week_days = implode(",", array_unique($days));

+                }

 				

-				$recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;

-				if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {

-					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : '';

-					$max_recurring_count = empty($recurring_end_date) ? 1 : '';

-				} else {

-					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);

-				}

-			}

-		}

-	}

-	if ($is_whole_day_event) {

-		$starttime = '';

-		$endtime = '';

-		$event_starttimes = '';

-		$event_endtimes = '';

-	}

+                $recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;

+                if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {

+                    $recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : '';

+                    $max_recurring_count = empty($recurring_end_date) ? 1 : '';

+                } else {

+                    $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);

+                }

+            }

+        }

+    }

+    if ($is_whole_day_event) {

+        $starttime = '';

+        $endtime = '';

+        $event_starttimes = '';

+        $event_endtimes = '';

+    }

 	

-	$data = array();

-	$data['event_date'] = $event_date;

-	$data['event_enddate'] = $event_enddate;

-	$data['starttime'] = $starttime;

-	$data['endtime'] = $endtime;

-	$data['is_recurring_event'] = $is_recurring_event;

-	$data['recurring_dates'] = $recurring_dates;

-	$data['event_duration_days'] = $event_duration_days;

-	$data['is_whole_day_event'] = $is_whole_day_event;

-	$data['event_starttimes'] = $event_starttimes;

-	$data['event_endtimes'] = $event_endtimes;

-	$data['recurring_type'] = $recurring_type;

-	$data['recurring_interval'] = $recurring_interval;

-	$data['recurring_week_days'] = $recurring_week_days;

-	$data['recurring_week_nos'] = $recurring_week_nos;

-	$data['max_recurring_count'] = $max_recurring_count;

-	$data['recurring_end_date'] = $recurring_end_date;

+    $data = array();

+    $data['event_date'] = $event_date;

+    $data['event_enddate'] = $event_enddate;

+    $data['starttime'] = $starttime;

+    $data['endtime'] = $endtime;

+    $data['is_recurring_event'] = $is_recurring_event;

+    $data['recurring_dates'] = $recurring_dates;

+    $data['event_duration_days'] = $event_duration_days;

+    $data['is_whole_day_event'] = $is_whole_day_event;

+    $data['event_starttimes'] = $event_starttimes;

+    $data['event_endtimes'] = $event_endtimes;

+    $data['recurring_type'] = $recurring_type;

+    $data['recurring_interval'] = $recurring_interval;

+    $data['recurring_week_days'] = $recurring_week_days;

+    $data['recurring_week_nos'] = $recurring_week_nos;

+    $data['max_recurring_count'] = $max_recurring_count;

+    $data['recurring_end_date'] = $recurring_end_date;

 	

-	return $data;

+    return $data;

 }

 

 /**

@@ -6836,12 +6836,12 @@ 
  * @return doesn't Date.

  */

 function geodir_imex_get_date_ymd($date) {

-	if (strpos($date, '/') !== false) {

-		$date = str_replace('/', '-', $date); // PHP doesn't work well with dd/mm/yyyy format.

-	}

+    if (strpos($date, '/') !== false) {

+        $date = str_replace('/', '-', $date); // PHP doesn't work well with dd/mm/yyyy format.

+    }

 	

-	$date = date_i18n('Y-m-d', strtotime($date));

-	return $date;

+    $date = date_i18n('Y-m-d', strtotime($date));

+    return $date;

 }

 

 /**

@@ -6854,117 +6854,117 @@ 
  * @return array Event data array.

  */

 function geodir_imex_process_event_data($gd_post) {

-	$recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );

-

-	$is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;

-	$event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_imex_get_date_ymd($gd_post['event_date']) : '';

-	$event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_imex_get_date_ymd($gd_post['event_enddate']) : $event_date;

-	$all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;

-	$starttime = isset($gd_post['starttime']) && !$all_day ? $gd_post['starttime'] : '';

-	$endtime = isset($gd_post['endtime']) && !$all_day ? $gd_post['endtime'] : '';

+    $recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );

+

+    $is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;

+    $event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_imex_get_date_ymd($gd_post['event_date']) : '';

+    $event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_imex_get_date_ymd($gd_post['event_enddate']) : $event_date;

+    $all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;

+    $starttime = isset($gd_post['starttime']) && !$all_day ? $gd_post['starttime'] : '';

+    $endtime = isset($gd_post['endtime']) && !$all_day ? $gd_post['endtime'] : '';

 	

-	$repeat_type = '';

-	$different_times = '';

-	$starttimes = '';

-	$endtimes = '';

-	$repeat_days = '';

-	$repeat_weeks = '';

-	$event_recurring_dates = '';

-	$repeat_x = '';

-	$duration_x = '';

-	$repeat_end_type = '';

-	$max_repeat = '';

-	$repeat_end = '';

+    $repeat_type = '';

+    $different_times = '';

+    $starttimes = '';

+    $endtimes = '';

+    $repeat_days = '';

+    $repeat_weeks = '';

+    $event_recurring_dates = '';

+    $repeat_x = '';

+    $duration_x = '';

+    $repeat_end_type = '';

+    $max_repeat = '';

+    $repeat_end = '';

 	

-	if ($recurring_pkg && $is_recurring) {

-		$repeat_type = $gd_post['recurring_type'];

+    if ($recurring_pkg && $is_recurring) {

+        $repeat_type = $gd_post['recurring_type'];

 		

-		if ($repeat_type == 'custom') {

-			$starttimes = !$all_day && !empty($gd_post['event_starttimes']) ? explode(",", $gd_post['event_starttimes']) : array();

-			$endtimes = !$all_day && !empty($gd_post['event_endtimes']) ? explode(",", $gd_post['event_endtimes']) : array();

+        if ($repeat_type == 'custom') {

+            $starttimes = !$all_day && !empty($gd_post['event_starttimes']) ? explode(",", $gd_post['event_starttimes']) : array();

+            $endtimes = !$all_day && !empty($gd_post['event_endtimes']) ? explode(",", $gd_post['event_endtimes']) : array();

 			

-			if (!empty($starttimes) || !empty($endtimes)) {

-				$different_times = true;

-			}

+            if (!empty($starttimes) || !empty($endtimes)) {

+                $different_times = true;

+            }

 			

-			$recurring_dates = isset($gd_post['recurring_dates']) && $gd_post['recurring_dates'] != '' ? explode(",", $gd_post['recurring_dates']) : array();

-			if (!empty($recurring_dates)) {

-				$event_recurring_dates = array();

+            $recurring_dates = isset($gd_post['recurring_dates']) && $gd_post['recurring_dates'] != '' ? explode(",", $gd_post['recurring_dates']) : array();

+            if (!empty($recurring_dates)) {

+                $event_recurring_dates = array();

 				

-				foreach ($recurring_dates as $recurring_date) {

-					$recurring_date = trim($recurring_date);

+                foreach ($recurring_dates as $recurring_date) {

+                    $recurring_date = trim($recurring_date);

 					

-					if ($recurring_date != '') {

-						$event_recurring_dates[] = geodir_imex_get_date_ymd($recurring_date);

-					}

-				}

+                    if ($recurring_date != '') {

+                        $event_recurring_dates[] = geodir_imex_get_date_ymd($recurring_date);

+                    }

+                }

 				

-				$event_recurring_dates = array_unique($event_recurring_dates);

-				$event_recurring_dates = implode(",", $event_recurring_dates);

-			}

-		} else {

-			$duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;

-			$repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;

-			$max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;

-			$repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

+                $event_recurring_dates = array_unique($event_recurring_dates);

+                $event_recurring_dates = implode(",", $event_recurring_dates);

+            }

+        } else {

+            $duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;

+            $repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;

+            $max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;

+            $repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

 			

-			$repeat_end_type = $repeat_end != '' ? 1 : 0;

-			$max_repeat = $repeat_end != '' ? '' : $max_repeat;

+            $repeat_end_type = $repeat_end != '' ? 1 : 0;

+            $max_repeat = $repeat_end != '' ? '' : $max_repeat;

 			

-			$week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));

+            $week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));

 			

-			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

-			$repeat_days = array();

-			if (!empty($a_repeat_days)) {

-				foreach ($a_repeat_days as $repeat_day) {

-					$repeat_day = geodir_strtolower(trim($repeat_day));

+            $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

+            $repeat_days = array();

+            if (!empty($a_repeat_days)) {

+                foreach ($a_repeat_days as $repeat_day) {

+                    $repeat_day = geodir_strtolower(trim($repeat_day));

 					

-					if ($repeat_day != '' && isset($week_days[$repeat_day])) {

-						$repeat_days[] = $week_days[$repeat_day];

-					}

-				}

+                    if ($repeat_day != '' && isset($week_days[$repeat_day])) {

+                        $repeat_days[] = $week_days[$repeat_day];

+                    }

+                }

 				

-				$repeat_days = array_unique($repeat_days);

-			}

+                $repeat_days = array_unique($repeat_days);

+            }

 			

-			$a_repeat_weeks = isset($gd_post['recurring_week_nos']) && trim($gd_post['recurring_week_nos']) != '' ? explode(",", trim($gd_post['recurring_week_nos'])) : array();

-			$repeat_weeks = array();

-			if (!empty($a_repeat_weeks)) {

-				foreach ($a_repeat_weeks as $repeat_week) {

-					$repeat_weeks[] = (int)$repeat_week;

-				}

+            $a_repeat_weeks = isset($gd_post['recurring_week_nos']) && trim($gd_post['recurring_week_nos']) != '' ? explode(",", trim($gd_post['recurring_week_nos'])) : array();

+            $repeat_weeks = array();

+            if (!empty($a_repeat_weeks)) {

+                foreach ($a_repeat_weeks as $repeat_week) {

+                    $repeat_weeks[] = (int)$repeat_week;

+                }

 				

-				$repeat_weeks = array_unique($repeat_weeks);

-			}

-		}

-	}

+                $repeat_weeks = array_unique($repeat_weeks);

+            }

+        }

+    }

 	

-	if (isset($gd_post['recurring_dates'])) {

-		unset($gd_post['recurring_dates']);

-	}

+    if (isset($gd_post['recurring_dates'])) {

+        unset($gd_post['recurring_dates']);

+    }

 

-	$gd_post['is_recurring'] = $is_recurring;

-	$gd_post['event_date'] = $event_date;

-	$gd_post['event_start'] = $event_date;

-	$gd_post['event_end'] = $event_enddate;

-	$gd_post['all_day'] = $all_day;

-	$gd_post['starttime'] = $starttime;

-	$gd_post['endtime'] = $endtime;

+    $gd_post['is_recurring'] = $is_recurring;

+    $gd_post['event_date'] = $event_date;

+    $gd_post['event_start'] = $event_date;

+    $gd_post['event_end'] = $event_enddate;

+    $gd_post['all_day'] = $all_day;

+    $gd_post['starttime'] = $starttime;

+    $gd_post['endtime'] = $endtime;

 	

-	$gd_post['repeat_type'] = $repeat_type;

-	$gd_post['different_times'] = $different_times;

-	$gd_post['starttimes'] = $starttimes;

-	$gd_post['endtimes'] = $endtimes;

-	$gd_post['repeat_days'] = $repeat_days;

-	$gd_post['repeat_weeks'] = $repeat_weeks;

-	$gd_post['event_recurring_dates'] = $event_recurring_dates;

-	$gd_post['repeat_x'] = $repeat_x;

-	$gd_post['duration_x'] = $duration_x;

-	$gd_post['repeat_end_type'] = $repeat_end_type;

-	$gd_post['max_repeat'] = $max_repeat;

-	$gd_post['repeat_end'] = $repeat_end;

-

-	return $gd_post;

+    $gd_post['repeat_type'] = $repeat_type;

+    $gd_post['different_times'] = $different_times;

+    $gd_post['starttimes'] = $starttimes;

+    $gd_post['endtimes'] = $endtimes;

+    $gd_post['repeat_days'] = $repeat_days;

+    $gd_post['repeat_weeks'] = $repeat_weeks;

+    $gd_post['event_recurring_dates'] = $event_recurring_dates;

+    $gd_post['repeat_x'] = $repeat_x;

+    $gd_post['duration_x'] = $duration_x;

+    $gd_post['repeat_end_type'] = $repeat_end_type;

+    $gd_post['max_repeat'] = $max_repeat;

+    $gd_post['repeat_end'] = $repeat_end;

+

+    return $gd_post;

 }

 

 /**

@@ -7036,12 +7036,12 @@ 
  * @return Original element id.

  */

 function geodir_imex_original_post_id($element_id, $element_type) {

-	global $sitepress;

+    global $sitepress;

 	

-	$original_element_id = $sitepress->get_original_element_id($element_id, $element_type);

-	$element_id = $element_id != $original_element_id ? $original_element_id : '';

+    $original_element_id = $sitepress->get_original_element_id($element_id, $element_type);

+    $element_id = $element_id != $original_element_id ? $original_element_id : '';

 	

-	return $element_id;

+    return $element_id;

 }

 

 /*

@@ -7121,15 +7121,15 @@ 
  * @global object $sitepress Sitepress WPML object.

  */

 function geodir_wpml_permalink_setting_notice() {

-	if (geodir_is_wpml()) {

-		global $sitepress;

-		$current_language = $sitepress->get_current_language();

-		$default_language = $sitepress->get_default_language();

-		if ($current_language != 'all' && $current_language != $default_language) {

-	?>

+    if (geodir_is_wpml()) {

+        global $sitepress;

+        $current_language = $sitepress->get_current_language();

+        $default_language = $sitepress->get_default_language();

+        if ($current_language != 'all' && $current_language != $default_language) {

+    ?>

 	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>

 	<?php

-		}

-	}

+        }

+    }

 }

 ?>
\ No newline at end of file

geodirectory-admin/admin_hooks_actions.php

Indentation +23 added lines, -23 removed lines

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

 /**

- * GeoDirectory Admin.

- *

- * Main admin file which loads all settings panels and sets up admin menus.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * GeoDirectory Admin.

+     *

+     * Main admin file which loads all settings panels and sets up admin menus.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 add_action('admin_init', 'geodir_admin_init');

 if (!function_exists('geodir_admin_init')) {

@@ -85,11 +85,11 @@ 
 {

     global $pagenow;

 	

-	// Get the current post type

-	$post_type = geodir_admin_current_post_type();

-	$geodir_post_types = geodir_get_posttypes();

+    // Get the current post type

+    $post_type = geodir_admin_current_post_type();

+    $geodir_post_types = geodir_get_posttypes();

     

-	if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {

+    if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {

         add_action('admin_enqueue_scripts', 'geodir_admin_scripts');

         add_action('admin_enqueue_scripts', 'geodir_admin_styles');

     }

@@ -1517,20 +1517,20 @@ 
 function geodir_diagnose_load_db_language() {

     global $wpdb;

 	

-	$is_error_during_diagnose = geodirectory_load_db_language();

+    $is_error_during_diagnose = geodirectory_load_db_language();

 

     $output_str = '';

 

     if ($is_error_during_diagnose) {

         $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

-		$info_div_class = "geodir_problem_info";

+        $info_div_class = "geodir_problem_info";

     } else {

         $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

-		$info_div_class = "geodir_noproblem_info";

+        $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

     }

     

-	echo "<ul class='$info_div_class'>";

+    echo "<ul class='$info_div_class'>";

     echo $output_str;

     echo $fix_button_txt;

     echo "</ul>";

@@ -1655,7 +1655,7 @@ 
     $uploads = wp_upload_dir();

     ini_set('auto_detect_line_endings', true);

 	

-	$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

+    $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

 

     $task = isset($_POST['task']) ? $_POST['task'] : '';

     $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;

@@ -1855,8 +1855,8 @@ 
                             $post_longitude = addslashes($buffer[$c]);

                         }

 						

-						// Post status

-						if ($customKeyarray[$c] == 'post_status') {

+                        // Post status

+                        if ($customKeyarray[$c] == 'post_status') {

                             $post_status = sanitize_key( $buffer[$c] );

                         }

                     }

@@ -1873,10 +1873,10 @@ 
                         }

                     }

 					

-					// Default post status

-					$default_status = 'publish';

-					$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-					$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+                    // Default post status

+                    $default_status = 'publish';

+                    $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

+                    $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

 

                     $my_post['post_title'] = $post_title;

                     $my_post['post_content'] = $post_desc;

@@ -2099,5 +2099,5 @@ 
 add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

 

 if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

-	add_action('geodir_before_admin_panel', 'geodir_wpml_permalink_setting_notice');

+    add_action('geodir_before_admin_panel', 'geodir_wpml_permalink_setting_notice');

 }
\ No newline at end of file

geodirectory-admin/admin_template_tags.php

Indentation +13 added lines, -13 removed lines

@@ -152,12 +152,12 @@ 
                         } ?>">

                             <form method="post" id="mainform"

                                   class="geodir_optionform <?php echo $current_tab . ' '; ?><?php if (isset($sub['subtab'])) {

-                                      echo sanitize_text_field($sub['subtab']);

-                                  } ?>" action="<?php echo $form_action; ?>" enctype="multipart/form-data">

+                                        echo sanitize_text_field($sub['subtab']);

+                                    } ?>" action="<?php echo $form_action; ?>" enctype="multipart/form-data">

                                 <input type="hidden" class="active_tab" name="active_tab"

                                        value="<?php if (isset($_REQUEST['active_tab'])) {

-                                           echo sanitize_text_field($_REQUEST['active_tab']);

-                                       } ?>"/>

+                                            echo sanitize_text_field($_REQUEST['active_tab']);

+                                        } ?>"/>

                                 <?php wp_nonce_field('geodir-settings', '_wpnonce', true, true); ?>

                                 <?php wp_nonce_field('geodir-settings-' . $current_tab, '_wpnonce-' . $current_tab, true, true); ?>

                                 <?php

@@ -415,8 +415,8 @@ 
                                     <input class="require" type="text" size="80" style="width:440px"

                                            id="<?php echo $prefix;?>city" name="city"

                                            value="<?php if (isset($location_result->city)) {

-                                               echo $location_result->city;

-                                           } ?>"/>

+                                                echo $location_result->city;

+                                            } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"> <?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -431,8 +431,8 @@ 
                                     <input class="require" type="text" size="80" style="width:440px"

                                            id="<?php echo $prefix;?>region" name="region"

                                            value="<?php if (isset($location_result->region)) {

-                                               echo $location_result->region;

-                                           } ?>"/>

+                                                echo $location_result->region;

+                                            } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"> <?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -485,8 +485,8 @@ 
                                     <input type="text" class="require" size="80" style="width:440px"

                                            id="<?php echo $prefix;?>latitude" name="latitude"

                                            value="<?php if (isset($location_result->city_latitude)) {

-                                               echo $location_result->city_latitude;

-                                           } ?>"/>

+                                                echo $location_result->city_latitude;

+                                            } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"><?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -502,8 +502,8 @@ 
                                     <input type="text" class="require" size="80" style="width:440px"

                                            id="<?php echo $prefix;?>longitude" name="longitude"

                                            value="<?php if (isset($location_result->city_longitude)) {

-                                               echo $location_result->city_longitude;

-                                           } ?>"/>

+                                                echo $location_result->city_longitude;

+                                            } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"><?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -546,7 +546,7 @@ 
         case 'compatibility_settings' :

             geodir_theme_compatibility_setting_page();

             break;		

-		case 'import_export' :

+        case 'import_export' :

             geodir_import_export_page();

             break;

 

geodirectory-functions/custom_fields_functions.php

Indentation +318 added lines, -318 removed lines

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

 /**

- * Custom fields functions

- *

- * @since 1.0.0

- * @package GeoDirectory

- * @global object $wpdb WordPress Database object.

- * @global string $table_prefix WordPress Database Table prefix.

- */

+                     * Custom fields functions

+                     *

+                     * @since 1.0.0

+                     * @package GeoDirectory

+                     * @global object $wpdb WordPress Database object.

+                     * @global string $table_prefix WordPress Database Table prefix.

+                     */

 global $wpdb, $table_prefix;

 

 if (!function_exists('geodir_column_exist')) {

-	/**

-	 * Check table column exist or not.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Check table column exist or not.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $db The table name.

-	 * @param string $column The column name.

-	 * @return bool If column exists returns true. Otherwise false.

-	 */

-	function geodir_column_exist($db, $column)

+     * @param string $db The table name.

+     * @param string $column The column name.

+     * @return bool If column exists returns true. Otherwise false.

+     */

+    function geodir_column_exist($db, $column)

     {

         global $wpdb;

         $exists = false;

@@ -36,17 +36,17 @@ 
 }

 

 if (!function_exists('geodir_add_column_if_not_exist')) {

-	/**

-	 * Add column if table column not exist.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Add column if table column not exist.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $db The table name.

-	 * @param string $column The column name.

-	 * @param string $column_attr The column attributes.

-	 */

-	function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

+     * @param string $db The table name.

+     * @param string $column The column name.

+     * @param string $column_attr The column attributes.

+     */

+    function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

     {

         global $wpdb;

         $result = 0;// no rows affected

@@ -152,18 +152,18 @@ 
 }

 

 if (!function_exists('geodir_custom_field_adminhtml')) {

-	/**

-	 * Adds admin html for custom fields.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Adds admin html for custom fields.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $field_type The form field type.

-	 * @param object|int $result_str The custom field results object or row id.

-	 * @param string $field_ins_upd When set to "submit" displays form.

-	 * @param bool $default when set to true field will be for admin use only.

-	 */

-	function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

+     * @param string $field_type The form field type.

+     * @param object|int $result_str The custom field results object or row id.

+     * @param string $field_ins_upd When set to "submit" displays form.

+     * @param bool $default when set to true field will be for admin use only.

+     */

+    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

     {

         global $wpdb;

         $cf = $result_str;

@@ -186,32 +186,32 @@ 
 }

 

 if (!function_exists('geodir_custom_field_delete')) {

-	/**

-	 * Delete custom field using field id.

-	 *

-	 * @since 1.0.0

-	 * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

-	 * @package GeoDirectory

+    /**

+     * Delete custom field using field id.

+     *

+     * @since 1.0.0

+     * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param string $field_id The custom field ID.

-	 * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

-	 */

-	function geodir_custom_field_delete($field_id = '') {

+     * @param string $field_id The custom field ID.

+     * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

+     */

+    function geodir_custom_field_delete($field_id = '') {

         global $wpdb, $plugin_prefix;

         

-		if ($field_id != '') {

+        if ($field_id != '') {

             $cf = trim($field_id, '_');

 

             if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

                 $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

 

                 $post_type = $field->post_type;

-				$htmlvar_name = $field->htmlvar_name;

+                $htmlvar_name = $field->htmlvar_name;

 				

-				if ($post_type != '' && $htmlvar_name != '') {

-					$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

-				}

+                if ($post_type != '' && $htmlvar_name != '') {

+                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

+                }

 

                 /**

                  * Called after a custom field is deleted.

@@ -248,15 +248,15 @@ 
 }

 

 if (!function_exists('geodir_custom_field_save')) {

-	/**

-	 * Save or Update custom fields into the database.

-	 *

-	 * @since 1.0.0

+    /**

+     * Save or Update custom fields into the database.

+     *

+     * @since 1.0.0

      * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.

-	 * @package GeoDirectory

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param array $request_field {

+     * @param array $request_field {

      *    Attributes of the request field array.

      *

      *    @type string $action Ajax Action name. Default "geodir_ajax_action".

@@ -289,10 +289,10 @@ 
      *    @type string $css_class Enter custom css class for field custom style.

      *

      * }

-	 * @param bool $default Not yet implemented.

-	 * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

-	 */

-	function geodir_custom_field_save($request_field = array(), $default = false)

+     * @param bool $default Not yet implemented.

+     * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

+     */

+    function geodir_custom_field_save($request_field = array(), $default = false)

     {

 

         global $wpdb, $plugin_prefix;

@@ -976,27 +976,27 @@ 
                         if (isset($option_values) && $option_values && $field_type == 'select') {

                             $option_values_arr = explode(',', $option_values);

                             

-							if (is_array($option_values_arr)) {

+                            if (is_array($option_values_arr)) {

                                 $op_max = 0;

                                 

-								foreach ($option_values_arr as $op_val) {

+                                foreach ($option_values_arr as $op_val) {

                                     if (strlen($op_val) && strlen($op_val) > $op_max) {

-										$op_max = strlen($op_val);

-									}

+                                        $op_max = strlen($op_val);

+                                    }

                                 }

                                 

-								if ($op_max) {

-									$op_size = $op_max;

-								}

+                                if ($op_max) {

+                                    $op_size = $op_max;

+                                }

                             }

                         } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

                             if (strlen($option_values)) {

                                 $op_size =  strlen($option_values);

                             }

 							

-							if (isset($request_field['multi_display_type'])) {

-								$extra_fields = $request_field['multi_display_type'];

-							}

+                            if (isset($request_field['multi_display_type'])) {

+                                $extra_fields = $request_field['multi_display_type'];

+                            }

                         }

 

                         $meta_field_add = $data_type . "( $op_size ) NULL ";

@@ -1214,10 +1214,10 @@ 
     $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

 

     $fieldset_id = '';

-	$fieldset_field_class = 'gd-fieldset-details';

-	foreach ($custom_fields as $key => $val) {

+    $fieldset_field_class = 'gd-fieldset-details';

+    foreach ($custom_fields as $key => $val) {

         $val = stripslashes_deep($val); // strip slashes from labels

-		$name = $val['name'];

+        $name = $val['name'];

         $site_title = $val['site_title'];

         $type = $val['type'];

         $admin_desc = $val['desc'];

@@ -1582,15 +1582,15 @@ 
 				<?php if ($option_values) {

                     $option_values = geodir_string_values_to_options($option_values, true);

 					

-					if (!empty($option_values)) {

-						foreach ($option_values as $option_value) {

-							if (empty($option_value['optgroup'])) {

-							?>

+                    if (!empty($option_values)) {

+                        foreach ($option_values as $option_value) {

+                            if (empty($option_value['optgroup'])) {

+                            ?>

 							<input name="<?php echo $name;?>" id="<?php echo $name;?>" <?php checked($value, $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type;?>" type="radio" /><?php echo $option_value['label']; ?>

 							<?php

-							}

-						}

-					}

+                            }

+                        }

+                    }

                 }

                 ?>

                 <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

@@ -2033,8 +2033,8 @@ 
                     $file_totImg = count($curImages);

             }

 			

-			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

-			$display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

+            $display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

 

             ?>

             <?php /*?> <h5 class="geodir-form_title"> <?php echo $site_title; ?>

@@ -2062,10 +2062,10 @@ 
 					<?php } ?>

                     <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"

                            value="<?php if (isset($file_totImg)) {

-                               echo esc_attr($file_totImg);

-                           } else {

-                               echo '0';

-                           } ?>"/>

+                                echo esc_attr($file_totImg);

+                            } else {

+                                echo '0';

+                            } ?>"/>

 

                     <div style="float:left; width:55%;">

                         <div

@@ -2124,18 +2124,18 @@ 
 

 

 if (!function_exists('geodir_get_field_infoby')) {

-	/**

-	 * Get custom field using key and value.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Get custom field using key and value.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $key The key you want to look for.

-	 * @param string $value The value of the key you want to look for.

-	 * @param string $geodir_post_type The post type.

-	 * @return bool|mixed Returns field info when available. otherwise returns false.

-	 */

-	function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

+     * @param string $key The key you want to look for.

+     * @param string $value The value of the key you want to look for.

+     * @param string $geodir_post_type The post type.

+     * @return bool|mixed Returns field info when available. otherwise returns false.

+     */

+    function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

     {

 

         global $wpdb;

@@ -2158,21 +2158,21 @@ 
 

 

 if (!function_exists('geodir_show_listing_info')) {

-	/**

-	 * Show listing info depending on field location.

-	 *

-	 * @since 1.0.0

-	 * @since 1.5.7 Custom fields option values added to db translation.

+    /**

+     * Show listing info depending on field location.

+     *

+     * @since 1.0.0

+     * @since 1.5.7 Custom fields option values added to db translation.

      *              Changes to display url fields title.

-	 * @package GeoDirectory

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global object $post The current post object.

      * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false.

      *

-	 * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

-	 * @return string Returns listing info html.

-	 */

-	function geodir_show_listing_info($fields_location = '') {

+     * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

+     * @return string Returns listing info html.

+     */

+    function geodir_show_listing_info($fields_location = '') {

         global $post, $preview, $wpdb, $send_to_friend;

 

         $payment_info = array();

@@ -2181,7 +2181,7 @@ 
         $package_info = geodir_post_package_info($package_info, $post);

         $post_package_id = $package_info->pid;

         $p_type = (geodir_get_current_posttype()) ? geodir_get_current_posttype() : $post->post_type;

-		$send_to_friend = false;

+        $send_to_friend = false;

 

         ob_start();

         $fields_info = geodir_post_custom_fields($post_package_id, 'default', $p_type, $fields_location);

@@ -2195,7 +2195,7 @@ 
 

                 $i = 1;

             foreach ($fields_info as $type) {

-				$type = stripslashes_deep($type); // strip slashes

+                $type = stripslashes_deep($type); // strip slashes

                 $html = '';

                 $html_var = '';

                 $field_icon = '';

@@ -2400,13 +2400,13 @@ 
                                 $field_icon = '';

                             }

 							

-							$a_url = geodir_parse_custom_field_url($post->{$type['htmlvar_name']});

+                            $a_url = geodir_parse_custom_field_url($post->{$type['htmlvar_name']});

 

 

-							$website = !empty($a_url['url']) ? $a_url['url'] : '';

-							$title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

+                            $website = !empty($a_url['url']) ? $a_url['url'] : '';

+                            $title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

                             if(!empty($type['default_value'])){$title = $type['default_value'];}

-							$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

+                            $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

 

 

                             $geodir_odd_even = '';

@@ -2624,22 +2624,22 @@ 
                         if ($post->{$type['htmlvar_name']} != ''):

 

                             if ($post->{$type['htmlvar_name']} == 'f' || $post->{$type['htmlvar_name']} == '0') {

-								$html_val = __('No', 'geodirectory');

-							} else if ($post->{$type['htmlvar_name']} == 't' || $post->{$type['htmlvar_name']} == '1') {

-								$html_val = __('Yes', 'geodirectory');

-							} else {								

-								if (!empty($type['option_values'])) {

-									$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                                $html_val = __('No', 'geodirectory');

+                            } else if ($post->{$type['htmlvar_name']} == 't' || $post->{$type['htmlvar_name']} == '1') {

+                                $html_val = __('Yes', 'geodirectory');

+                            } else {								

+                                if (!empty($type['option_values'])) {

+                                    $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 									

-									if (!empty($cf_option_values)) {

-										foreach ($cf_option_values as $cf_option_value) {

-											if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$type['htmlvar_name']}) {

-												$html_val = $cf_option_value['label'];

-											}

-										}

-									}

-								}

-							}

+                                    if (!empty($cf_option_values)) {

+                                        foreach ($cf_option_values as $cf_option_value) {

+                                            if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$type['htmlvar_name']}) {

+                                                $html_val = $cf_option_value['label'];

+                                            }

+                                        }

+                                    }

+                                }

+                            }

 

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

@@ -2710,19 +2710,19 @@ 
                         $html_var = $type['htmlvar_name'];

 

                         if ($post->{$type['htmlvar_name']}):

-							$field_value = __($post->$type['htmlvar_name'], 'geodirectory');

+                            $field_value = __($post->$type['htmlvar_name'], 'geodirectory');

 							

-							if (!empty($type['option_values'])) {

-								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                            if (!empty($type['option_values'])) {

+                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 								

-								if (!empty($cf_option_values)) {

-									foreach ($cf_option_values as $cf_option_value) {

-										if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

-											$field_value = $cf_option_value['label'];

-										}

-									}

-								}

-							}

+                                if (!empty($cf_option_values)) {

+                                    foreach ($cf_option_values as $cf_option_value) {

+                                        if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

+                                            $field_value = $cf_option_value['label'];

+                                        }

+                                    }

+                                }

+                            }

 							

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

@@ -2770,19 +2770,19 @@ 
                                 $field_icon = '';

                             }

 							

-							$field_values = explode(',', trim($post->$type['htmlvar_name'], ","));

+                            $field_values = explode(',', trim($post->$type['htmlvar_name'], ","));

 

                             $option_values = array();

-							if (!empty($type['option_values'])) {

-								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                            if (!empty($type['option_values'])) {

+                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 								

-								if (!empty($cf_option_values)) {

-									foreach ($cf_option_values as $cf_option_value) {

-										if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

-											$option_values[] = $cf_option_value['label'];

-										}

-									}

-								}

+                                if (!empty($cf_option_values)) {

+                                    foreach ($cf_option_values as $cf_option_value) {

+                                        if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

+                                            $option_values[] = $cf_option_value['label'];

+                                        }

+                                    }

+                                }

                             }

 							

                             $geodir_odd_even = '';

@@ -2802,11 +2802,11 @@ 
                             if (count($option_values) > 1) {

                                 $html .= '<ul>';

                                 

-								foreach ($option_values as $val) {

+                                foreach ($option_values as $val) {

                                     $html .= '<li>' . $val . '</li>';

                                 }

                                 

-								$html .= '</ul>';

+                                $html .= '</ul>';

                             } else {

                                 $html .= $post->$type['htmlvar_name'];

                             }

@@ -2815,13 +2815,13 @@ 
                         endif;

                         break;

                     case 'email':

-						if ($type['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {

-							continue; // Remove Send Enquiry | Send To Friend from listings page

-						}

+                        if ($type['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {

+                            continue; // Remove Send Enquiry | Send To Friend from listings page

+                        }

                        

-					    if ($type['htmlvar_name'] == 'geodir_email' && ((isset($package_info->sendtofriend) && $package_info->sendtofriend) || $post->{$type['htmlvar_name']})) {

-						    $send_to_friend = true;

-							$b_send_inquiry = '';

+                        if ($type['htmlvar_name'] == 'geodir_email' && ((isset($package_info->sendtofriend) && $package_info->sendtofriend) || $post->{$type['htmlvar_name']})) {

+                            $send_to_friend = true;

+                            $b_send_inquiry = '';

                             $b_sendtofriend = '';

 

                             $html = '';

@@ -2859,7 +2859,7 @@ 
 

                             if (isset($package_info->sendtofriend) && $package_info->sendtofriend) {

                                 $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';

-							}

+                            }

 

                             $html .= '</span></div>';

 

@@ -2932,13 +2932,13 @@ 
                             if (!empty($files)):

 

                                $extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['extra_fields']) : NULL;

-							   $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+                                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

 								

-								$file_paths = '';

+                                $file_paths = '';

                                 foreach ($files as $file) {

                                     if (!empty($file)) {

 

-                                       // $filetype = wp_check_filetype($file);

+                                        // $filetype = wp_check_filetype($file);

 

                                         $image_name_arr = explode('/', $file);

                                         $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];

@@ -2947,29 +2947,29 @@ 
 

                                         $arr_file_type = wp_check_filetype($filename);

                                         if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-											continue;

-										}

+                                            continue;

+                                        }

 										

-										$uploaded_file_type = $arr_file_type['type'];

-										$uploaded_file_ext = $arr_file_type['ext'];

+                                        $uploaded_file_type = $arr_file_type['type'];

+                                        $uploaded_file_ext = $arr_file_type['ext'];

 										

-										if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-											continue; // Invalid file type.

-										}

+                                        if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+                                            continue; // Invalid file type.

+                                        }

 

                                         //$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

-										$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

+                                        $image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

 

                                         // If the uploaded file is image

                                         if (in_array($uploaded_file_type, $image_file_types)) {

                                             $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

                                             $file_paths .= '<a href="'.$file.'">';

-											$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

-											$file_paths .= '</a>';

+                                            $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

+                                            $file_paths .= '</a>';

                                             //$file_paths .= '<img src="'.$file.'"  />';	

                                             $file_paths .= '</div>';

                                         } else {

-											$ext_path = '_' . $html_var . '_';

+                                            $ext_path = '_' . $html_var . '_';

                                             $filename = explode($ext_path, $filename);

                                             $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';

                                         }

@@ -3174,14 +3174,14 @@ 
 }

 

 if (!function_exists('geodir_default_date_format')) {

-	/**

-	 * Returns default date format.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @return mixed|string|void Returns default date format.

-	 */

-	function geodir_default_date_format()

+    /**

+     * Returns default date format.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @return mixed|string|void Returns default date format.

+     */

+    function geodir_default_date_format()

     {

         if ($format = get_option('date_format'))

             return $format;

@@ -3191,30 +3191,30 @@ 
 }

 

 if (!function_exists('geodir_get_formated_date')) {

-	/**

-	 * Returns formatted date.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @param string $date Date string to convert.

-	 * @return bool|int|string Returns formatted date.

-	 */

-	function geodir_get_formated_date($date)

+    /**

+     * Returns formatted date.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @param string $date Date string to convert.

+     * @return bool|int|string Returns formatted date.

+     */

+    function geodir_get_formated_date($date)

     {

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

     }

 }

 

 if (!function_exists('geodir_get_formated_time')) {

-	/**

-	 * Returns formatted time.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @param string $time Time string to convert.

-	 * @return bool|int|string Returns formatted time.

-	 */

-	function geodir_get_formated_time($time)

+    /**

+     * Returns formatted time.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @param string $time Time string to convert.

+     * @return bool|int|string Returns formatted time.

+     */

+    function geodir_get_formated_time($time)

     {

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

     }

@@ -3222,21 +3222,21 @@ 
 

 

 if (!function_exists('geodir_save_post_file_fields')) {

-	/**

-	 * Save post file fields

-	 *

-	 * @since 1.0.0

-	 * @since 1.4.7 Added `$extra_fields` parameter.

-	 * @package GeoDirectory

+    /**

+     * Save post file fields

+     *

+     * @since 1.0.0

+     * @since 1.4.7 Added `$extra_fields` parameter.

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

      * @global object $current_user Current user object.

-	 * @param int $post_id

-	 * @param string $field_id

-	 * @param array $post_image

-	 * @param array $extra_fields Array of extra fields.

-	 */

-	function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

+     * @param int $post_id

+     * @param string $field_id

+     * @param array $post_image

+     * @param array $extra_fields Array of extra fields.

+     */

+    function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

     {

 

         global $wpdb, $plugin_prefix, $current_user;

@@ -3262,7 +3262,7 @@ 
             $geodir_uploadurl = $uploads['url'];

             $sub_dir = $uploads['subdir'];

 			

-			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

 

             for ($m = 0; $m < count($post_image); $m++) {

 

@@ -3279,47 +3279,47 @@ 
 

                     $arr_file_type = wp_check_filetype($filename);

 					

-					if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-						continue;

-					}

+                    if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

+                        continue;

+                    }

 					

-					$uploaded_file_type = $arr_file_type['type'];

-					$uploaded_file_ext = $arr_file_type['ext'];

+                    $uploaded_file_type = $arr_file_type['type'];

+                    $uploaded_file_ext = $arr_file_type['ext'];

 					

-					if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-						continue; // Invalid file type.

-					}

+                    if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+                        continue; // Invalid file type.

+                    }

 

                     // Set an array containing a list of acceptable formats

                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

-					if (!function_exists('wp_handle_upload'))

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

+                    if (!function_exists('wp_handle_upload'))

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

 

-					if (!is_dir($geodir_uploadpath))

-						mkdir($geodir_uploadpath);

+                    if (!is_dir($geodir_uploadpath))

+                        mkdir($geodir_uploadpath);

 

-					$new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

-					$explode_sub_dir = explode("/", $sub_dir);

-					if ($curr_img_dir == end($explode_sub_dir)) {

-						$img_path = $geodir_uploadpath . '/' . $filename;

-						$img_url = $geodir_uploadurl . '/' . $filename;

-					} else {

-						$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-						$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

-					}

+                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

+                    $explode_sub_dir = explode("/", $sub_dir);

+                    if ($curr_img_dir == end($explode_sub_dir)) {

+                        $img_path = $geodir_uploadpath . '/' . $filename;

+                        $img_url = $geodir_uploadurl . '/' . $filename;

+                    } else {

+                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+                    }

 

-					$uploaded_file = '';

-					if (file_exists($img_path))

-						$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                    $uploaded_file = '';

+                    if (file_exists($img_path))

+                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

 

-					if ($curr_img_dir != $geodir_uploaddir) {

-						if (file_exists($img_path))

-							unlink($img_path);

-					}

+                    if ($curr_img_dir != $geodir_uploaddir) {

+                        if (file_exists($img_path))

+                            unlink($img_path);

+                    }

 

-					if (!empty($uploaded_file))

-						$file_urls = $geodir_uploadurl . '/' . $new_name;

+                    if (!empty($uploaded_file))

+                        $file_urls = $geodir_uploadurl . '/' . $new_name;

 

                 } else {

                     $file_urls = $post_image[$m];

@@ -3374,16 +3374,16 @@ 
 

 if (!function_exists('geodir_plupload_action')) {

 

-	/**

-	 * Get upload directory path details

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Get upload directory path details

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $current_user Current user object.

-	 * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

-	 * @return mixed Returns upload directory details as an array.

-	 */

-	function geodir_upload_dir($upload)

+     * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

+     * @return mixed Returns upload directory details as an array.

+     */

+    function geodir_upload_dir($upload)

     {

         global $current_user;

         $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

@@ -3483,14 +3483,14 @@ 
 }

 

 if (!function_exists('geodir_max_upload_size')) {

-	/**

-	 * Get max upload file size

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @return mixed|void Returns max upload file size.

-	 */

-	function geodir_max_upload_size()

+    /**

+     * Get max upload file size

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @return mixed|void Returns max upload file size.

+     */

+    function geodir_max_upload_size()

     {

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

 

@@ -3663,14 +3663,14 @@ 
 

 

 if (!function_exists('geodir_custom_sort_field_save')) {

-	/**

-	 * Save or Update custom sort fields into the database.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Save or Update custom sort fields into the database.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param array $request_field {

+     * @param array $request_field {

      *    Attributes of the Request field.

      *

      *    @type string $action Ajax action name.

@@ -3689,10 +3689,10 @@ 
      *    @type string $sort_order Sort Order.

      *

      * }

-	 * @param bool $default Not yet implemented.

-	 * @return int Returns the last affected db table row id.

-	 */

-	function geodir_custom_sort_field_save($request_field = array(), $default = false)

+     * @param bool $default Not yet implemented.

+     * @return int Returns the last affected db table row id.

+     */

+    function geodir_custom_sort_field_save($request_field = array(), $default = false)

     {

 

         global $wpdb, $plugin_prefix;

@@ -3810,16 +3810,16 @@ 
 

 

 if (!function_exists('geodir_custom_sort_field_delete')) {

-	/**

-	 * Delete a custom sort field using field id.

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Delete a custom sort field using field id.

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param string $field_id The field ID.

-	 * @return int|string Returns field id when successful deletion, else returns 0.

-	 */

-	function geodir_custom_sort_field_delete($field_id = '')

+     * @param string $field_id The field ID.

+     * @return int|string Returns field id when successful deletion, else returns 0.

+     */

+    function geodir_custom_sort_field_delete($field_id = '')

     {

 

         global $wpdb, $plugin_prefix;

@@ -3838,18 +3838,18 @@ 
 

 

 if (!function_exists('geodir_custom_sort_field_adminhtml')) {

-	/**

-	 * Custom sort field admin html.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Custom sort field admin html.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $field_type The form field type.

-	 * @param object|int $result_str The custom field results object or row id.

-	 * @param string $field_ins_upd When set to "submit" displays form.

-	 * @param bool $default when set to true field will be for admin use only.

-	 */

-	function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

+     * @param string $field_type The form field type.

+     * @param object|int $result_str The custom field results object or row id.

+     * @param string $field_ins_upd When set to "submit" displays form.

+     * @param bool $default when set to true field will be for admin use only.

+     */

+    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

     {

         global $wpdb;

         $cf = $result_str;

@@ -3914,10 +3914,10 @@ 
 

             <div id="field_frm<?php echo $result_str;?>" class="field_frm"

                  style="display:<?php if ($field_ins_upd == 'submit') {

-                     echo 'block;';

-                 } else {

-                     echo 'none;';

-                 } ?>">

+                        echo 'block;';

+                    } else {

+                        echo 'none;';

+                    } ?>">

                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>

                 <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>

                 <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>

@@ -3945,8 +3945,8 @@ 
                                 <input type="text" name="asc_title" id="asc_title"

                                        placeholder="<?php esc_attr_e('Ascending title', 'geodirectory'); ?>"

                                        value="<?php if (isset($field_info->asc_title)) {

-                                           echo esc_attr($field_info->asc_title);

-                                       } ?>" style="width:45%;"/>

+                                            echo esc_attr($field_info->asc_title);

+                                        } ?>" style="width:45%;"/>

 

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {

@@ -3969,8 +3969,8 @@ 
                                 <input type="text" name="desc_title" id="desc_title"

                                        placeholder="<?php esc_attr_e('Descending title', 'geodirectory'); ?>"

                                        value="<?php if (isset($field_info->desc_title)) {

-                                           echo esc_attr($field_info->desc_title);

-                                       } ?>" style="width:45%;"/>

+                                            echo esc_attr($field_info->desc_title);

+                                        } ?>" style="width:45%;"/>

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {

                                     echo 'checked="checked"';

@@ -4056,19 +4056,19 @@ 
 }

 

 if (!function_exists('check_field_visibility')) {

-	/**

-	 * Check field visibility as per price package.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Check field visibility as per price package.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global array $geodir_addon_list List of active GeoDirectory extensions.

-	 * @param int|string $package_id The package ID.

-	 * @param string $field_name The field name.

-	 * @param string $post_type Optional. The wordpress post type.

-	 * @return bool Returns true when field visible, otherwise false.

-	 */

-	function check_field_visibility($package_id, $field_name, $post_type)

+     * @param int|string $package_id The package ID.

+     * @param string $field_name The field name.

+     * @param string $post_type Optional. The wordpress post type.

+     * @return bool Returns true when field visible, otherwise false.

+     */

+    function check_field_visibility($package_id, $field_name, $post_type)

     {

         global $wpdb, $geodir_addon_list;

         if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {

@@ -4116,15 +4116,15 @@ 
                 $input_str = explode("/", $input_str, 2);

                 $label = trim($input_str[0]);

                 if ($translated && $label != '') {

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

-				}

-				$label = ucfirst($label);

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

+                }

+                $label = ucfirst($label);

                 $value = trim($input_str[1]);

             } else {

                 if ($translated && $input_str != '') {

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

-				}

-				$label = ucfirst($input_str);

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

+                }

+                $label = ucfirst($input_str);

                 $value = $input_str;

             }

 

@@ -4170,9 +4170,9 @@ 
                     if (strpos($optgroup_str, "|") !== false) {

                         $optgroup_str_arr = explode("|", $optgroup_str, 2);

                         $optgroup_label = trim($optgroup_str_arr[0]);

-						if ($translated && $optgroup_label != '') {

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

-						}

+                        if ($translated && $optgroup_label != '') {

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

+                        }

                         $optgroup_label = ucfirst($optgroup_label);

                         $optgroup_str = $optgroup_str_arr[1];

                     }

geodirectory-functions/map-functions/get_markers.php

Indentation +40 added lines, -40 removed lines

@@ -149,22 +149,22 @@ 
     $join = ", " . $table . " AS pd ";

 

     /**

-	 * Filter the SQL JOIN clause for the markers data

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param string $join Row of SQL JOIN clause to join table.

-	 */

-	$join = apply_filters('geodir_home_map_listing_join', $join);

+     * Filter the SQL JOIN clause for the markers data

+     *

+     * @since 1.0.0

+     *

+     * @param string $join Row of SQL JOIN clause to join table.

+     */

+    $join = apply_filters('geodir_home_map_listing_join', $join);

     

-	/**

-	 * Filter the searched fields for the markers data

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param string $search Row of searched fields to use in WHERE clause.

-	 */

-	$search = apply_filters('geodir_home_map_listing_where', $search);

+    /**

+     * Filter the searched fields for the markers data

+     *

+     * @since 1.0.0

+     *

+     * @param string $search Row of searched fields to use in WHERE clause.

+     */

+    $search = apply_filters('geodir_home_map_listing_where', $search);

     $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);

     $cat_type = $post_type . 'category';

     if ($post_type == 'gd_event') {

@@ -175,35 +175,35 @@ 
 

     $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select;

     /**

-	 * Filter the SQL SELECT clause to retrive fields data

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param string $sql_select Row of SQL SELECT clause.

-	 */

-	$select = apply_filters('geodir_home_map_listing_select', $sql_select);

+     * Filter the SQL SELECT clause to retrive fields data

+     *

+     * @since 1.0.0

+     *

+     * @param string $sql_select Row of SQL SELECT clause.

+     */

+    $select = apply_filters('geodir_home_map_listing_select', $sql_select);

 	

-	$groupby = " GROUP BY pd.post_id";

-	/**

-	 * Filter the SQL GROUP BY clause to retrive map markers data.

-	 *

-	 * @since 1.5.7

-	 *

-	 * @param string $groupby Row of SQL GROUP BY clause.

-	 */

-	$groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);

+    $groupby = " GROUP BY pd.post_id";

+    /**

+     * Filter the SQL GROUP BY clause to retrive map markers data.

+     *

+     * @since 1.5.7

+     *

+     * @param string $groupby Row of SQL GROUP BY clause.

+     */

+    $groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);

 

     $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);

     

-	/**

-	 * Filter the SQL query to retrive markers data

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param string $catsql Row of SQL query.

-	 * @param string $search Row of searched fields to use in WHERE clause.

-	 */

-	$catsql = apply_filters('geodir_home_map_listing_query', $catsql, $search);

+    /**

+     * Filter the SQL query to retrive markers data

+     *

+     * @since 1.0.0

+     *

+     * @param string $catsql Row of SQL query.

+     * @param string $search Row of searched fields to use in WHERE clause.

+     */

+    $catsql = apply_filters('geodir_home_map_listing_query', $catsql, $search);

 	

     $catinfo = $wpdb->get_results($catsql);

 	

geodirectory-functions/map-functions/map_template_tags.php

Indentation +58 added lines, -58 removed lines

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

 /**

- * All map related templates used by the plugin

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * All map related templates used by the plugin

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

  

 /**

  * Contains all map related functions.

@@ -138,33 +138,33 @@ 
     }

 

     /**

-	 * Filter the options to use in google map.

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param array $geodir_map_options {@see geodir_draw_map()} docblock.

-	 */

-	$geodir_map_options = apply_filters("geodir_map_options_{$map_canvas_name}", $geodir_map_options);

+     * Filter the options to use in google map.

+     *

+     * @since 1.0.0

+     *

+     * @param array $geodir_map_options {@see geodir_draw_map()} docblock.

+     */

+    $geodir_map_options = apply_filters("geodir_map_options_{$map_canvas_name}", $geodir_map_options);

 

     $map_canvas_arr[$map_canvas_name] = array();

 

     /**

-	 * Filter the post types to display data on map.

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param object $object Objects of post types.

-	 */

-	$post_types = apply_filters("geodir_map_post_type_list_{$map_canvas_name}", geodir_get_posttypes('object'));

+     * Filter the post types to display data on map.

+     *

+     * @since 1.0.0

+     *

+     * @param object $object Objects of post types.

+     */

+    $post_types = apply_filters("geodir_map_post_type_list_{$map_canvas_name}", geodir_get_posttypes('object'));

     

-	/**

-	 * Filter the post types to exclude to display data on map.

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param array Array of post types to exclude to display data on map.

-	 */

-	$exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));

+    /**

+     * Filter the post types to exclude to display data on map.

+     *

+     * @since 1.0.0

+     *

+     * @param array Array of post types to exclude to display data on map.

+     */

+    $exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));

 

     if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):

         // Set default map options

@@ -180,13 +180,13 @@ 
         }

 

         /**

-		 * Filter the width of map.

-		 *

-		 * @since 1.0.0

-		 *

-		 * @param int $map_width Width of map box, eg: gd_place.

-		 */

-		$map_width = apply_filters('geodir_change_map_width', $map_width);

+         * Filter the width of map.

+         *

+         * @since 1.0.0

+         *

+         * @param int $map_width Width of map box, eg: gd_place.

+         */

+        $map_width = apply_filters('geodir_change_map_width', $map_width);

         ?>

         <div id="catcher_<?php echo $map_canvas_name;?>"></div>

         <div class="stick_trigger_container">

@@ -285,29 +285,29 @@ 
 

                     <div id="<?php echo $map_canvas_name; ?>_directionsPanel" style="width:auto;"></div>

                 <?php 

-				}

+                }

 				

-				$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-				if (empty($geodir_default_map_search_pt))

-					$geodir_default_map_search_pt = 'gd_place';

-

-				/**

-				 * Filter the post type to retrive data for map

-				 *

-				 * @since 1.0.0

-				 *

-				 * @param string $geodir_default_map_search_pt Post type, eg: gd_place.

-				 */

-				$map_search_pt = apply_filters('geodir_default_map_search_pt', $geodir_default_map_search_pt);

-				?>

+                $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

+                if (empty($geodir_default_map_search_pt))

+                    $geodir_default_map_search_pt = 'gd_place';

+

+                /**

+                 * Filter the post type to retrive data for map

+                 *

+                 * @since 1.0.0

+                 *

+                 * @param string $geodir_default_map_search_pt Post type, eg: gd_place.

+                 */

+                $map_search_pt = apply_filters('geodir_default_map_search_pt', $geodir_default_map_search_pt);

+                ?>

                 <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>">

                     <?php

                     $exclude_post_types = get_option('geodir_exclude_post_type_on_map');

                     $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);

-					$map_cat_class = '';

-					if ($geodir_map_options['enable_post_type_filters']) {

-						$map_cat_class = $geodir_available_pt_on_map > 1 ? ' map-cat-ptypes' : ' map-cat-floor';

-					}

+                    $map_cat_class = '';

+                    if ($geodir_map_options['enable_post_type_filters']) {

+                        $map_cat_class = $geodir_available_pt_on_map > 1 ? ' map-cat-ptypes' : ' map-cat-floor';

+                    }

                     ?>

                     <div

                         class="map-category-listing<?php echo $map_cat_class;?>">

@@ -350,14 +350,14 @@ 
 

                 <?php

                 if ($geodir_map_options['enable_location_filters']) {

-					$country = get_query_var('gd_country');

-					$region = get_query_var('gd_region');

-					$city = get_query_var('gd_city');

+                    $country = get_query_var('gd_country');

+                    $region = get_query_var('gd_region');

+                    $city = get_query_var('gd_city');

                     

                     //fix for location/me page

                     $country = $country != 'me' ? $country : '';

-					$region = $region != 'me' ? $region : '';

-					$city = $country != 'me' ? $city : '';

+                    $region = $region != 'me' ? $region : '';

+                    $city = $country != 'me' ? $city : '';

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

                     ?>

                     <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>

@@ -396,7 +396,7 @@ 
                                     foreach ($post_types as $post_type => $args) {

                                         if (!in_array($post_type, $exclude_post_types)) {

                                             $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';

-											echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __(ucfirst($args->labels->name), 'geodirectory') . '</a></li>';

+                                            echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __(ucfirst($args->labels->name), 'geodirectory') . '</a></li>';

                                         }

                                     }

                                     ?>

geodirectory-functions/taxonomy_functions.php

Indentation +56 added lines, -56 removed lines

@@ -445,16 +445,16 @@ 
             case 'Array':

                 $post_types = (array)$post_types;

                 break;

-			case 'options':

+            case 'options':

                 $post_types = (array)$post_types;

 				

-				$options = array();

-				if (!empty($post_types)) {

-					foreach ($post_types as $key => $info) {

-						$options[$key] = __($info['labels']['singular_name'], 'geodirectory');

-					}

-				}

-				$post_types = $options;

+                $options = array();

+                if (!empty($post_types)) {

+                    foreach ($post_types as $key => $info) {

+                        $options[$key] = __($info['labels']['singular_name'], 'geodirectory');

+                    }

+                }

+                $post_types = $options;

                 break;

             default:

                 $post_types = array_keys($post_types);

@@ -1064,7 +1064,7 @@ 
         if (is_array($post_cat_array)) {

             $post_cat_array = array_unique( $post_cat_array );

 

-			foreach ($post_cat_array as $post_cat_html) {

+            foreach ($post_cat_array as $post_cat_html) {

 

                 $post_cat_info = explode(":", $post_cat_html);

                 $post_maincat_str = $post_cat_info[0];

@@ -1429,21 +1429,21 @@ 
             }

         }

 

-		// Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.

+        // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.

         $site_url = trailingslashit(get_bloginfo('url'));

 

-		$fix_url = strpos($post_link, $site_url) === 0 ? true : false;

-		if ($fix_url) {

-			$post_link = str_replace($site_url, '', $post_link);

-		}

+        $fix_url = strpos($post_link, $site_url) === 0 ? true : false;

+        if ($fix_url) {

+            $post_link = str_replace($site_url, '', $post_link);

+        }

 		

         $post_link = trailingslashit(

             preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

         );

 

-		if ($fix_url) {

-			$post_link = $site_url . $post_link;

-		}

+        if ($fix_url) {

+            $post_link = $site_url . $post_link;

+        }

 

         if (isset($comment_post_cache[$post->ID])) {

             $post = $comment_post_cache[$post->ID];

@@ -1531,23 +1531,23 @@ 
 

                 if (!empty($post_location)) {

                     $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : '';

-					$region_slug = isset($post_location->region_slug) ? $post_location->region_slug : '';

-					$city_slug = isset($post_location->city_slug) ? $post_location->city_slug : '';

+                    $region_slug = isset($post_location->region_slug) ? $post_location->region_slug : '';

+                    $city_slug = isset($post_location->city_slug) ? $post_location->city_slug : '';

 					

-					$geodir_show_location_url = get_option('geodir_show_location_url');

+                    $geodir_show_location_url = get_option('geodir_show_location_url');

 					

-					$location_slug = array();

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

-						$location_slug[] = $country_slug;

-						$location_slug[] = $region_slug;

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

-						$location_slug[] = $country_slug;

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

-						$location_slug[] = $region_slug;

-					}

-					$location_slug[] = $city_slug;

+                    $location_slug = array();

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

+                        $location_slug[] = $country_slug;

+                        $location_slug[] = $region_slug;

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

+                        $location_slug[] = $country_slug;

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

+                        $location_slug[] = $region_slug;

+                    }

+                    $location_slug[] = $city_slug;

 					

-					$location_request .= implode('/', $location_slug) . '/';

+                    $location_request .= implode('/', $location_slug) . '/';

                 }

             }

 

@@ -1655,19 +1655,19 @@ 
         if ($include_location) {

             global $post;

 			

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

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

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

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

             

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

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

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

                     'gd_city' => $post->city_slug

                 );

 				

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

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

-				}

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

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

+                }

             } else {

                 $location_terms = geodir_get_current_location_terms('query_vars');

             }

@@ -1703,7 +1703,7 @@ 
         if(function_exists('icl_object_id')){

             $post_types = get_option('geodir_post_types');

             $post_type = str_replace("category","",$taxonomy);

-			$post_type = str_replace("_tags","",$post_type);

+            $post_type = str_replace("_tags","",$post_type);

             $slug = $post_types[$post_type]['rewrite']['slug'];

             if ( gd_wpml_slug_translation_turned_on( $post_type )) {

 

@@ -1751,13 +1751,13 @@ 
  * @return string The modified link.

  */

 function geodir_posttype_link($link, $post_type) {

-	global $geodir_add_location_url, $post, $gd_session;

+    global $geodir_add_location_url, $post, $gd_session;

 	

-	$location_terms = array();

+    $location_terms = array();

 	

-	if (in_array($post_type, geodir_get_posttypes())) {

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

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

+    if (in_array($post_type, geodir_get_posttypes())) {

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

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

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

@@ -1767,22 +1767,22 @@ 
                 $location_terms = geodir_get_current_location_terms('query_vars');

             }

 			

-			$location_terms = geodir_remove_location_terms($location_terms);

+            $location_terms = geodir_remove_location_terms($location_terms);

 			

-			if (!empty($location_terms)) {

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

-					$location_terms = implode("/", $location_terms);

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

+            if (!empty($location_terms)) {

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

+                    $location_terms = implode("/", $location_terms);

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

 					

-					$link .= urldecode($location_terms) . '/';

-				} else {

-					$link = geodir_getlink($link, $location_terms);

-				}

-			}

-		}

-	}

+                    $link .= urldecode($location_terms) . '/';

+                } else {

+                    $link = geodir_getlink($link, $location_terms);

+                }

+            }

+        }

+    }

 	

-	return $link;

+    return $link;

 }

 

 /**