Inspection of "Update Font Awesome to v5 JS version - CHANGED" - GeoDirectory/geodirectory - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — master ( 7a266a...e0908c )

by Stiofan

created 2018-11-03 17:18 UTC

Status

Indentation +275 added lines, -275 removed lines patch added patch discarded remove patch

@@ -44,57 +44,57 @@  discard block
 block discarded – undo
 
         <?php if (have_posts()) :
 
-            /**
-             * Called inside the `ul` of the listings template, but before any `li` elements.
-             *
-             * When used by the widget view template then it will only show if there are listings to be shown.
-             *
-             * @since 1.0.0
-             * @see 'geodir_after_listing_post_listview'
-             */
-            do_action('geodir_before_listing_post_listview');
-
-            while (have_posts()) : the_post();
-                global $post, $wpdb, $preview;
-
-                /**
-                 * Add a class to the `li` element of the listings list template.
-                 *
-                 * @since 1.0.0
-                 * @param string $class The extra class for the `li` element, default empty.
-                 */
-                $post_view_class = apply_filters('geodir_post_view_extra_class', '');
-
-                /**
-                 * Add a class to the `article` tag inside the `li` element on the listings list template.
-                 *
-                 * @since 1.0.0
-                 * @param string $class The extra class for the `article` element, default empty.
-                 */
-                $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
-                ?>
+			/**
+			 * Called inside the `ul` of the listings template, but before any `li` elements.
+			 *
+			 * When used by the widget view template then it will only show if there are listings to be shown.
+			 *
+			 * @since 1.0.0
+			 * @see 'geodir_after_listing_post_listview'
+			 */
+			do_action('geodir_before_listing_post_listview');
+
+			while (have_posts()) : the_post();
+				global $post, $wpdb, $preview;
+
+				/**
+				 * Add a class to the `li` element of the listings list template.
+				 *
+				 * @since 1.0.0
+				 * @param string $class The extra class for the `li` element, default empty.
+				 */
+				$post_view_class = apply_filters('geodir_post_view_extra_class', '');
+
+				/**
+				 * Add a class to the `article` tag inside the `li` element on the listings list template.
+				 *
+				 * @since 1.0.0
+				 * @param string $class The extra class for the `article` element, default empty.
+				 */
+				$post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
+				?>
 
                 <li class="clearfix <?php if ($grid_view_class) {
-                    echo 'geodir-gridview ' . $grid_view_class;
-                } else {
-                    echo ' geodir-listview ';
-                } ?> <?php if ($post_view_class) {
-                    echo $post_view_class;
-                } ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing
-
-                echo " data-post-id='$post->ID' ";
-                /**
-                 * Called inside the `<li>` tag for listing outputs.
-                 *
-                 * @since 1.5.9
-                 * @param object $post The post object.
-                 * @param string $string If called on the listing or widget template.
-                 */
-                do_action('geodir_listview_inside_li', $post, 'listing');
-                ?> >
+					echo 'geodir-gridview ' . $grid_view_class;
+				} else {
+					echo ' geodir-listview ';
+				} ?> <?php if ($post_view_class) {
+					echo $post_view_class;
+				} ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing
+
+				echo " data-post-id='$post->ID' ";
+				/**
+				 * Called inside the `<li>` tag for listing outputs.
+				 *
+				 * @since 1.5.9
+				 * @param object $post The post object.
+				 * @param string $string If called on the listing or widget template.
+				 */
+				do_action('geodir_listview_inside_li', $post, 'listing');
+				?> >
                     <article class="geodir-category-listing <?php if ($post_view_article_class) {
-                        echo $post_view_article_class;
-                    } ?>">
+						echo $post_view_article_class;
+					} ?>">
                         <div class="geodir-post-img <?php echo apply_filters('geodir_listing_listview_thumb_extra_class', '', 'listing'); ?>">
                             <?php if ($fimage = geodir_show_featured_image($post->ID, 'list-thumb', true, false, $post->featured_image)) { ?>
 
@@ -102,37 +102,37 @@  discard block
 block discarded – undo
                                     <?php echo $fimage; ?>
                                 </a>
                                 <?php
-                                /**
-                                 * Called before badges are output.
-                                 *
-                                 * Called on the listings template after the image has been output and before the badges like `new` or `featured` are output.
-                                 *
-                                 * @since 1.0.0
-                                 * @param object $post The post object.
-                                 * @see 'geodir_after_badge_on_image'
-                                 */
-                                do_action('geodir_before_badge_on_image', $post);
-                                if (isset($post->is_featured) && $post->is_featured) {
-                                    echo geodir_show_badges_on_image('featured', $post, get_permalink());
-                                }
-
-                                $geodir_days_new = (int)get_option('geodir_listing_new_days');
-
-                                if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {
-                                    echo geodir_show_badges_on_image('new', $post, get_permalink());
-                                }
-
-                                /**
-                                 * Called after badges are output.
-                                 *
-                                 * Called on the listings template after the image and badges like `new` or `featured` have been output.
-                                 *
-                                 * @since 1.0.0
-                                 * @param object $post The post object.
-                                 * @see 'geodir_before_badge_on_image'
-                                 */
-                                do_action('geodir_after_badge_on_image', $post);
-                                ?>
+								/**
+								 * Called before badges are output.
+								 *
+								 * Called on the listings template after the image has been output and before the badges like `new` or `featured` are output.
+								 *
+								 * @since 1.0.0
+								 * @param object $post The post object.
+								 * @see 'geodir_after_badge_on_image'
+								 */
+								do_action('geodir_before_badge_on_image', $post);
+								if (isset($post->is_featured) && $post->is_featured) {
+									echo geodir_show_badges_on_image('featured', $post, get_permalink());
+								}
+
+								$geodir_days_new = (int)get_option('geodir_listing_new_days');
+
+								if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {
+									echo geodir_show_badges_on_image('new', $post, get_permalink());
+								}
+
+								/**
+								 * Called after badges are output.
+								 *
+								 * Called on the listings template after the image and badges like `new` or `featured` have been output.
+								 *
+								 * @since 1.0.0
+								 * @param object $post The post object.
+								 * @see 'geodir_before_badge_on_image'
+								 */
+								do_action('geodir_after_badge_on_image', $post);
+								?>
 
 
                             <?php } ?>
@@ -142,15 +142,15 @@  discard block
 block discarded – undo
                         <div class="geodir-content <?php echo apply_filters('geodir_listing_listview_content_extra_class', '', 'listing'); ?>">
 
                             <?php
-                            /**
-                             * Called before the post title on the listings view template.
-                             *
-                             * @since 1.0.0
-                             * @param string $type The template type, default 'listview'.
-                             * @param object $post The post object.
-                             * @see 'geodir_after_listing_post_title'
-                             */
-                            do_action('geodir_before_listing_post_title', 'listview', $post); ?>
+							/**
+							 * Called before the post title on the listings view template.
+							 *
+							 * @since 1.0.0
+							 * @param string $type The template type, default 'listview'.
+							 * @param object $post The post object.
+							 * @see 'geodir_after_listing_post_title'
+							 */
+							do_action('geodir_before_listing_post_title', 'listview', $post); ?>
 
                             <header class="geodir-entry-header"><h2 class="geodir-entry-title">
                                     <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
@@ -162,225 +162,225 @@  discard block
 block discarded – undo
                             <!-- .entry-header -->
 
                             <?php
-                            /**
-                             * Called after the post title on the listings view template.
-                             *
-                             * @since 1.0.0
-                             * @param string $type The template type, default 'listview'.
-                             * @param object $post The post object.
-                             * @see 'geodir_before_listing_post_title'
-                             */
-                            do_action('geodir_after_listing_post_title', 'listview', $post); ?>
+							/**
+							 * Called after the post title on the listings view template.
+							 *
+							 * @since 1.0.0
+							 * @param string $type The template type, default 'listview'.
+							 * @param object $post The post object.
+							 * @see 'geodir_before_listing_post_title'
+							 */
+							do_action('geodir_after_listing_post_title', 'listview', $post); ?>
 
                             <?php /// Print Distance
-                            if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) || ( $related_nearest && $related_parent_lat ) ) {
-                                if ( $related_nearest && $related_parent_lat ) {
-                                    $startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);
-                                } else {
-                                    $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
-                                }
-
-                                $endLat = $post->post_latitude;
-                                $endLon = $post->post_longitude;
-                                $endPoint = array('latitude' => $endLat, 'longitude' => $endLon);
-                                $uom = get_option('geodir_search_dist_1');
-                                $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom); ?>
+							if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) || ( $related_nearest && $related_parent_lat ) ) {
+								if ( $related_nearest && $related_parent_lat ) {
+									$startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);
+								} else {
+									$startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
+								}
+
+								$endLat = $post->post_latitude;
+								$endLon = $post->post_longitude;
+								$endPoint = array('latitude' => $endLat, 'longitude' => $endLon);
+								$uom = get_option('geodir_search_dist_1');
+								$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom); ?>
                                 <h3>
                                     <?php
 
-                                    if (round($distance, 2) == 0) {
-                                        $uom = get_option('geodir_search_dist_2');
-
-                                        $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
-                                        if ($uom == 'feet') {
-                                            $uom = __('feet', 'geodirectory');
-                                        } else {
-                                            $uom = __('meters', 'geodirectory');
-                                        }
-                                        echo round($distance) . ' ' . $uom . '<br />';
-                                    } else {
-                                        if ($uom == 'miles') {
-                                            $uom = __('miles', 'geodirectory');
-                                        } else {
-                                            $uom = __('km', 'geodirectory');
-                                        }
-                                        echo round($distance, 2) . ' ' . $uom . '<br />';
-                                    }
-                                    ?>
+									if (round($distance, 2) == 0) {
+										$uom = get_option('geodir_search_dist_2');
+
+										$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
+										if ($uom == 'feet') {
+											$uom = __('feet', 'geodirectory');
+										} else {
+											$uom = __('meters', 'geodirectory');
+										}
+										echo round($distance) . ' ' . $uom . '<br />';
+									} else {
+										if ($uom == 'miles') {
+											$uom = __('miles', 'geodirectory');
+										} else {
+											$uom = __('km', 'geodirectory');
+										}
+										echo round($distance, 2) . ' ' . $uom . '<br />';
+									}
+									?>
                                 </h3>
                             <?php } ?>
 
 
                             <?php
-                            /**
-                             * Called before the post excerpt on the listings view template.
-                             *
-                             * @since 1.0.0
-                             * @param object $post The post object.
-                             * @see 'geodir_after_listing_post_excerpt'
-                             */
-                            do_action('geodir_before_listing_post_excerpt', $post); ?>
+							/**
+							 * Called before the post excerpt on the listings view template.
+							 *
+							 * @since 1.0.0
+							 * @param object $post The post object.
+							 * @see 'geodir_after_listing_post_excerpt'
+							 */
+							do_action('geodir_before_listing_post_excerpt', $post); ?>
                             <?php echo geodir_show_listing_info('listing'); ?>
                             <div class="geodir-entry-content">
 
                                 <?php
-                                /**
-                                 * Filter to hide the listing excerpt
-                                 *
-                                 * @since 1.5.3
-                                 * @param bool $display Display the excerpt or not. Default true.
-                                 * @param string $view The view type, default 'listview'.
-                                 * @param object $post The post object.
-                                 */
-                                $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'listview', $post);
-                                if ($show_listing_excerpt) {
-                                    if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {
-                                        $content_out = geodir_max_excerpt( $character_count );
-                                    } else {
-                                        $content_out = get_the_excerpt();
-                                    }
-                                    if ( ! empty( $content_out ) ) {
-                                        echo "<p>" . $content_out . "</p>";
-                                    }
-                                }
-                                ?></div>
+								/**
+								 * Filter to hide the listing excerpt
+								 *
+								 * @since 1.5.3
+								 * @param bool $display Display the excerpt or not. Default true.
+								 * @param string $view The view type, default 'listview'.
+								 * @param object $post The post object.
+								 */
+								$show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'listview', $post);
+								if ($show_listing_excerpt) {
+									if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {
+										$content_out = geodir_max_excerpt( $character_count );
+									} else {
+										$content_out = get_the_excerpt();
+									}
+									if ( ! empty( $content_out ) ) {
+										echo "<p>" . $content_out . "</p>";
+									}
+								}
+								?></div>
 
                             <?php
-                            /**
-                             * Called after the post excerpt on the listings view template.
-                             *
-                             * @since 1.0.0
-                             * @param object $post The post object.
-                             * @see 'geodir_before_listing_post_excerpt'
-                             */
-                            do_action('geodir_after_listing_post_excerpt', $post); ?>
+							/**
+							 * Called after the post excerpt on the listings view template.
+							 *
+							 * @since 1.0.0
+							 * @param object $post The post object.
+							 * @see 'geodir_before_listing_post_excerpt'
+							 */
+							do_action('geodir_after_listing_post_excerpt', $post); ?>
                         </div>
                         <!-- gd-content ends here-->
                         <?php
-                        /**
-                         * Called after printing listing content.
-                         *
-                         * @since 1.5.3
-                         * @param object $post The post object.
-                         * @param string $view The view type, default 'listing'.
-                         */
-                        do_action( 'geodir_after_listing_content', $post, 'listing' ); ?>
+						/**
+						 * Called after printing listing content.
+						 *
+						 * @since 1.5.3
+						 * @param object $post The post object.
+						 * @param string $view The view type, default 'listing'.
+						 */
+						do_action( 'geodir_after_listing_content', $post, 'listing' ); ?>
                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'listing'); ?>">
                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'listing'); ?>">
 
                                 <?php
-                                /**
-                                 * Called before printing review stars html.
-                                 *
-                                 * @since 1.5.3
-                                 * @param object $post The post object.
-                                 * @param string $view The view type, default 'listing'.
-                                 */
-                                do_action( 'geodir_before_review_html', $post, 'listing' );
-
-                                $review_show = geodir_is_reviews_show('listview');
-
-                                if ($review_show) {
-
-                                    if (!$preview) {
-                                        $post_avgratings = geodir_get_post_rating($post->ID);
-                                        /**
-                                         * Called before the rating stars are output on the listings view template.
-                                         *
-                                         * @since 1.0.0
-                                         * @param float $post_avgratings The average rating for the post.
-                                         * @param int $post->ID The post ID.
-                                         * @see 'geodir_after_review_rating_stars_on_listview'
-                                         */
-                                        do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);
-
-                                        echo geodir_get_rating_stars($post_avgratings, $post->ID);
-
-                                        /**
-                                         * Called after the rating stars are output on the listings view template.
-                                         *
-                                         * @since 1.0.0
-                                         * @param float $post_avgratings The average rating for the post.
-                                         * @param int $post->ID The post ID.
-                                         * @see 'geodir_before_review_rating_stars_on_listview'
-                                         */
-                                        do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);
-                                    }
-                                    ?>
+								/**
+								 * Called before printing review stars html.
+								 *
+								 * @since 1.5.3
+								 * @param object $post The post object.
+								 * @param string $view The view type, default 'listing'.
+								 */
+								do_action( 'geodir_before_review_html', $post, 'listing' );
+
+								$review_show = geodir_is_reviews_show('listview');
+
+								if ($review_show) {
+
+									if (!$preview) {
+										$post_avgratings = geodir_get_post_rating($post->ID);
+										/**
+										 * Called before the rating stars are output on the listings view template.
+										 *
+										 * @since 1.0.0
+										 * @param float $post_avgratings The average rating for the post.
+										 * @param int $post->ID The post ID.
+										 * @see 'geodir_after_review_rating_stars_on_listview'
+										 */
+										do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);
+
+										echo geodir_get_rating_stars($post_avgratings, $post->ID);
+
+										/**
+										 * Called after the rating stars are output on the listings view template.
+										 *
+										 * @since 1.0.0
+										 * @param float $post_avgratings The average rating for the post.
+										 * @param int $post->ID The post ID.
+										 * @see 'geodir_before_review_rating_stars_on_listview'
+										 */
+										do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);
+									}
+									?>
                                     <a href="<?php comments_link(); ?>" class="geodir-pcomments"><i
                                             class="fas fa-comments"></i>
                                         <?php geodir_comments_number($post->rating_count); ?></a>
                                 <?php
-                                }
+								}
 
 
-                                /**
-                                 * Called after printing favorite html.
-                                 *
-                                 * @since 1.0.0
-                                 */
-                                do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );
+								/**
+								 * Called after printing favorite html.
+								 *
+								 * @since 1.0.0
+								 */
+								do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );
 
 
-                                /**
-                                 * Called after printing map pin point.
-                                 *
-                                 * @since 1.0.0
-                                 * @since 1.5.9 Added $post as second param.
-                                 * @param int $post->ID The post id.
-                                 * @param object $post The post object.
-                                 */
-                                do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);
+								/**
+								 * Called after printing map pin point.
+								 *
+								 * @since 1.0.0
+								 * @since 1.5.9 Added $post as second param.
+								 * @param int $post->ID The post id.
+								 * @param object $post The post object.
+								 */
+								do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);
 
-                                if ($post->post_author == get_current_user_id()) { ?>
+								if ($post->post_author == get_current_user_id()) { ?>
                                     <?php
-                                    $addplacelink = get_permalink(geodir_add_listing_page_id());
-                                    $editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);
-                                    $upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);
+									$addplacelink = get_permalink(geodir_add_listing_page_id());
+									$editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);
+									$upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);
 
-                                    $ajaxlink = geodir_get_ajax_url();
-                                    $deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);
+									$ajaxlink = geodir_get_ajax_url();
+									$deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);
 
-                                    ?>
+									?>
 
                                     <span class="geodir-authorlink clearfix">
 											
 											<?php if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {
-                                                /**
-                                                 * Called before the edit post link on the listings view template used on the author page.
-                                                 *
-                                                 * @since 1.0.0
-                                                 * @see 'geodir_after_edit_post_link_on_listing'
-                                                 */
-                                                do_action('geodir_before_edit_post_link_on_listing');
-                                                ?>
+												/**
+												 * Called before the edit post link on the listings view template used on the author page.
+												 *
+												 * @since 1.0.0
+												 * @see 'geodir_after_edit_post_link_on_listing'
+												 */
+												do_action('geodir_before_edit_post_link_on_listing');
+												?>
 
                                                 <a href="<?php echo esc_url($editlink); ?>" class="geodir-edit"
                                                    title="<?php _e('Edit Listing', 'geodirectory'); ?>">
                                                     <?php
-                                                    $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');
-                                                    echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
-                                                    ?>
+													$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');
+													echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
+													?>
                                                     <?php _e('Edit', 'geodirectory'); ?>
                                                 </a>
                                                 <a href="<?php echo esc_url($deletelink); ?>" class="geodir-delete"
                                                    title="<?php _e('Delete Listing', 'geodirectory'); ?>">
                                                     <?php
-                                                    $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');
-                                                    echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
-                                                    ?>
+													$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');
+													echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
+													?>
                                                     <?php _e('Delete', 'geodirectory'); ?>
                                                 </a>
                                                 <?php
 
-                                                /**
-                                                 * Called after the edit post link on the listings view template used on the author page.
-                                                 *
-                                                 * @since 1.0.0
-                                                 * @see 'geodir_before_edit_post_link_on_listing'
-                                                 */
-                                                do_action('geodir_after_edit_post_link_on_listing');
-                                            } ?>
+												/**
+												 * Called after the edit post link on the listings view template used on the author page.
+												 *
+												 * @since 1.0.0
+												 * @see 'geodir_before_edit_post_link_on_listing'
+												 */
+												do_action('geodir_after_edit_post_link_on_listing');
+											} ?>
 											</span>
 
                                 <?php } ?>
@@ -393,32 +393,32 @@  discard block
 block discarded – undo
                 </li>
 
             <?php
-            endwhile;
-
-            /**
-             * Called inside the `ul` of the listings template, but after all `li` elements.
-             *
-             * When used by the widget view template then it will only show if there are listings to be shown.
-             *
-             * @since 1.0.0
-             * @see 'geodir_before_listing_post_listview'
-             */
-            do_action('geodir_after_listing_post_listview');
-
-        else:
+			endwhile;
+
+			/**
+			 * Called inside the `ul` of the listings template, but after all `li` elements.
+			 *
+			 * When used by the widget view template then it will only show if there are listings to be shown.
+			 *
+			 * @since 1.0.0
+			 * @see 'geodir_before_listing_post_listview'
+			 */
+			do_action('geodir_after_listing_post_listview');
+
+		else:
 			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;
             
 			/**
-             * Called inside the `ul` of the listings template, when no listing found.
-             *
-             * @since 1.5.5
+			 * Called inside the `ul` of the listings template, when no listing found.
+			 *
+			 * @since 1.5.5
 			 * @param string 'listing-listview' Listing listview template.
 			 * @param bool $favorite Are favorite listings results?
-             */
-            do_action('geodir_message_not_found_on_listing', 'listing-listview', $favorite);
-        endif;
+			 */
+			do_action('geodir_message_not_found_on_listing', 'listing-listview', $favorite);
+		endif;
 
-        ?>
+		?>
     </ul>  <!-- geodir_category_list_view ends here-->
 
     <div class="clear"></div>

Please login to merge, or discard this patch.

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -75,7 +75,7 @@  discard block
 block discarded – undo
                 ?>
 
                 <li class="clearfix <?php if ($grid_view_class) {
-                    echo 'geodir-gridview ' . $grid_view_class;
+                    echo 'geodir-gridview '.$grid_view_class;
                 } else {
                     echo ' geodir-listview ';
                 } ?> <?php if ($post_view_class) {
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
                                     echo geodir_show_badges_on_image('featured', $post, get_permalink());
                                 }
 
-                                $geodir_days_new = (int)get_option('geodir_listing_new_days');
+                                $geodir_days_new = (int) get_option('geodir_listing_new_days');
 
                                 if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {
                                     echo geodir_show_badges_on_image('new', $post, get_permalink());
@@ -173,8 +173,8 @@  discard block
 block discarded – undo
                             do_action('geodir_after_listing_post_title', 'listview', $post); ?>
 
                             <?php /// Print Distance
-                            if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) || ( $related_nearest && $related_parent_lat ) ) {
-                                if ( $related_nearest && $related_parent_lat ) {
+                            if ((isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') || ($related_nearest && $related_parent_lat)) {
+                                if ($related_nearest && $related_parent_lat) {
                                     $startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);
                                 } else {
                                     $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
@@ -197,14 +197,14 @@  discard block
 block discarded – undo
                                         } else {
                                             $uom = __('meters', 'geodirectory');
                                         }
-                                        echo round($distance) . ' ' . $uom . '<br />';
+                                        echo round($distance).' '.$uom.'<br />';
                                     } else {
                                         if ($uom == 'miles') {
                                             $uom = __('miles', 'geodirectory');
                                         } else {
                                             $uom = __('km', 'geodirectory');
                                         }
-                                        echo round($distance, 2) . ' ' . $uom . '<br />';
+                                        echo round($distance, 2).' '.$uom.'<br />';
                                     }
                                     ?>
                                 </h3>
@@ -234,13 +234,13 @@  discard block
 block discarded – undo
                                  */
                                 $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'listview', $post);
                                 if ($show_listing_excerpt) {
-                                    if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {
-                                        $content_out = geodir_max_excerpt( $character_count );
+                                    if (isset($character_count) && ($character_count || $character_count == '0')) {
+                                        $content_out = geodir_max_excerpt($character_count);
                                     } else {
                                         $content_out = get_the_excerpt();
                                     }
-                                    if ( ! empty( $content_out ) ) {
-                                        echo "<p>" . $content_out . "</p>";
+                                    if (!empty($content_out)) {
+                                        echo "<p>".$content_out."</p>";
                                     }
                                 }
                                 ?></div>
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
                          * @param object $post The post object.
                          * @param string $view The view type, default 'listing'.
                          */
-                        do_action( 'geodir_after_listing_content', $post, 'listing' ); ?>
+                        do_action('geodir_after_listing_content', $post, 'listing'); ?>
                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'listing'); ?>">
                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'listing'); ?>">
 
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
                                  * @param object $post The post object.
                                  * @param string $view The view type, default 'listing'.
                                  */
-                                do_action( 'geodir_before_review_html', $post, 'listing' );
+                                do_action('geodir_before_review_html', $post, 'listing');
 
                                 $review_show = geodir_is_reviews_show('listview');
 
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
                                  *
                                  * @since 1.0.0
                                  */
-                                do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );
+                                do_action('geodir_after_favorite_html', $post->ID, 'listing');
 
 
                                 /**
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
                                  * @param int $post->ID The post id.
                                  * @param object $post The post object.
                                  */
-                                do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);
+                                do_action('geodir_listing_after_pinpoint', $post->ID, $post);
 
                                 if ($post->post_author == get_current_user_id()) { ?>
                                     <?php
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
                                                    title="<?php _e('Edit Listing', 'geodirectory'); ?>">
                                                     <?php
                                                     $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');
-                                                    echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
+                                                    echo '<i class="'.$geodir_listing_edit_icon.'"></i>';
                                                     ?>
                                                     <?php _e('Edit', 'geodirectory'); ?>
                                                 </a>
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
                                                    title="<?php _e('Delete Listing', 'geodirectory'); ?>">
                                                     <?php
                                                     $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');
-                                                    echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
+                                                    echo '<i class="'.$geodir_listing_delete_icon.'"></i>';
                                                     ?>
                                                     <?php _e('Delete', 'geodirectory'); ?>
                                                 </a>

Please login to merge, or discard this patch.

geodirectory-templates/widget-listing-listview.php 2 patches

Indentation +161 added lines, -161 removed lines patch added patch discarded remove patch

@@ -20,72 +20,72 @@  discard block
 block discarded – undo
 /** This action is documented in geodirectory-templates/listing-listview.php */
 $grid_view_class = apply_filters('geodir_grid_view_widget_columns', $gridview_columns_widget);
 if ($gd_session->get('gd_listing_view') && !isset($before_widget)) {
-    $grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));
+	$grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));
 }
 ?>
     <ul class="geodir_category_list_view clearfix <?php echo apply_filters('geodir_listing_listview_ul_extra_class', '', 'widget'); ?>">
         <?php
-        if (!empty($widget_listings)) {
-            /** This action is documented in geodirectory-templates/listing-listview.php */
-            do_action('geodir_before_listing_post_listview');
-            $all_postypes = geodir_get_posttypes();
-            $geodir_days_new = (int)get_option('geodir_listing_new_days');
-            foreach ($widget_listings as $widget_listing) {
-                global $gd_widget_listing_type;
-                $post = $widget_listing;
+		if (!empty($widget_listings)) {
+			/** This action is documented in geodirectory-templates/listing-listview.php */
+			do_action('geodir_before_listing_post_listview');
+			$all_postypes = geodir_get_posttypes();
+			$geodir_days_new = (int)get_option('geodir_listing_new_days');
+			foreach ($widget_listings as $widget_listing) {
+				global $gd_widget_listing_type;
+				$post = $widget_listing;
 
-                $GLOBALS['post'] = $post;
-                setup_postdata($post);
+				$GLOBALS['post'] = $post;
+				setup_postdata($post);
 
-                $gd_widget_listing_type = $post->post_type;
+				$gd_widget_listing_type = $post->post_type;
 
-                /** This action is documented in geodirectory-templates/listing-listview.php */
-                $post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);
+				/** This action is documented in geodirectory-templates/listing-listview.php */
+				$post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);
 
-                /** This action is documented in geodirectory-templates/listing-listview.php */
-                $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
-                ?>
+				/** This action is documented in geodirectory-templates/listing-listview.php */
+				$post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
+				?>
                 <li class="clearfix <?php if ($grid_view_class) {
-                    echo 'geodir-gridview ' . $grid_view_class;
-                } else {
-                    echo ' geodir-listview ';
-                } ?> <?php if ($post_view_class) {
-                    echo $post_view_class;
-                } ?>" <?php if (isset($listing_width) && $listing_width) {
-                    echo "style='width:{$listing_width}%;'";
-                }
+					echo 'geodir-gridview ' . $grid_view_class;
+				} else {
+					echo ' geodir-listview ';
+				} ?> <?php if ($post_view_class) {
+					echo $post_view_class;
+				} ?>" <?php if (isset($listing_width) && $listing_width) {
+					echo "style='width:{$listing_width}%;'";
+				}
 
-                echo " data-post-id='$post->ID' ";
-                /** This action is documented in geodirectory-templates/listing-listview.php */
-                do_action('geodir_listview_inside_li', $post, 'widget');
-                ?>>
+				echo " data-post-id='$post->ID' ";
+				/** This action is documented in geodirectory-templates/listing-listview.php */
+				do_action('geodir_listview_inside_li', $post, 'widget');
+				?>>
                     <article class="geodir-category-listing <?php if ($post_view_article_class) {
-                        echo $post_view_article_class;
-                    } ?>">
+						echo $post_view_article_class;
+					} ?>">
                         <div class="geodir-post-img <?php echo apply_filters('geodir_listing_listview_thumb_extra_class', '', 'widget'); ?>">
                             <?php if ($fimage = geodir_show_featured_image($post->ID, 'list-thumb', true, false, $post->featured_image)) { ?>
                                 <a href="<?php the_permalink(); ?>"><?php echo $fimage; ?></a>
                                 <?php
-                                /** This action is documented in geodirectory-templates/listing-listview.php */
-                                do_action('geodir_before_badge_on_image', $post);
-                                if ($post->is_featured) {
-                                    echo geodir_show_badges_on_image('featured', $post, get_permalink());
-                                }
+								/** This action is documented in geodirectory-templates/listing-listview.php */
+								do_action('geodir_before_badge_on_image', $post);
+								if ($post->is_featured) {
+									echo geodir_show_badges_on_image('featured', $post, get_permalink());
+								}
 
 
-                                if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {
-                                    echo geodir_show_badges_on_image('new', $post, get_permalink());
-                                }
+								if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {
+									echo geodir_show_badges_on_image('new', $post, get_permalink());
+								}
 
-                                /** This action is documented in geodirectory-templates/listing-listview.php */
-                                do_action('geodir_after_badge_on_image', $post);
-                            }
-                            ?>
+								/** This action is documented in geodirectory-templates/listing-listview.php */
+								do_action('geodir_after_badge_on_image', $post);
+							}
+							?>
                         </div>
                         <div class="geodir-content <?php echo apply_filters('geodir_listing_listview_content_extra_class', '', 'widget'); ?>">
                             <?php
-                            /** This action is documented in geodirectory-templates/listing-listview.php */
-                            do_action('geodir_before_listing_post_title', 'listview', $post); ?>
+							/** This action is documented in geodirectory-templates/listing-listview.php */
+							do_action('geodir_before_listing_post_title', 'listview', $post); ?>
                             <header class="geodir-entry-header">
                                 <?php  $title_tag = !empty($title_tag) ? $title_tag : 'h3'; ?>
                                 <<?php echo esc_attr($title_tag); ?> class="geodir-entry-title">
@@ -95,162 +95,162 @@  discard block
 block discarded – undo
                             </header>
                             <!-- .entry-header -->
                             <?php
-                            /** This action is documented in geodirectory-templates/listing-listview.php */
-                            do_action('geodir_after_listing_post_title', 'listview', $post); ?>
+							/** This action is documented in geodirectory-templates/listing-listview.php */
+							do_action('geodir_after_listing_post_title', 'listview', $post); ?>
                             <?php /// Print Distance
-                            if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) || ( $related_nearest && $related_parent_lat ) ) {
-                                if ( $related_nearest && $related_parent_lat ) {
-                                    $startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);
-                                } else {
-                                    $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
-                                }
+							if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) || ( $related_nearest && $related_parent_lat ) ) {
+								if ( $related_nearest && $related_parent_lat ) {
+									$startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);
+								} else {
+									$startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
+								}
 
-                                $endLat = $post->post_latitude;
-                                $endLon = $post->post_longitude;
-                                $endPoint = array('latitude' => $endLat, 'longitude' => $endLon);
-                                $uom = get_option('geodir_search_dist_1');
-                                $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
-                                ?>
+								$endLat = $post->post_latitude;
+								$endLon = $post->post_longitude;
+								$endPoint = array('latitude' => $endLat, 'longitude' => $endLon);
+								$uom = get_option('geodir_search_dist_1');
+								$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
+								?>
                                 <h3>
                                     <?php
-                                    if (round($distance, 2) == 0) {
-                                        $uom = get_option('geodir_search_dist_2');
-                                        $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
-                                        if ($uom == 'feet') {
-                                            $uom = __('feet', 'geodirectory');
-                                        } else {
-                                            $uom = __('meters', 'geodirectory');
-                                        }
-                                        echo round($distance) . ' ' . __($uom, 'geodirectory') . '
+									if (round($distance, 2) == 0) {
+										$uom = get_option('geodir_search_dist_2');
+										$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
+										if ($uom == 'feet') {
+											$uom = __('feet', 'geodirectory');
+										} else {
+											$uom = __('meters', 'geodirectory');
+										}
+										echo round($distance) . ' ' . __($uom, 'geodirectory') . '
 			<br />
 			';
-                                    } else {
-                                        if ($uom == 'miles') {
-                                            $uom = __('miles', 'geodirectory');
-                                        } else {
-                                            $uom = __('km', 'geodirectory');
-                                        }
-                                        echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
+									} else {
+										if ($uom == 'miles') {
+											$uom = __('miles', 'geodirectory');
+										} else {
+											$uom = __('km', 'geodirectory');
+										}
+										echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
 			<br />
 			';
-                                    }
-                                    ?>
+									}
+									?>
                                 </h3>
                             <?php } ?>
                             <?php
-                            /** This action is documented in geodirectory-templates/listing-listview.php */
-                            do_action('geodir_before_listing_post_excerpt', $post); ?>
+							/** This action is documented in geodirectory-templates/listing-listview.php */
+							do_action('geodir_before_listing_post_excerpt', $post); ?>
                             <?php echo geodir_show_listing_info('listing'); ?>
                             <?php if (isset($character_count) && $character_count == '0') {
-                            } else { ?>
+							} else { ?>
                                 <div class="geodir-entry-content">
                                     <?php
-                                    /**
-                                     * Filter to hide the listing excerpt
-                                     *
-                                     * @since 1.5.3
-                                     * @param bool $display Display the excerpt or not. Default true.
-                                     * @param object $post The post object.
-                                     */
-                                    $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);
-                                    if ($show_listing_excerpt) {
-                                        if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {
-                                            $content_out = geodir_max_excerpt( $character_count );
-                                        } else {
-                                            $content_out = get_the_excerpt();
-                                        }
-                                        if ( ! empty( $content_out ) ) {
-                                            echo "<p>" . $content_out . "</p>";
-                                        }
-                                    }
-                                    ?>
+									/**
+									 * Filter to hide the listing excerpt
+									 *
+									 * @since 1.5.3
+									 * @param bool $display Display the excerpt or not. Default true.
+									 * @param object $post The post object.
+									 */
+									$show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);
+									if ($show_listing_excerpt) {
+										if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {
+											$content_out = geodir_max_excerpt( $character_count );
+										} else {
+											$content_out = get_the_excerpt();
+										}
+										if ( ! empty( $content_out ) ) {
+											echo "<p>" . $content_out . "</p>";
+										}
+									}
+									?>
                                 </div>
                             <?php } ?>
                             <?php
-                            /** This action is documented in geodirectory-templates/listing-listview.php */
-                            do_action('geodir_after_listing_post_excerpt', $post); ?>
+							/** This action is documented in geodirectory-templates/listing-listview.php */
+							do_action('geodir_after_listing_post_excerpt', $post); ?>
                         </div>
                         <!-- gd-content ends here-->
                         <?php
-                        /**
-                         * Called after printing listing content.
-                         *
-                         * @since 1.5.3
-                         * @param object $post The post object.
-                         * @param string $view The view type, default 'widget'.
-                         */
-                        do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
+						/**
+						 * Called after printing listing content.
+						 *
+						 * @since 1.5.3
+						 * @param object $post The post object.
+						 * @param string $view The view type, default 'widget'.
+						 */
+						do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">
                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">
                                 <?php
-                                /**
-                                 * Called before printing review stars html.
-                                 *
-                                 * @since 1.5.3
-                                 * @param object $post The post object.
-                                 * @param string $view The view type, default 'widget'.
-                                 */
-                                do_action( 'geodir_before_review_html', $post, 'widget' );
-                                $review_show = geodir_is_reviews_show('listview');
-                                if ($review_show) {
+								/**
+								 * Called before printing review stars html.
+								 *
+								 * @since 1.5.3
+								 * @param object $post The post object.
+								 * @param string $view The view type, default 'widget'.
+								 */
+								do_action( 'geodir_before_review_html', $post, 'widget' );
+								$review_show = geodir_is_reviews_show('listview');
+								if ($review_show) {
 
-                                    $post_avgratings = geodir_get_post_rating($post->ID);
+									$post_avgratings = geodir_get_post_rating($post->ID);
 
-                                    /** This action is documented in geodirectory-templates/listing-listview.php */
-                                    do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);
+									/** This action is documented in geodirectory-templates/listing-listview.php */
+									do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);
 
-                                    echo geodir_get_rating_stars($post_avgratings, $post->ID);
+									echo geodir_get_rating_stars($post_avgratings, $post->ID);
 
-                                    /** This action is documented in geodirectory-templates/listing-listview.php */
-                                    do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);
-                                    ?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i
+									/** This action is documented in geodirectory-templates/listing-listview.php */
+									do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);
+									?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i
                                         class="fas fa-comments"></i> <?php geodir_comments_number($post->rating_count); ?>
                                     </a>
                                 <?php
-                                }
+								}
 
 
-                                /**
-                                 * Called after printing favorite html.
-                                 *
-                                 * @since 1.0.0
-                                 */
-                                do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );
+								/**
+								 * Called after printing favorite html.
+								 *
+								 * @since 1.0.0
+								 */
+								do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );
 
-                                if ($post->post_author == get_current_user_id()) {
-                                    $addplacelink = get_permalink(geodir_add_listing_page_id());
-                                    $editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);
-                                    $upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);
+								if ($post->post_author == get_current_user_id()) {
+									$addplacelink = get_permalink(geodir_add_listing_page_id());
+									$editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);
+									$upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);
 
-                                    $ajaxlink = geodir_get_ajax_url();
-                                    $deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);
-                                    ?>
+									$ajaxlink = geodir_get_ajax_url();
+									$deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);
+									?>
                                     <span class="geodir-authorlink clearfix">
                                 <?php
-                if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {
-                    /** This action is documented in geodirectory-templates/listing-listview.php */
-                    do_action('geodir_before_edit_post_link_on_listing');
-                    ?>
+				if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {
+					/** This action is documented in geodirectory-templates/listing-listview.php */
+					do_action('geodir_before_edit_post_link_on_listing');
+					?>
                     <a href="<?php echo esc_url($editlink); ?>" class="geodir-edit"
                        title="<?php _e('Edit Listing', 'geodirectory'); ?>">
                         <?php
-                        $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');
-                        echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
-                        ?>
+						$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');
+						echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
+						?>
                         <?php _e('Edit', 'geodirectory'); ?>
                     </a>
                     <a href="<?php echo esc_url($deletelink); ?>" class="geodir-delete"
                        title="<?php _e('Delete Listing', 'geodirectory'); ?>">
                         <?php
-                        $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');
-                        echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
-                        ?>
+						$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');
+						echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
+						?>
                         <?php _e('Delete', 'geodirectory'); ?>
                     </a>
                     <?php
-                    /** This action is documented in geodirectory-templates/listing-listview.php */
-                    do_action('geodir_after_edit_post_link_on_listing');
-                } ?>
+					/** This action is documented in geodirectory-templates/listing-listview.php */
+					do_action('geodir_after_edit_post_link_on_listing');
+				} ?>
 					</span>
                                 <?php } ?>
                             </div>
@@ -260,17 +260,17 @@  discard block
 block discarded – undo
                     </article>
                 </li>
                 <?php
-                unset($gd_widget_listing_type);
-            }
-            /** This action is documented in geodirectory-templates/listing-listview.php */
-            do_action('geodir_after_listing_post_listview');
-        } else {
+				unset($gd_widget_listing_type);
+			}
+			/** This action is documented in geodirectory-templates/listing-listview.php */
+			do_action('geodir_after_listing_post_listview');
+		} else {
 			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;
             
 			/** This action is documented in geodirectory-templates/listing-listview.php */
-            do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);
-        }
-        ?>
+			do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);
+		}
+		?>
     </ul>  <!-- geodir_category_list_view ends here-->
     <div class="clear"></div>
 <?php

Please login to merge, or discard this patch.

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -29,7 +29,7 @@  discard block
 block discarded – undo
             /** This action is documented in geodirectory-templates/listing-listview.php */
             do_action('geodir_before_listing_post_listview');
             $all_postypes = geodir_get_posttypes();
-            $geodir_days_new = (int)get_option('geodir_listing_new_days');
+            $geodir_days_new = (int) get_option('geodir_listing_new_days');
             foreach ($widget_listings as $widget_listing) {
                 global $gd_widget_listing_type;
                 $post = $widget_listing;
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
                 $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
                 ?>
                 <li class="clearfix <?php if ($grid_view_class) {
-                    echo 'geodir-gridview ' . $grid_view_class;
+                    echo 'geodir-gridview '.$grid_view_class;
                 } else {
                     echo ' geodir-listview ';
                 } ?> <?php if ($post_view_class) {
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
                             /** This action is documented in geodirectory-templates/listing-listview.php */
                             do_action('geodir_after_listing_post_title', 'listview', $post); ?>
                             <?php /// Print Distance
-                            if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) || ( $related_nearest && $related_parent_lat ) ) {
-                                if ( $related_nearest && $related_parent_lat ) {
+                            if ((isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') || ($related_nearest && $related_parent_lat)) {
+                                if ($related_nearest && $related_parent_lat) {
                                     $startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);
                                 } else {
                                     $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
                                         } else {
                                             $uom = __('meters', 'geodirectory');
                                         }
-                                        echo round($distance) . ' ' . __($uom, 'geodirectory') . '
+                                        echo round($distance).' '.__($uom, 'geodirectory').'
 			<br />
 			';
                                     } else {
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
                                         } else {
                                             $uom = __('km', 'geodirectory');
                                         }
-                                        echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
+                                        echo round($distance, 2).' '.__($uom, 'geodirectory').'
 			<br />
 			';
                                     }
@@ -154,13 +154,13 @@  discard block
 block discarded – undo
                                      */
                                     $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);
                                     if ($show_listing_excerpt) {
-                                        if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {
-                                            $content_out = geodir_max_excerpt( $character_count );
+                                        if (isset($character_count) && ($character_count || $character_count == '0')) {
+                                            $content_out = geodir_max_excerpt($character_count);
                                         } else {
                                             $content_out = get_the_excerpt();
                                         }
-                                        if ( ! empty( $content_out ) ) {
-                                            echo "<p>" . $content_out . "</p>";
+                                        if (!empty($content_out)) {
+                                            echo "<p>".$content_out."</p>";
                                         }
                                     }
                                     ?>
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
                          * @param object $post The post object.
                          * @param string $view The view type, default 'widget'.
                          */
-                        do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
+                        do_action('geodir_after_listing_content', $post, 'widget'); ?>
                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">
                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">
                                 <?php
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
                                  * @param object $post The post object.
                                  * @param string $view The view type, default 'widget'.
                                  */
-                                do_action( 'geodir_before_review_html', $post, 'widget' );
+                                do_action('geodir_before_review_html', $post, 'widget');
                                 $review_show = geodir_is_reviews_show('listview');
                                 if ($review_show) {
 
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
                                  *
                                  * @since 1.0.0
                                  */
-                                do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );
+                                do_action('geodir_after_favorite_html', $post->ID, 'widget');
 
                                 if ($post->post_author == get_current_user_id()) {
                                     $addplacelink = get_permalink(geodir_add_listing_page_id());
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
                        title="<?php _e('Edit Listing', 'geodirectory'); ?>">
                         <?php
                         $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');
-                        echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
+                        echo '<i class="'.$geodir_listing_edit_icon.'"></i>';
                         ?>
                         <?php _e('Edit', 'geodirectory'); ?>
                     </a>
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
                        title="<?php _e('Delete Listing', 'geodirectory'); ?>">
                         <?php
                         $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');
-                        echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
+                        echo '<i class="'.$geodir_listing_delete_icon.'"></i>';
                         ?>
                         <?php _e('Delete', 'geodirectory'); ?>
                     </a>

Please login to merge, or discard this patch.

geodirectory-widgets/geodirectory_bestof_widget.php 1 patch

Indentation +519 added lines, -519 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

geodirectory-functions/custom_fields_predefined.php 2 patches

Indentation +404 added lines, -404 removed lines patch added patch discarded remove patch

@@ -17,370 +17,370 @@  discard block
 block discarded – undo
  */
 function geodir_custom_fields_predefined($post_type=''){
 
-    $custom_fields = array();
-
-
-    // price
-    $custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-price',
-        'icon'        =>  'fas fa-dollar-sign',
-        'name'        =>  __('Price', 'geodirectory'),
-        'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'FLOAT',
-            'decimal_point'       =>  '2',
-            'admin_title'         =>  'Price',
-            'site_title'          =>  'Price',
-            'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
-            'htmlvar_name'        =>  'price',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	      =>  '[detail],[listing]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '\d+(\.\d{2})?',
-            'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fas fa-dollar-sign',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true,
-            'extra_fields'        =>  array(
-                'is_price'                  =>  1,
-                'thousand_separator'        =>  'comma',
-                'decimal_separator'         =>  'period',
-                'decimal_display'           =>  'if',
-                'currency_symbol'           =>  '$',
-                'currency_symbol_placement' =>  'left'
-            )
-        )
-    );
-
-    // property status
-    $custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-status',
-        'icon'        =>  'fas fa-home',
-        'name'        =>  __('Property Status', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Status',
-            'site_title'          =>  'Property Status',
-            'admin_desc'          =>  'Enter the status of the property.',
-            'htmlvar_name'        =>  'property_status',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fas fa-home',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property furnishing
-    $custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-furnishing',
-        'icon'        =>  'fas fa-home',
-        'name'        =>  __('Property Furnishing', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Furnishing',
-            'site_title'          =>  'Furnishing',
-            'admin_desc'          =>  'Enter the furnishing status of the property.',
-            'htmlvar_name'        =>  'property_furnishing',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fas fa-th-large',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property type
-    $custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-type',
-        'icon'        =>  'fas fa-home',
-        'name'        =>  __('Property Type', 'geodirectory'),
-        'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Type',
-            'site_title'          =>  'Property Type',
-            'admin_desc'          =>  'Select the property type.',
-            'htmlvar_name'        =>  'property_type',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fas fa-home',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property bedrooms
-    $custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-bedrooms',
-        'icon'        =>  'fas fa-home',
-        'name'        =>  __('Property Bedrooms', 'geodirectory'),
-        'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Bedrooms',
-            'site_title'          =>  'Bedrooms',
-            'admin_desc'          =>  'Select the number of bedrooms',
-            'htmlvar_name'        =>  'property_bedrooms',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fas fa-bed',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property bathrooms
-    $custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-bathrooms',
-        'icon'        =>  'fas fa-home',
-        'name'        =>  __('Property Bathrooms', 'geodirectory'),
-        'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Bathrooms',
-            'site_title'          =>  'Bathrooms',
-            'admin_desc'          =>  'Select the number of bathrooms',
-            'htmlvar_name'        =>  'property_bathrooms',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fas fa-bold',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property area
-    $custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-area',
-        'icon'        =>  'fas fa-home',
-        'name'        =>  __('Property Area', 'geodirectory'),
-        'description' =>  __('Adds a input for the property area.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'FLOAT',
-            'admin_title'         =>  'Property Area',
-            'site_title'          =>  'Area (Sq Ft)',
-            'admin_desc'          =>  'Enter the Sq Ft value for the property',
-            'htmlvar_name'        =>  'property_area',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	      =>  '[detail],[listing]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '\d+(\.\d{2})?',
-            'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fas fa-chart-area',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property features
-    $custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'multiselect',
-        'class'       =>  'gd-property-features',
-        'icon'        =>  'fas fa-home',
-        'name'        =>  __('Property Features', 'geodirectory'),
-        'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Features',
-            'site_title'          =>  'Features',
-            'admin_desc'          =>  'Select the property features.',
-            'htmlvar_name'        =>  'property_features',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fas fa-plus-square',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // Twitter feed
-    $custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-twitter',
-        'icon'        =>  'fab fa-twitter',
-        'name'        =>  __('Twitter feed', 'geodirectory'),
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Twitter',
-            'site_title'          =>  'Twitter',
-            'admin_desc'          =>  'Enter your Twitter username',
-            'htmlvar_name'        =>  'twitterusername',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	      =>  '[detail],[owntab]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
-            'validation_msg'      =>  'Please enter a valid twitter username.',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fab fa-twitter',
-            'css_class'           =>  '',
-            'cat_sort'            =>  false,
-            'cat_filter'	      =>  false
-        )
-    );
-
-    // Get directions link
-    $custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-get-directions',
-        'icon'        =>  'fas fa-location-arrow',
-        'name'        =>  __('Get Directions Link', 'geodirectory'),
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Get Directions',
-            'site_title'          =>  'Get Directions',
-            'admin_desc'          =>  '',
-            'htmlvar_name'        =>  'get_directions',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  true,
-            'default_value'       =>  'Get Directions',
-            'show_in' 	      =>  '[detail],[listing]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fas fa-location-arrow',
-            'css_class'           =>  '',
-            'cat_sort'            =>  false,
-            'cat_filter'	      =>  false
-        )
-    );
-
-
-    // JOB TYPE CF
-
-    // job type
-    $custom_fields['job_type'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-job-type',
-        'icon'        =>  'fas fa-briefcase',
-        'name'        =>  __('Job Type', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the type of a job ie: Full Time, Part Time', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  __('Job Type', 'geodirectory'),
-            'site_title'          =>  __('Job Type','geodirectory'),
-            'admin_desc'          =>  __('Select the type of job.','geodirectory'),
-            'htmlvar_name'        =>  'job_type',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fas fa-briefcase',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // job sector
-    $custom_fields['job_sector'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-job-type',
-        'icon'        =>  'fas fa-briefcase',
-        'name'        =>  __('Job Sector', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  __('Job Sector','geodirectory'),
-            'site_title'          =>  __('Job Sector','geodirectory'),
-            'admin_desc'          =>  __('Select the job sector.','geodirectory'),
-            'htmlvar_name'        =>  'job_sector',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fas fa-briefcase',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-
-    /**
-     * @see `geodir_custom_fields`
-     */
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
+	$custom_fields = array();
+
+
+	// price
+	$custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-price',
+		'icon'        =>  'fas fa-dollar-sign',
+		'name'        =>  __('Price', 'geodirectory'),
+		'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'FLOAT',
+			'decimal_point'       =>  '2',
+			'admin_title'         =>  'Price',
+			'site_title'          =>  'Price',
+			'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
+			'htmlvar_name'        =>  'price',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	      =>  '[detail],[listing]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '\d+(\.\d{2})?',
+			'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fas fa-dollar-sign',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true,
+			'extra_fields'        =>  array(
+				'is_price'                  =>  1,
+				'thousand_separator'        =>  'comma',
+				'decimal_separator'         =>  'period',
+				'decimal_display'           =>  'if',
+				'currency_symbol'           =>  '$',
+				'currency_symbol_placement' =>  'left'
+			)
+		)
+	);
+
+	// property status
+	$custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-status',
+		'icon'        =>  'fas fa-home',
+		'name'        =>  __('Property Status', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Status',
+			'site_title'          =>  'Property Status',
+			'admin_desc'          =>  'Enter the status of the property.',
+			'htmlvar_name'        =>  'property_status',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fas fa-home',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property furnishing
+	$custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-furnishing',
+		'icon'        =>  'fas fa-home',
+		'name'        =>  __('Property Furnishing', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Furnishing',
+			'site_title'          =>  'Furnishing',
+			'admin_desc'          =>  'Enter the furnishing status of the property.',
+			'htmlvar_name'        =>  'property_furnishing',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fas fa-th-large',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property type
+	$custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-type',
+		'icon'        =>  'fas fa-home',
+		'name'        =>  __('Property Type', 'geodirectory'),
+		'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Type',
+			'site_title'          =>  'Property Type',
+			'admin_desc'          =>  'Select the property type.',
+			'htmlvar_name'        =>  'property_type',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fas fa-home',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property bedrooms
+	$custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-bedrooms',
+		'icon'        =>  'fas fa-home',
+		'name'        =>  __('Property Bedrooms', 'geodirectory'),
+		'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Bedrooms',
+			'site_title'          =>  'Bedrooms',
+			'admin_desc'          =>  'Select the number of bedrooms',
+			'htmlvar_name'        =>  'property_bedrooms',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fas fa-bed',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property bathrooms
+	$custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-bathrooms',
+		'icon'        =>  'fas fa-home',
+		'name'        =>  __('Property Bathrooms', 'geodirectory'),
+		'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Bathrooms',
+			'site_title'          =>  'Bathrooms',
+			'admin_desc'          =>  'Select the number of bathrooms',
+			'htmlvar_name'        =>  'property_bathrooms',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fas fa-bold',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property area
+	$custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-area',
+		'icon'        =>  'fas fa-home',
+		'name'        =>  __('Property Area', 'geodirectory'),
+		'description' =>  __('Adds a input for the property area.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'FLOAT',
+			'admin_title'         =>  'Property Area',
+			'site_title'          =>  'Area (Sq Ft)',
+			'admin_desc'          =>  'Enter the Sq Ft value for the property',
+			'htmlvar_name'        =>  'property_area',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	      =>  '[detail],[listing]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '\d+(\.\d{2})?',
+			'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fas fa-chart-area',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property features
+	$custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'multiselect',
+		'class'       =>  'gd-property-features',
+		'icon'        =>  'fas fa-home',
+		'name'        =>  __('Property Features', 'geodirectory'),
+		'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Features',
+			'site_title'          =>  'Features',
+			'admin_desc'          =>  'Select the property features.',
+			'htmlvar_name'        =>  'property_features',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fas fa-plus-square',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// Twitter feed
+	$custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-twitter',
+		'icon'        =>  'fab fa-twitter',
+		'name'        =>  __('Twitter feed', 'geodirectory'),
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Twitter',
+			'site_title'          =>  'Twitter',
+			'admin_desc'          =>  'Enter your Twitter username',
+			'htmlvar_name'        =>  'twitterusername',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	      =>  '[detail],[owntab]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
+			'validation_msg'      =>  'Please enter a valid twitter username.',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fab fa-twitter',
+			'css_class'           =>  '',
+			'cat_sort'            =>  false,
+			'cat_filter'	      =>  false
+		)
+	);
+
+	// Get directions link
+	$custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-get-directions',
+		'icon'        =>  'fas fa-location-arrow',
+		'name'        =>  __('Get Directions Link', 'geodirectory'),
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Get Directions',
+			'site_title'          =>  'Get Directions',
+			'admin_desc'          =>  '',
+			'htmlvar_name'        =>  'get_directions',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  true,
+			'default_value'       =>  'Get Directions',
+			'show_in' 	      =>  '[detail],[listing]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fas fa-location-arrow',
+			'css_class'           =>  '',
+			'cat_sort'            =>  false,
+			'cat_filter'	      =>  false
+		)
+	);
+
+
+	// JOB TYPE CF
+
+	// job type
+	$custom_fields['job_type'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-job-type',
+		'icon'        =>  'fas fa-briefcase',
+		'name'        =>  __('Job Type', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the type of a job ie: Full Time, Part Time', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  __('Job Type', 'geodirectory'),
+			'site_title'          =>  __('Job Type','geodirectory'),
+			'admin_desc'          =>  __('Select the type of job.','geodirectory'),
+			'htmlvar_name'        =>  'job_type',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fas fa-briefcase',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// job sector
+	$custom_fields['job_sector'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-job-type',
+		'icon'        =>  'fas fa-briefcase',
+		'name'        =>  __('Job Sector', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  __('Job Sector','geodirectory'),
+			'site_title'          =>  __('Job Sector','geodirectory'),
+			'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+			'htmlvar_name'        =>  'job_sector',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fas fa-briefcase',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+
+	/**
+	 * @see `geodir_custom_fields`
+	 */
+	return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
 }
 
 
@@ -395,32 +395,32 @@  discard block
 block discarded – undo
  * @return string The html to output.
  */
 function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
-    global $post;
+	global $post;
 
 
-    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+	if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
 
-        $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
+		$class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
-        $field_icon = geodir_field_icon_proccess($cf);
-        if (strpos($field_icon, 'http') !== false) {
-            $field_icon_af = '';
-        } elseif ($field_icon == '') {
-            $field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="far fa-clock"></i>' : "";
-        } else {
-            $field_icon_af = $field_icon;
-            $field_icon = '';
-        }
+		$field_icon = geodir_field_icon_proccess($cf);
+		if (strpos($field_icon, 'http') !== false) {
+			$field_icon_af = '';
+		} elseif ($field_icon == '') {
+			$field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="far fa-clock"></i>' : "";
+		} else {
+			$field_icon_af = $field_icon;
+			$field_icon = '';
+		}
 
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
 
-        $html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
-        $html .= '</div>';
+		$html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
+		$html .= '</div>';
 
-    endif;
+	endif;
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
 
@@ -435,37 +435,37 @@  discard block
 block discarded – undo
  * @return string The html to output.
  */
 function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
-    global $post;
+	global $post;
 
 
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
+	if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
 
-        $field_icon = geodir_field_icon_proccess( $cf );
-        if ( strpos( $field_icon, 'http' ) !== false ) {
-            $field_icon_af = '';
-        } elseif ( $field_icon == '' ) {
-            $field_icon_af = '<i class="fas fa-location-arrow"></i>';
-        } else {
-            $field_icon_af = $field_icon;
-            $field_icon    = '';
-        }
+		$field_icon = geodir_field_icon_proccess( $cf );
+		if ( strpos( $field_icon, 'http' ) !== false ) {
+			$field_icon_af = '';
+		} elseif ( $field_icon == '' ) {
+			$field_icon_af = '<i class="fas fa-location-arrow"></i>';
+		} else {
+			$field_icon_af = $field_icon;
+			$field_icon    = '';
+		}
 
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
+		$link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
 
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
-            $html .= $field_icon_af;
-        }
+		if(isset( $cf['field_icon'] ) && $cf['field_icon']){
+			$html .= $field_icon_af;
+		}
 
-        // We use maps.apple.com here because it will handle redirects nicely in most cases
-        $html .= '<a href="https://maps.apple.com/?daddr=' . $post->post_latitude . ',' . $post->post_longitude . '" target="_blank" >' . $link_text . '</a>';
-        $html .= '</div>';
+		// We use maps.apple.com here because it will handle redirects nicely in most cases
+		$html .= '<a href="https://maps.apple.com/?daddr=' . $post->post_latitude . ',' . $post->post_longitude . '" target="_blank" >' . $link_text . '</a>';
+		$html .= '</div>';
 
-    }else{
-        $html ='';
-    }
+	}else{
+		$html ='';
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);

Please login to merge, or discard this patch.

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -15,7 +15,7 @@  discard block
 block discarded – undo
  * @package GeoDirectory
  * @see `geodir_custom_field_save` for array details.
  */
-function geodir_custom_fields_predefined($post_type=''){
+function geodir_custom_fields_predefined($post_type = '') {
 
     $custom_fields = array();
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
+            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
+            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -328,15 +328,15 @@  discard block
 block discarded – undo
         'defaults'    => array(
             'data_type'           =>  'VARCHAR',
             'admin_title'         =>  __('Job Type', 'geodirectory'),
-            'site_title'          =>  __('Job Type','geodirectory'),
-            'admin_desc'          =>  __('Select the type of job.','geodirectory'),
+            'site_title'          =>  __('Job Type', 'geodirectory'),
+            'admin_desc'          =>  __('Select the type of job.', 'geodirectory'),
             'htmlvar_name'        =>  'job_type',
             'is_active'           =>  true,
             'for_admin_use'       =>  false,
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
+            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -356,16 +356,16 @@  discard block
 block discarded – undo
         'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
         'defaults'    => array(
             'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  __('Job Sector','geodirectory'),
-            'site_title'          =>  __('Job Sector','geodirectory'),
-            'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+            'admin_title'         =>  __('Job Sector', 'geodirectory'),
+            'site_title'          =>  __('Job Sector', 'geodirectory'),
+            'admin_desc'          =>  __('Select the job sector.', 'geodirectory'),
             'htmlvar_name'        =>  'job_sector',
             'is_active'           =>  true,
             'for_admin_use'       =>  false,
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
+            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
     /**
      * @see `geodir_custom_fields`
      */
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
+    return apply_filters('geodir_custom_fields_predefined', $custom_fields, $post_type);
 }
 
 
@@ -394,11 +394,11 @@  discard block
 block discarded – undo
  * @since 1.6.9
  * @return string The html to output.
  */
-function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
+function geodir_predefined_custom_field_output_twitter_feed($html, $location, $cf) {
     global $post;
 
 
-    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
 
         $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
         }
 
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
 
         $html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
         $html .= '</div>';
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
+add_filter('geodir_custom_field_output_text_key_twitter_feed', 'geodir_predefined_custom_field_output_twitter_feed', 10, 3);
 
 /**
  * Filter the get_directions custom field output to show a link.
@@ -434,38 +434,38 @@  discard block
 block discarded – undo
  * @since 1.6.9
  * @return string The html to output.
  */
-function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
+function geodir_predefined_custom_field_output_get_directions($html, $location, $cf) {
     global $post;
 
 
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
+    if (isset($post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset($post->post_latitude) && $post->post_latitude) {
 
-        $field_icon = geodir_field_icon_proccess( $cf );
-        if ( strpos( $field_icon, 'http' ) !== false ) {
+        $field_icon = geodir_field_icon_proccess($cf);
+        if (strpos($field_icon, 'http') !== false) {
             $field_icon_af = '';
-        } elseif ( $field_icon == '' ) {
+        } elseif ($field_icon == '') {
             $field_icon_af = '<i class="fas fa-location-arrow"></i>';
         } else {
             $field_icon_af = $field_icon;
             $field_icon    = '';
         }
 
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
+        $link_text = isset($post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __('Get Directions', 'geodirectory');
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
 
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
+        if (isset($cf['field_icon']) && $cf['field_icon']) {
             $html .= $field_icon_af;
         }
 
         // We use maps.apple.com here because it will handle redirects nicely in most cases
-        $html .= '<a href="https://maps.apple.com/?daddr=' . $post->post_latitude . ',' . $post->post_longitude . '" target="_blank" >' . $link_text . '</a>';
+        $html .= '<a href="https://maps.apple.com/?daddr='.$post->post_latitude.','.$post->post_longitude.'" target="_blank" >'.$link_text.'</a>';
         $html .= '</div>';
 
-    }else{
-        $html ='';
+    } else {
+        $html = '';
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);
+add_filter('geodir_custom_field_output_text_key_get_directions', 'geodir_predefined_custom_field_output_get_directions', 10, 3);

Please login to merge, or discard this patch.

geodirectory-functions/map-functions/map_functions.php 2 patches

Indentation +243 added lines, -243 removed lines patch added patch discarded remove patch

@@ -15,8 +15,8 @@  discard block
 block discarded – undo
  */
 function  geodir_init_map_jason()
 {
-    global $map_jason;
-    $map_jason = array();
+	global $map_jason;
+	$map_jason = array();
 }
 
 /**
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
  */
 function geodir_init_map_canvas_array()
 {
-    global $map_canvas_arr;
-    $map_canvas_arr = array();
+	global $map_canvas_arr;
+	$map_canvas_arr = array();
 }
 
 
@@ -50,68 +50,68 @@  discard block
 block discarded – undo
  */
 function create_marker_jason_of_posts($post)
 {
-    global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes;
+	global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes;
 
-    if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array)) {
+	if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array)) {
 
-        if(isset($map_jason[$post->ID])){return null;}
+		if(isset($map_jason[$post->ID])){return null;}
 
-        $srcharr = array("'", "/", "-", '"', '\\');
-        $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');
+		$srcharr = array("'", "/", "-", '"', '\\');
+		$replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');
 
-        $default_category = isset($post->default_category) ? $post->default_category : geodir_get_post_meta($post->ID,'default_category');
+		$default_category = isset($post->default_category) ? $post->default_category : geodir_get_post_meta($post->ID,'default_category');
 
-        $geodir_cat_icons = geodir_get_term_icon();
-        $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_category]) ? $geodir_cat_icons[$default_category] : '';
+		$geodir_cat_icons = geodir_get_term_icon();
+		$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_category]) ? $geodir_cat_icons[$default_category] : '';
 
-        $post_title = $post->post_title;
-        $title = str_replace($srcharr, $replarr, $post_title);
+		$post_title = $post->post_title;
+		$title = str_replace($srcharr, $replarr, $post_title);
 
-        if (is_ssl()) {
-            $icon = str_replace("http:","https:",$icon );
-        }
+		if (is_ssl()) {
+			$icon = str_replace("http:","https:",$icon );
+		}
         
-        if ($icon != '') {
-            $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes;
+		if ($icon != '') {
+			$gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes;
             
-            if (isset($gd_marker_sizes[$icon])) {
-                $icon_size = $gd_marker_sizes[$icon];
-            } else {
-                $icon_size = geodir_get_marker_size($icon);
-                $gd_marker_sizes[$icon] = $icon_size;
-            }               
-        } else {
-            $icon_size = array('w' => 36, 'h' => 45);
-        }
-
-        $post_latitude = isset($post->post_latitude) ? $post->post_latitude : geodir_get_post_meta($post->ID,'post_latitude');
-        $post_longitude = isset($post->post_longitude) ? $post->post_longitude : geodir_get_post_meta($post->ID,'post_longitude');
-
-
-        $post_json = '{"id":"' . $post->ID
-                     . '","t": "' . $title
-                     . '","lt": "' . $post_latitude
-                     . '","ln": "' . $post_longitude
-                     . '","mk_id":"' . $post->ID . '_' . $default_category
-                     . '","i":"' . $icon
-                     . '","w":"' . $icon_size['w']
-                     . '","h":"' . $icon_size['h'] . '"}';
-
-        /**
-         * Filter the json data when creating output for post json marker..
-         *
-         * @since 1.5.7
-         * @param string $post_json JSON representation of the post marker info.
-         * @param object $post The post object.
-         */
-        $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
-
-        // only assign it if it has a value
-        if($post_map_json){
-            $map_jason[$post->ID] = $post_map_json;
-        }
-
-    }
+			if (isset($gd_marker_sizes[$icon])) {
+				$icon_size = $gd_marker_sizes[$icon];
+			} else {
+				$icon_size = geodir_get_marker_size($icon);
+				$gd_marker_sizes[$icon] = $icon_size;
+			}               
+		} else {
+			$icon_size = array('w' => 36, 'h' => 45);
+		}
+
+		$post_latitude = isset($post->post_latitude) ? $post->post_latitude : geodir_get_post_meta($post->ID,'post_latitude');
+		$post_longitude = isset($post->post_longitude) ? $post->post_longitude : geodir_get_post_meta($post->ID,'post_longitude');
+
+
+		$post_json = '{"id":"' . $post->ID
+					 . '","t": "' . $title
+					 . '","lt": "' . $post_latitude
+					 . '","ln": "' . $post_longitude
+					 . '","mk_id":"' . $post->ID . '_' . $default_category
+					 . '","i":"' . $icon
+					 . '","w":"' . $icon_size['w']
+					 . '","h":"' . $icon_size['h'] . '"}';
+
+		/**
+		 * Filter the json data when creating output for post json marker..
+		 *
+		 * @since 1.5.7
+		 * @param string $post_json JSON representation of the post marker info.
+		 * @param object $post The post object.
+		 */
+		$post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
+
+		// only assign it if it has a value
+		if($post_map_json){
+			$map_jason[$post->ID] = $post_map_json;
+		}
+
+	}
 }
 
 /**
@@ -124,67 +124,67 @@  discard block
 block discarded – undo
  */
 function send_marker_jason_to_js()
 {
-    global $map_jason, $map_canvas_arr;
-
-    if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
-        foreach ($map_canvas_arr as $canvas => $jason) {
-            if (is_array($map_jason) && !empty($map_jason)) {
-
-                // on details page only show the main marker on the map
-                if(geodir_is_page('detail')){
-                    global $post;
-                    if(isset($map_jason[$post->ID])){
-                        $map_jason = array($map_jason[$post->ID]);
-                    }
-                }
-                $canvas_jason = $canvas . "_jason";
-                $map_canvas_arr[$canvas] = array_unique($map_jason);
-                unset($cat_content_info);
-                $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
-                $totalcount = count(array_unique($map_jason));
-                if (!empty($cat_content_info)) {
-                    $json_content = substr(implode(',', $cat_content_info), 1);
-                    $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
-                    $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08
-                    $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
-                } else {
-                    $canvas_jason = '[{"totalcount":"0"}]';
-                }
-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
-
-                /**
-                 * Filter the send_marker_jason_to_js() function map canvas json args.
-                 *
-                 * You can use this filter to modify map canvas json args.
-                 *
-                 * @since 1.0.0
-                 * @package GeoDirectory
-                 * @param string $canvas Map canvas array key.
-                 * @param array $map_canvas_jason_args Map canvas args.
-                 */
-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
-
-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
-            } else {
-                $canvas_jason = '[{"totalcount":"0"}]';
-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
-
-                /**
-                 * Filter the send_marker_jason_to_js() function map canvas json args.
-                 *
-                 * You can use this filter to modify map canvas json args.
-                 *
-                 * @since 1.0.0
-                 * @package GeoDirectory
-                 * @param string $canvas Map canvas array key.
-                 * @param array $map_canvas_jason_args Map canvas args.
-                 */
-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
-            }
-        }
-
-    }
+	global $map_jason, $map_canvas_arr;
+
+	if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
+		foreach ($map_canvas_arr as $canvas => $jason) {
+			if (is_array($map_jason) && !empty($map_jason)) {
+
+				// on details page only show the main marker on the map
+				if(geodir_is_page('detail')){
+					global $post;
+					if(isset($map_jason[$post->ID])){
+						$map_jason = array($map_jason[$post->ID]);
+					}
+				}
+				$canvas_jason = $canvas . "_jason";
+				$map_canvas_arr[$canvas] = array_unique($map_jason);
+				unset($cat_content_info);
+				$cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
+				$totalcount = count(array_unique($map_jason));
+				if (!empty($cat_content_info)) {
+					$json_content = substr(implode(',', $cat_content_info), 1);
+					$json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
+					$json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08
+					$canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
+				} else {
+					$canvas_jason = '[{"totalcount":"0"}]';
+				}
+				$map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
+
+				/**
+				 * Filter the send_marker_jason_to_js() function map canvas json args.
+				 *
+				 * You can use this filter to modify map canvas json args.
+				 *
+				 * @since 1.0.0
+				 * @package GeoDirectory
+				 * @param string $canvas Map canvas array key.
+				 * @param array $map_canvas_jason_args Map canvas args.
+				 */
+				$map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
+
+				wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
+			} else {
+				$canvas_jason = '[{"totalcount":"0"}]';
+				$map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
+
+				/**
+				 * Filter the send_marker_jason_to_js() function map canvas json args.
+				 *
+				 * You can use this filter to modify map canvas json args.
+				 *
+				 * @since 1.0.0
+				 * @package GeoDirectory
+				 * @param string $canvas Map canvas array key.
+				 * @param array $map_canvas_jason_args Map canvas args.
+				 */
+				$map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
+				wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
+			}
+		}
+
+	}
 }
 
 /**
@@ -207,99 +207,99 @@  discard block
 block discarded – undo
  */
 function home_map_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = true, $pading = 0, $map_canvas_name = '', $child_collapse, $is_home_map = false)
 {
-    global $cat_count, $geodir_cat_icons, $gd_session;
+	global $cat_count, $geodir_cat_icons, $gd_session;
 
-    $exclude_categories = get_option('geodir_exclude_cat_on_map');
-    $exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
+	$exclude_categories = get_option('geodir_exclude_cat_on_map');
+	$exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
 
-    // check if exclude categories saved before fix of categories identical names
-    if ($exclude_categories_new) {
-        $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : '';
-        $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array();
-    }
+	// check if exclude categories saved before fix of categories identical names
+	if ($exclude_categories_new) {
+		$gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : '';
+		$exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array();
+	}
 
-    $exclude_cat_str = implode(',', $exclude_categories);
+	$exclude_cat_str = implode(',', $exclude_categories);
 
-    if ($exclude_cat_str == '') {
-        $exclude_cat_str = '0';
-    }
+	if ($exclude_cat_str == '') {
+		$exclude_cat_str = '0';
+	}
 
-    $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
+	$cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
 
-    if ($hide_empty) {
-        $cat_terms = geodir_filter_empty_terms($cat_terms);
-    }
+	if ($hide_empty) {
+		$cat_terms = geodir_filter_empty_terms($cat_terms);
+	}
 
-    $main_list_class = '';
-    //If there are terms, start displaying
-    if (count($cat_terms) > 0) {
-        //Displaying as a list
-        $p = $pading * 15;
-        $pading++;
+	$main_list_class = '';
+	//If there are terms, start displaying
+	if (count($cat_terms) > 0) {
+		//Displaying as a list
+		$p = $pading * 15;
+		$pading++;
 
-        if ($cat_parent == 0) {
-            $list_class = 'main_list';
-            $display = '';
-        } else {
-            $list_class = 'sub_list';
-            $display = !$child_collapse ? '' : 'display:none';
-        }
+		if ($cat_parent == 0) {
+			$list_class = 'main_list';
+			$display = '';
+		} else {
+			$list_class = 'sub_list';
+			$display = !$child_collapse ? '' : 'display:none';
+		}
 
-        $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';
+		$out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';
 
-        $geodir_cat_icons = geodir_get_term_icon();
+		$geodir_cat_icons = geodir_get_term_icon();
 
-        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';
-        if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
-            $geodir_default_map_search_pt = $homemap_catlist_ptype;
-        }
-        $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt);
+		$geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';
+		if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
+			$geodir_default_map_search_pt = $homemap_catlist_ptype;
+		}
+		$post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt);
         
-        foreach ($cat_terms as $cat_term):
-            $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : '';
-
-            if (!in_array($cat_term->term_id, $exclude_categories)):
-                //Secret sauce.  Function calls itself to display child elements, if any
-                $checked = 'checked="checked"';
-
-                // Untick the category by default on home map
-                if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
-                    if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML
-                        global $sitepress;
-                        $default_lang = $sitepress->get_default_language();
-                        $term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);
-                    }else{
-                        $term_id = $cat_term->term_id;
-                    }
-                    if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
-                        $checked = '';
-                    }
-                }
-
-                $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';
-                $term_check .= ' name="' . $map_canvas_name . '_cat[]" ';
-                $term_check .= '  title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';
-                $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>';
-                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fas fa-long-arrow-alt-down"></i>';
-
-            endif;
-
-
-            // get sub category by recursion
-            $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map);
-
-            $out .= '</li>';
-
-        endforeach;
-
-        $out .= '</ul>';
-
-        return $out;
-    } else {
-        if ($cat_parent == 0)
-            return _e('No category', 'geodirectory');
-    }
-    return;
+		foreach ($cat_terms as $cat_term):
+			$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : '';
+
+			if (!in_array($cat_term->term_id, $exclude_categories)):
+				//Secret sauce.  Function calls itself to display child elements, if any
+				$checked = 'checked="checked"';
+
+				// Untick the category by default on home map
+				if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
+					if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML
+						global $sitepress;
+						$default_lang = $sitepress->get_default_language();
+						$term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);
+					}else{
+						$term_id = $cat_term->term_id;
+					}
+					if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
+						$checked = '';
+					}
+				}
+
+				$term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';
+				$term_check .= ' name="' . $map_canvas_name . '_cat[]" ';
+				$term_check .= '  title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';
+				$term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>';
+				$out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fas fa-long-arrow-alt-down"></i>';
+
+			endif;
+
+
+			// get sub category by recursion
+			$out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map);
+
+			$out .= '</li>';
+
+		endforeach;
+
+		$out .= '</ul>';
+
+		return $out;
+	} else {
+		if ($cat_parent == 0)
+			return _e('No category', 'geodirectory');
+	}
+	return;
 }
 
 /**
@@ -311,19 +311,19 @@  discard block
 block discarded – undo
  * @return string The map API provider name.
  */
 function geodir_map_name() {
-    $geodir_map_name = get_option('geodir_load_map', 'google');
+	$geodir_map_name = get_option('geodir_load_map', 'google');
     
-    if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
-        $geodir_map_name = 'auto';
-    }
-
-    /**
-     * Filter the map JS API provider name.
-     *
-     * @since 1.6.1
-     * @param string $geodir_map_name The map API provider name.
-     */
-    return apply_filters('geodir_map_name', $geodir_map_name);
+	if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
+		$geodir_map_name = 'auto';
+	}
+
+	/**
+	 * Filter the map JS API provider name.
+	 *
+	 * @since 1.6.1
+	 * @param string $geodir_map_name The map API provider name.
+	 */
+	return apply_filters('geodir_map_name', $geodir_map_name);
 }
 
 /**
@@ -339,48 +339,48 @@  discard block
 block discarded – undo
  * @return array The icon size.
  */
 function geodir_get_marker_size($icon, $default_size = array('w' => 36, 'h' => 45)) {
-    global $gd_marker_sizes;
+	global $gd_marker_sizes;
     
-    if (empty($gd_marker_sizes)) {
-        $gd_marker_sizes = array();
-    }
+	if (empty($gd_marker_sizes)) {
+		$gd_marker_sizes = array();
+	}
       
-    if (!empty($gd_marker_sizes[$icon])) {
-        return $gd_marker_sizes[$icon];
-    }
+	if (!empty($gd_marker_sizes[$icon])) {
+		return $gd_marker_sizes[$icon];
+	}
     
-    if (empty($icon)) {
-        $gd_marker_sizes[$icon] = $default_size;
+	if (empty($icon)) {
+		$gd_marker_sizes[$icon] = $default_size;
         
-        return $default_size;
-    }
+		return $default_size;
+	}
     
-    $icon_url = $icon;
+	$icon_url = $icon;
     
-    $uploads = wp_upload_dir(); // Array of key => value pairs
+	$uploads = wp_upload_dir(); // Array of key => value pairs
       
-    if (!path_is_absolute($icon)) {
-        $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon);
-    }
+	if (!path_is_absolute($icon)) {
+		$icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon);
+	}
     
-    if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
-        $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon);
-    }
+	if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
+		$icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon);
+	}
     
-    $sizes = array();
-    if (is_file($icon) && file_exists($icon)) {
-        $size = getimagesize(trim($icon));
+	$sizes = array();
+	if (is_file($icon) && file_exists($icon)) {
+		$size = getimagesize(trim($icon));
         
-        if (!empty($size[0]) && !empty($size[1])) {
-            $sizes = array('w' => $size[0], 'h' => $size[1]);
-        }
-    }
+		if (!empty($size[0]) && !empty($size[1])) {
+			$sizes = array('w' => $size[0], 'h' => $size[1]);
+		}
+	}
     
-    $sizes = !empty($sizes) ? $sizes : $default_size;
+	$sizes = !empty($sizes) ? $sizes : $default_size;
     
-    $gd_marker_sizes[$icon_url] = $sizes;
+	$gd_marker_sizes[$icon_url] = $sizes;
     
-    return $sizes;
+	return $sizes;
 }
 
 add_action('wp_footer', 'geodir_map_load_script', 10);
@@ -392,8 +392,8 @@  discard block
 block discarded – undo
  * @package GeoDirectory
  */
 function geodir_map_load_script() {
-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'google-maps-api', 'done')) {
-        $plugin_url = geodir_plugin_url();
+	if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'google-maps-api', 'done')) {
+		$plugin_url = geodir_plugin_url();
 ?>
 <script type="text/javascript">
 if (!(window.google && typeof google.maps !== 'undefined')) {
@@ -408,5 +408,5 @@  discard block
 block discarded – undo
 }
 </script>
 <?php
-    }
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

@@ -54,12 +54,12 @@  discard block
 block discarded – undo
 
     if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array)) {
 
-        if(isset($map_jason[$post->ID])){return null;}
+        if (isset($map_jason[$post->ID])) {return null; }
 
         $srcharr = array("'", "/", "-", '"', '\\');
         $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');
 
-        $default_category = isset($post->default_category) ? $post->default_category : geodir_get_post_meta($post->ID,'default_category');
+        $default_category = isset($post->default_category) ? $post->default_category : geodir_get_post_meta($post->ID, 'default_category');
 
         $geodir_cat_icons = geodir_get_term_icon();
         $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_category]) ? $geodir_cat_icons[$default_category] : '';
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
         $title = str_replace($srcharr, $replarr, $post_title);
 
         if (is_ssl()) {
-            $icon = str_replace("http:","https:",$icon );
+            $icon = str_replace("http:", "https:", $icon);
         }
         
         if ($icon != '') {
@@ -84,18 +84,18 @@  discard block
 block discarded – undo
             $icon_size = array('w' => 36, 'h' => 45);
         }
 
-        $post_latitude = isset($post->post_latitude) ? $post->post_latitude : geodir_get_post_meta($post->ID,'post_latitude');
-        $post_longitude = isset($post->post_longitude) ? $post->post_longitude : geodir_get_post_meta($post->ID,'post_longitude');
+        $post_latitude = isset($post->post_latitude) ? $post->post_latitude : geodir_get_post_meta($post->ID, 'post_latitude');
+        $post_longitude = isset($post->post_longitude) ? $post->post_longitude : geodir_get_post_meta($post->ID, 'post_longitude');
 
 
-        $post_json = '{"id":"' . $post->ID
-                     . '","t": "' . $title
-                     . '","lt": "' . $post_latitude
-                     . '","ln": "' . $post_longitude
-                     . '","mk_id":"' . $post->ID . '_' . $default_category
-                     . '","i":"' . $icon
-                     . '","w":"' . $icon_size['w']
-                     . '","h":"' . $icon_size['h'] . '"}';
+        $post_json = '{"id":"'.$post->ID
+                     . '","t": "'.$title
+                     . '","lt": "'.$post_latitude
+                     . '","ln": "'.$post_longitude
+                     . '","mk_id":"'.$post->ID.'_'.$default_category
+                     . '","i":"'.$icon
+                     . '","w":"'.$icon_size['w']
+                     . '","h":"'.$icon_size['h'].'"}';
 
         /**
          * Filter the json data when creating output for post json marker..
@@ -104,10 +104,10 @@  discard block
 block discarded – undo
          * @param string $post_json JSON representation of the post marker info.
          * @param object $post The post object.
          */
-        $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
+        $post_map_json = apply_filters('geodir_create_marker_jason_of_posts', $post_json, $post);
 
         // only assign it if it has a value
-        if($post_map_json){
+        if ($post_map_json) {
             $map_jason[$post->ID] = $post_map_json;
         }
 
@@ -131,13 +131,13 @@  discard block
 block discarded – undo
             if (is_array($map_jason) && !empty($map_jason)) {
 
                 // on details page only show the main marker on the map
-                if(geodir_is_page('detail')){
+                if (geodir_is_page('detail')) {
                     global $post;
-                    if(isset($map_jason[$post->ID])){
+                    if (isset($map_jason[$post->ID])) {
                         $map_jason = array($map_jason[$post->ID]);
                     }
                 }
-                $canvas_jason = $canvas . "_jason";
+                $canvas_jason = $canvas."_jason";
                 $map_canvas_arr[$canvas] = array_unique($map_jason);
                 unset($cat_content_info);
                 $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
@@ -146,11 +146,11 @@  discard block
 block discarded – undo
                     $json_content = substr(implode(',', $cat_content_info), 1);
                     $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
                     $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08
-                    $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
+                    $canvas_jason = '[{"totalcount":"'.$totalcount.'",'.$json_content.']';
                 } else {
                     $canvas_jason = '[{"totalcount":"0"}]';
                 }
-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
+                $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason);
 
                 /**
                  * Filter the send_marker_jason_to_js() function map canvas json args.
@@ -162,12 +162,12 @@  discard block
 block discarded – undo
                  * @param string $canvas Map canvas array key.
                  * @param array $map_canvas_jason_args Map canvas args.
                  */
-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
+                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
 
-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
+                wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
             } else {
                 $canvas_jason = '[{"totalcount":"0"}]';
-                $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
+                $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason);
 
                 /**
                  * Filter the send_marker_jason_to_js() function map canvas json args.
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
                  * @param string $canvas Map canvas array key.
                  * @param array $map_canvas_jason_args Map canvas args.
                  */
-                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
-                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
+                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
+                wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
             }
         }
 
@@ -245,11 +245,11 @@  discard block
 block discarded – undo
             $display = !$child_collapse ? '' : 'display:none';
         }
 
-        $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';
+        $out = '<ul class="treeview '.$list_class.'" style="margin-left:'.$p.'px;'.$display.';">';
 
         $geodir_cat_icons = geodir_get_term_icon();
 
-        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';
+        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
         if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
             $geodir_default_map_search_pt = $homemap_catlist_ptype;
         }
@@ -264,23 +264,23 @@  discard block
 block discarded – undo
 
                 // Untick the category by default on home map
                 if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
-                    if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML
+                    if (geodir_wpml_is_taxonomy_translated($post_type.'category')) { // if WPML
                         global $sitepress;
                         $default_lang = $sitepress->get_default_language();
                         $term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);
-                    }else{
+                    } else {
                         $term_id = $cat_term->term_id;
                     }
-                    if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
+                    if (!empty($geodir_home_map_untick) && in_array($post_type.'_'.$term_id, $geodir_home_map_untick)) {
                         $checked = '';
                     }
                 }
 
-                $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';
-                $term_check .= ' name="' . $map_canvas_name . '_cat[]" ';
-                $term_check .= '  title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';
-                $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>';
-                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fas fa-long-arrow-alt-down"></i>';
+                $term_check = '<input type="checkbox" '.$checked.' id="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'" class="group_selector '.$main_list_class.'"';
+                $term_check .= ' name="'.$map_canvas_name.'_cat[]" ';
+                $term_check .= '  title="'.esc_attr(geodir_utf8_ucfirst($cat_term->name)).'" value="'.$cat_term->term_id.'" onclick="javascript:build_map_ajax_search_param(\''.$map_canvas_name.'\',false, this)">';
+                $term_img = '<img height="15" width="15" alt="'.$cat_term->taxonomy.'" src="'.$icon.'" title="'.geodir_utf8_ucfirst($cat_term->name).'"/>';
+                $out .= '<li>'.$term_check.'<label for="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'">'.$term_img.geodir_utf8_ucfirst($cat_term->name).'</label><i class="fas fa-long-arrow-alt-down"></i>';
 
             endif;
 
@@ -392,19 +392,19 @@  discard block
 block discarded – undo
  * @package GeoDirectory
  */
 function geodir_map_load_script() {
-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'google-maps-api', 'done')) {
+    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is('google-maps-api', 'done')) {
         $plugin_url = geodir_plugin_url();
 ?>
 <script type="text/javascript">
 if (!(window.google && typeof google.maps !== 'undefined')) {
-    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
+    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
     document.getElementsByTagName("head")[0].appendChild(css);
-    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
+    var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
     document.getElementsByTagName("head")[0].appendChild(css);
-    document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
-    document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/osm.geocode.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
-    document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
-    document.write('<' + 'script id="geodirectory-o-overlappingmarker-script" src="<?php echo $plugin_url;?>/geodirectory-assets/jawj/oms-leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
+    document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
+    document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/osm.geocode.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
+    document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
+    document.write('<' + 'script id="geodirectory-o-overlappingmarker-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/jawj/oms-leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
 }
 </script>
 <?php

Please login to merge, or discard this patch.

geodirectory-functions/map-functions/map_template_tags.php 2 patches

Indentation +145 added lines, -145 removed lines patch added patch discarded remove patch

@@ -67,80 +67,80 @@  discard block
 block discarded – undo
  */
 function geodir_draw_map($map_args = array())
 {
-    global $map_canvas_arr;
-    $map_canvas_name = (!empty($map_args) && $map_args['map_canvas_name'] != '') ? $map_args['map_canvas_name'] : 'home_map_canvas';
-    $map_class_name = (!empty($map_args) && isset($map_args['map_class_name'])) ? $map_args['map_class_name'] : '';
-
-    $default_location = geodir_get_default_location();
-
-    $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
-    $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
-    $map_default_zoom = 12;
-    // map options default values
-    $width = 950;
-    $height = 450;
-    $child_collapse = '0';
-    $sticky = '';
-    $enable_cat_filters = false;
-    $enable_text_search = false;
-    $enable_post_type_filters = false;
-    $enable_location_filters = false;
-    $enable_jason_on_load = false;
-    $enable_map_direction = false;
-    $enable_marker_cluster = false;
-    $enable_map_resize_button = false;
-    $maptype = 'ROADMAP';
-
-    $geodir_map_options = array(
-        'width' => $width,
-        'height' => $height,
-        'child_collapse' => $child_collapse,
-        'sticky' => $sticky,
-        'enable_map_resize_button' => $enable_map_resize_button,
-        'enable_cat_filters' => $enable_cat_filters,
-        'enable_text_search' => $enable_text_search,
-        'enable_post_type_filters' => $enable_post_type_filters,
-        'enable_location_filters' => $enable_location_filters,
-        'enable_jason_on_load' => $enable_jason_on_load,
-        'enable_map_direction' => $enable_map_direction,
-        'enable_marker_cluster' => $enable_marker_cluster,
-        'ajax_url' => geodir_get_ajax_url(),
-        'map_canvas_name' => $map_canvas_name,
-        'inputText' => __('Title or Keyword', 'geodirectory'),
-        'latitude' => $map_default_lat,
-        'longitude' => $map_default_lng,
-        'zoom' => $map_default_zoom,
-        'scrollwheel' => true,
-        'streetViewControl' => true,
-        'fullscreenControl' => false,
-        'maptype' => $maptype,
-        'showPreview' => '0',
-        'maxZoom' => 21,
-        'autozoom' => true,
-        'bubble_size' => 'small',
-        'token' => '68f48005e256696074e1da9bf9f67f06',
-        'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')
-    );
-
-
-
-    if (!empty($map_args)) {
-        foreach ($map_args as $map_option_key => $map_option_value) {
-            $geodir_map_options[$map_option_key] = $map_option_value;
-        }
-    }
-
-    if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {
-    } else {
-        $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';
-    }
-
-    if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {
-    } else {
-        $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';
-    }
-
-    /**
+	global $map_canvas_arr;
+	$map_canvas_name = (!empty($map_args) && $map_args['map_canvas_name'] != '') ? $map_args['map_canvas_name'] : 'home_map_canvas';
+	$map_class_name = (!empty($map_args) && isset($map_args['map_class_name'])) ? $map_args['map_class_name'] : '';
+
+	$default_location = geodir_get_default_location();
+
+	$map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
+	$map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
+	$map_default_zoom = 12;
+	// map options default values
+	$width = 950;
+	$height = 450;
+	$child_collapse = '0';
+	$sticky = '';
+	$enable_cat_filters = false;
+	$enable_text_search = false;
+	$enable_post_type_filters = false;
+	$enable_location_filters = false;
+	$enable_jason_on_load = false;
+	$enable_map_direction = false;
+	$enable_marker_cluster = false;
+	$enable_map_resize_button = false;
+	$maptype = 'ROADMAP';
+
+	$geodir_map_options = array(
+		'width' => $width,
+		'height' => $height,
+		'child_collapse' => $child_collapse,
+		'sticky' => $sticky,
+		'enable_map_resize_button' => $enable_map_resize_button,
+		'enable_cat_filters' => $enable_cat_filters,
+		'enable_text_search' => $enable_text_search,
+		'enable_post_type_filters' => $enable_post_type_filters,
+		'enable_location_filters' => $enable_location_filters,
+		'enable_jason_on_load' => $enable_jason_on_load,
+		'enable_map_direction' => $enable_map_direction,
+		'enable_marker_cluster' => $enable_marker_cluster,
+		'ajax_url' => geodir_get_ajax_url(),
+		'map_canvas_name' => $map_canvas_name,
+		'inputText' => __('Title or Keyword', 'geodirectory'),
+		'latitude' => $map_default_lat,
+		'longitude' => $map_default_lng,
+		'zoom' => $map_default_zoom,
+		'scrollwheel' => true,
+		'streetViewControl' => true,
+		'fullscreenControl' => false,
+		'maptype' => $maptype,
+		'showPreview' => '0',
+		'maxZoom' => 21,
+		'autozoom' => true,
+		'bubble_size' => 'small',
+		'token' => '68f48005e256696074e1da9bf9f67f06',
+		'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')
+	);
+
+
+
+	if (!empty($map_args)) {
+		foreach ($map_args as $map_option_key => $map_option_value) {
+			$geodir_map_options[$map_option_key] = $map_option_value;
+		}
+	}
+
+	if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {
+	} else {
+		$geodir_map_options['height'] = $geodir_map_options['height'] . 'px';
+	}
+
+	if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {
+	} else {
+		$geodir_map_options['width'] = $geodir_map_options['width'] . 'px';
+	}
+
+	/**
 	 * Filter the options to use in google map.
 	 *
 	 * @since 1.0.0
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
 	 */
 	$geodir_map_options = apply_filters("geodir_map_options_{$map_canvas_name}", $geodir_map_options);
 
-    $map_canvas_arr[$map_canvas_name] = array();
+	$map_canvas_arr[$map_canvas_name] = array();
 
-    /**
+	/**
 	 * Filter the post types to display data on map.
 	 *
 	 * @since 1.0.0
@@ -169,20 +169,20 @@  discard block
 block discarded – undo
 	 */
 	$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
+	if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)):
+		// Set default map options
 
-        wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);
+		wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);
 
-        wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);
+		wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);
 
-        if ($map_canvas_name == 'detail_page_map_canvas' || $map_canvas_name == 'preview_map_canvas') {
-            $map_width = '100%';
-        } else {
-            $map_width = $geodir_map_options['width'];
-        }
+		if ($map_canvas_name == 'detail_page_map_canvas' || $map_canvas_name == 'preview_map_canvas') {
+			$map_width = '100%';
+		} else {
+			$map_width = $geodir_map_options['width'];
+		}
 
-        /**
+		/**
 		 * Filter the width of map.
 		 *
 		 * @since 1.0.0
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
 		 * @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">
             <div class="trigger_sticky triggeroff_sticky"></div>
@@ -224,15 +224,15 @@  discard block
 block discarded – undo
                 <?php if ($geodir_map_options['enable_jason_on_load']) { ?>
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/>
                 <?php } else {
-                    ?>
+					?>
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>
                 <?php }
 
-                if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])
-                    $show_entire_cat_panel = "none";
-                else
-                    $show_entire_cat_panel = "''";
-                ?>
+				if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])
+					$show_entire_cat_panel = "none";
+				else
+					$show_entire_cat_panel = "''";
+				?>
 
                 <?php if ($geodir_map_options['enable_map_direction']) { ?>
                     <div class="gd-input-group gd-get-directions">
@@ -295,8 +295,8 @@  discard block
 block discarded – undo
                         <select id="travel-units" onchange="calcRoute('<?php echo $map_canvas_name; ?>')">
                             <option value="miles"><?php _e('Miles', 'geodirectory'); ?></option>
                             <option <?php if (get_option('geodir_search_dist_1') == 'km') {
-                                echo 'selected="selected"';
-                            } ?> value="kilometers"><?php _e('Kilometers', 'geodirectory'); ?></option>
+								echo 'selected="selected"';
+							} ?> value="kilometers"><?php _e('Kilometers', 'geodirectory'); ?></option>
                         </select>
                     </div>
 
@@ -308,12 +308,12 @@  discard block
 block discarded – undo
 				if (empty($geodir_default_map_search_pt))
 					$geodir_default_map_search_pt = 'gd_place';
 
-                global $gd_session;
-                $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');
+				global $gd_session;
+				$homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');
 
-                if ($homemap_catlist_ptype) {
-                    $geodir_default_map_search_pt = $homemap_catlist_ptype;
-                }
+				if ($homemap_catlist_ptype) {
+					$geodir_default_map_search_pt = $homemap_catlist_ptype;
+				}
 
 				/**
 				 * Filter the post type to retrieve data for map
@@ -326,13 +326,13 @@  discard block
 block discarded – undo
 				?>
                 <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);
+					$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';
 					}
-                    ?>
+					?>
                     <div
                         class="map-category-listing<?php echo $map_cat_class;?>">
                         <div class="gd-trigger gd-triggeroff"><i class="fas fa-compress"></i><i class="fas fa-expand"></i></div>
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
                                 <?php if ($geodir_map_options['child_collapse']) { $child_collapse = "1"; ?>
                                     <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/>
                                 <?php } else {$child_collapse = "0";
-                                    ?>
+									?>
                                     <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/>
                                 <?php } ?>
                                 <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>
@@ -372,18 +372,18 @@  discard block
 block discarded – undo
                 <!-- map-category-listings-->
 
                 <?php
-                if ($geodir_map_options['enable_location_filters']) {
-                    $country = get_query_var('gd_country');
+				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');
-                    $gd_neighbourhood = get_query_var('gd_neighbourhood');
+					$gd_neighbourhood = get_query_var('gd_neighbourhood');
                     
-                    //fix for location/me page
-                    $country = $country != 'me' ? $country : '';
+					//fix for location/me page
+					$country = $country != 'me' ? $country : '';
 					$region = $region != 'me' ? $region : '';
 					$city = $country != 'me' ? $city : '';
-                    $gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';
-                    ?>
+					$gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';
+					?>
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country"
                            value="<?php echo $country;?>"/>
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood"
                            value="<?php echo $gd_neighbourhood;?>"/>
                 <?php } else { //end of location filter
-                    ?>
+					?>
                     <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/>
                 <?php }?>
 
@@ -405,16 +405,16 @@  discard block
 block discarded – undo
 
 
                 <?php if ($geodir_map_options['enable_post_type_filters']) {
-                    $post_types = geodir_get_posttypes('object');
-                    $all_post_types = geodir_get_posttypes('names');
-                    $exclude_post_types = get_option('geodir_exclude_post_type_on_map');
-                    if (is_array($exclude_post_types)) {
-                        $map_post_types = array_diff($all_post_types, $exclude_post_types);
-                    } else {
-                        $map_post_types = $all_post_types;
-                    }
-                    if (count($map_post_types) > 1) {
-                        ?>
+					$post_types = geodir_get_posttypes('object');
+					$all_post_types = geodir_get_posttypes('names');
+					$exclude_post_types = get_option('geodir_exclude_post_type_on_map');
+					if (is_array($exclude_post_types)) {
+						$map_post_types = array_diff($all_post_types, $exclude_post_types);
+					} else {
+						$map_post_types = $all_post_types;
+					}
+					if (count($map_post_types) > 1) {
+						?>
                         <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu"
                              style="max-width:<?php echo $map_width;?>!important;">
 
@@ -424,13 +424,13 @@  discard block
 block discarded – undo
                                     <?php
 
 
-                                    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"' : '';
+									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)">' . __($args->labels->name, 'geodirectory') . '</a></li>';
-                                        }
-                                    }
-                                    ?>
+										}
+									}
+									?>
                                 </ul>
                                 <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>
                             </div><?php } ?>
@@ -444,8 +444,8 @@  discard block
 block discarded – undo
 
                         </div> <!-- map-places-listings-->
                     <?php }
-                } // end of post type filter if
-                ?>
+				} // end of post type filter if
+				?>
 
             </div>
         </div> <!--end of stick trigger container-->
@@ -459,8 +459,8 @@  discard block
 block discarded – undo
         </script>
         <?php
 
-        if (strpos($geodir_map_options['height'], 'vh')) {
-            ?>
+		if (strpos($geodir_map_options['height'], 'vh')) {
+			?>
             <script>
                 (function () {
                     var screenH = jQuery(window).height();
@@ -482,8 +482,8 @@  discard block
 block discarded – undo
 
         <?php
 
-        } elseif (strpos($geodir_map_options['height'], 'px')) {
-            ?>
+		} elseif (strpos($geodir_map_options['height'], 'px')) {
+			?>
             <script>
                 (function () {
                     var screenH = jQuery(window).height();
@@ -498,20 +498,20 @@  discard block
 block discarded – undo
                 }());
             </script>
         <?php
-        }
+		}
 
-        /**
-         * Action that runs after all the map code has been output;
-         *
-         * @since 1.5.3
-         *
-         * @param array $geodir_map_options Array of map settings.
-         * @param string $map_canvas_name The canvas name and ID for the map.
-         */
-        do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);
+		/**
+		 * Action that runs after all the map code has been output;
+		 *
+		 * @since 1.5.3
+		 *
+		 * @param array $geodir_map_options Array of map settings.
+		 * @param string $map_canvas_name The canvas name and ID for the map.
+		 */
+		do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);
 
 
-    endif; // Exclude posttypes if end
+	endif; // Exclude posttypes if end
 }
 
 /**

Please login to merge, or discard this patch.

Spacing +61 added lines, -61 removed lines patch added patch discarded remove patch

@@ -132,12 +132,12 @@  discard block
 block discarded – undo
 
     if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {
     } else {
-        $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';
+        $geodir_map_options['height'] = $geodir_map_options['height'].'px';
     }
 
     if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {
     } else {
-        $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';
+        $geodir_map_options['width'] = $geodir_map_options['width'].'px';
     }
 
     /**
@@ -169,10 +169,10 @@  discard block
 block discarded – undo
 	 */
 	$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)):
+    if (count((array) $post_types) != count($exclude_post_types) || ($enable_jason_on_load)):
         // Set default map options
 
-        wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);
+        wp_enqueue_script('geodir-map-widget', geodir_plugin_url().'/geodirectory-functions/map-functions/js/map.min.js', array(), false, true);
 
         wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);
 
@@ -191,41 +191,41 @@  discard block
 block discarded – undo
 		 */
 		$map_width = apply_filters('geodir_change_map_width', $map_width);
         ?>
-        <div id="catcher_<?php echo $map_canvas_name;?>"></div>
+        <div id="catcher_<?php echo $map_canvas_name; ?>"></div>
         <div class="stick_trigger_container">
             <div class="trigger_sticky triggeroff_sticky"></div>
-            <div class="top_banner_section geodir_map_container <?php echo $map_class_name;?>"
-                 id="sticky_map_<?php echo $map_canvas_name;?>"
-                 style="min-height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">
+            <div class="top_banner_section geodir_map_container <?php echo $map_class_name; ?>"
+                 id="sticky_map_<?php echo $map_canvas_name; ?>"
+                 style="min-height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">
 
                 <div class="map_background">
                     <div class="top_banner_section_in clearfix">
-                        <div class="<?php echo $map_canvas_name;?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name;?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fas fa-expand-arrows-alt"></i></span></div>
-                        <div class="<?php echo $map_canvas_name;?>_TopRight TopRight"></div>
-                        <div id="<?php echo $map_canvas_name;?>_wrapper" class="main_map_wrapper"
-                             style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">
+                        <div class="<?php echo $map_canvas_name; ?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name; ?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fas fa-expand-arrows-alt"></i></span></div>
+                        <div class="<?php echo $map_canvas_name; ?>_TopRight TopRight"></div>
+                        <div id="<?php echo $map_canvas_name; ?>_wrapper" class="main_map_wrapper"
+                             style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">
                             <!-- new map start -->
                             <div class="iprelative">
-                                <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name;?>"
-                                     style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>
-                                <div id="<?php echo $map_canvas_name;?>_loading_div" class="loading_div"
-                                     style=" height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>
+                                <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name; ?>"
+                                     style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>
+                                <div id="<?php echo $map_canvas_name; ?>_loading_div" class="loading_div"
+                                     style=" height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>
                                 <!--<div id="home_map_counter"></div>        -->
-                                <div id="<?php echo $map_canvas_name;?>_map_nofound"
+                                <div id="<?php echo $map_canvas_name; ?>_map_nofound"
                                      class="advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div>
-                                <div id="<?php echo $map_canvas_name;?>_map_notloaded"
+                                <div id="<?php echo $map_canvas_name; ?>_map_notloaded"
                                      class="advmap_notloaded"><?php _e('<h3>Google Map Not Loaded</h3><p>Sorry, unable to load Google Maps API.', 'geodirectory'); ?></div>
                             </div>
                             <!-- new map end -->
                         </div>
-                        <div class="<?php echo $map_canvas_name;?>_BottomLeft BottomLeft"></div>
+                        <div class="<?php echo $map_canvas_name; ?>_BottomLeft BottomLeft"></div>
                     </div>
                 </div>
                 <?php if ($geodir_map_options['enable_jason_on_load']) { ?>
-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/>
+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="1"/>
                 <?php } else {
                     ?>
-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>
+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="0"/>
                 <?php }
 
                 if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
                       <div class="gd-input-group-addon gd-directions-right gd-mylocation-go"><input type="button" value="<?php _e('Get Directions', 'geodirectory'); ?>" class="<?php echo $map_canvas_name; ?>_getdirection" id="directions" onclick="calcRoute('<?php echo $map_canvas_name; ?>')" /></div>
                     </div>
                     <script>
-                        <?php if(geodir_is_page('detail')){?>
+                        <?php if (geodir_is_page('detail')) {?>
                         jQuery(function () {
                             gd_initialize_ac();
                         });
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
                                 // Create the autocomplete object, restricting the search
                                 // to geographical location types.
                                 autocomplete = new google.maps.places.Autocomplete(
-                                    /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name;?>_fromAddress')),
+                                    /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name; ?>_fromAddress')),
                                     {types: ['geocode']});
                                 // When the user selects an address from the dropdown,
                                 // populate the address fields in the form.
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
                                 
                                 if (window.gdMaps == 'osm') {
                                     window.setTimeout(function() {
-                                        calcRoute('<?php echo $map_canvas_name;?>');
+                                        calcRoute('<?php echo $map_canvas_name; ?>');
                                     }, 1000);
                                 }
                             }
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
 				 */
 				$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;?>">
+                <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);
@@ -334,12 +334,12 @@  discard block
 block discarded – undo
 					}
                     ?>
                     <div
-                        class="map-category-listing<?php echo $map_cat_class;?>">
+                        class="map-category-listing<?php echo $map_cat_class; ?>">
                         <div class="gd-trigger gd-triggeroff"><i class="fas fa-compress"></i><i class="fas fa-expand"></i></div>
-                        <div id="<?php echo $map_canvas_name;?>_cat"
-                             class="<?php echo $map_canvas_name;?>_map_category  map_category"
-                             <?php if ($child_collapse){ ?>checked="checked" <?php }?>
-                             style="max-height:<?php echo $geodir_map_options['height'];?>;">
+                        <div id="<?php echo $map_canvas_name; ?>_cat"
+                             class="<?php echo $map_canvas_name; ?>_map_category  map_category"
+                             <?php if ($child_collapse) { ?>checked="checked" <?php }?>
+                             style="max-height:<?php echo $geodir_map_options['height']; ?>;">
                             <input
                                 onkeydown="if(event.keyCode == 13){build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false)}"
                                 type="text"
@@ -351,11 +351,11 @@  discard block
 block discarded – undo
                                     <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/>
                                 <?php } else {$child_collapse = "0";
                                     ?>
-                                    <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/>
+                                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="0"/>
                                 <?php } ?>
                                 <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>
                                 <div class="geodir_toggle">
-                                    <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'),0,true,0,$map_canvas_name,$child_collapse,true); ?>
+                                    <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'), 0, true, 0, $map_canvas_name, $child_collapse, true); ?>
                                     <script>jQuery( document ).ready(function() {
                                             geodir_show_sub_cat_collapse_button();
                                         });</script>
@@ -384,21 +384,21 @@  discard block
 block discarded – undo
 					$city = $country != 'me' ? $city : '';
                     $gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';
                     ?>
-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>
-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country"
-                           value="<?php echo $country;?>"/>
-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_region" name="gd_region"
-                           value="<?php echo $region;?>"/>
-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_city" name="gd_city"
-                           value="<?php echo $city;?>"/>
-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood"
-                           value="<?php echo $gd_neighbourhood;?>"/>
+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="1"/>
+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_country" name="gd_country"
+                           value="<?php echo $country; ?>"/>
+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_region" name="gd_region"
+                           value="<?php echo $region; ?>"/>
+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_city" name="gd_city"
+                           value="<?php echo $city; ?>"/>
+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_neighbourhood" name="gd_neighbourhood"
+                           value="<?php echo $gd_neighbourhood; ?>"/>
                 <?php } else { //end of location filter
                     ?>
-                    <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/>
+                    <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="0"/>
                 <?php }?>
 
-                <input type="hidden" id="<?php echo $map_canvas_name;?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt;?>"/>
+                <input type="hidden" id="<?php echo $map_canvas_name; ?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt; ?>"/>
 
                 <input type="hidden" name="limitstart" value=""/>
 
@@ -415,8 +415,8 @@  discard block
 block discarded – undo
                     }
                     if (count($map_post_types) > 1) {
                         ?>
-                        <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu"
-                             style="max-width:<?php echo $map_width;?>!important;">
+                        <div class="map-places-listing" id="<?php echo $map_canvas_name; ?>_posttype_menu"
+                             style="max-width:<?php echo $map_width; ?>!important;">
 
                             <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>
                             <div class="geodir-map-posttype-list"><?php } ?>
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
                                     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)">' . __($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)">'.__($args->labels->name, 'geodirectory').'</a></li>';
                                         }
                                     }
                                     ?>
@@ -452,8 +452,8 @@  discard block
 block discarded – undo
         <script type="text/javascript">
 
             jQuery(document).ready(function () {
-                build_map_ajax_search_param('<?php echo $map_canvas_name;?>', false);
-                map_sticky('<?php echo $map_canvas_name;?>');
+                build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false);
+                map_sticky('<?php echo $map_canvas_name; ?>');
             });
 
         </script>
@@ -464,18 +464,18 @@  discard block
 block discarded – undo
             <script>
                 (function () {
                     var screenH = jQuery(window).height();
-                    var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']);?>";
+                    var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']); ?>";
 
                     var ptypeH = '';
-                    if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {
-                        ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();
+                    if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {
+                        ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();
                     }
 
-                    jQuery("#sticky_map_<?php echo $map_canvas_name;?>").css("min-height", screenH * (heightVH / 100) + 'px');
-                    jQuery("#<?php echo $map_canvas_name;?>_wrapper").height(screenH * (heightVH / 100) + 'px');
-                    jQuery("#<?php echo $map_canvas_name;?>").height(screenH * (heightVH / 100) + 'px');
-                    jQuery("#<?php echo $map_canvas_name;?>_loading_div").height(screenH * (heightVH / 100) + 'px');
-                    jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');
+                    jQuery("#sticky_map_<?php echo $map_canvas_name; ?>").css("min-height", screenH * (heightVH / 100) + 'px');
+                    jQuery("#<?php echo $map_canvas_name; ?>_wrapper").height(screenH * (heightVH / 100) + 'px');
+                    jQuery("#<?php echo $map_canvas_name; ?>").height(screenH * (heightVH / 100) + 'px');
+                    jQuery("#<?php echo $map_canvas_name; ?>_loading_div").height(screenH * (heightVH / 100) + 'px');
+                    jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');
 
                 }());
             </script>
@@ -487,13 +487,13 @@  discard block
 block discarded – undo
             <script>
                 (function () {
                     var screenH = jQuery(window).height();
-                    var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']);?>";
+                    var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']); ?>";
                     var ptypeH = '';
-                    if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {
-                        ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();
+                    if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {
+                        ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();
                     }
 
-                    jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", heightVH - ptypeH + 'px');
+                    jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", heightVH - ptypeH + 'px');
 
                 }());
             </script>
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
          * @param array $geodir_map_options Array of map settings.
          * @param string $map_canvas_name The canvas name and ID for the map.
          */
-        do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);
+        do_action('geodir_map_after_render', $geodir_map_options, $map_canvas_name);
 
 
     endif; // Exclude posttypes if end

Please login to merge, or discard this patch.

geodirectory-functions/shortcode_functions.php 2 patches

Indentation +427 added lines, -427 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
  
 // If this file is called directly, abort.
 if (!defined('WPINC')) {
-    die;
+	die;
 }
 
 /**
@@ -22,22 +22,22 @@  discard block
 block discarded – undo
  */
 function gdsc_validate_measurements($value)
 {
-    if ((strlen($value) - 1) == strpos(trim($value), '%')) {
-        // $value is entered as a percent, so it can't be less than 0 or more than 100
-        $value = preg_replace('/\D/', '', $value);
-        if (100 < $value) {
-            $value = 100;
-        }
-        // Re-add the percent symbol
-        $value = $value . '%';
-    } elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
-        // Get the absint & re-add the 'px'
-        $value = preg_replace('/\D/', '', $value) . 'px';
-    } else {
-        $value = preg_replace('/\D/', '', $value);
-    }
+	if ((strlen($value) - 1) == strpos(trim($value), '%')) {
+		// $value is entered as a percent, so it can't be less than 0 or more than 100
+		$value = preg_replace('/\D/', '', $value);
+		if (100 < $value) {
+			$value = 100;
+		}
+		// Re-add the percent symbol
+		$value = $value . '%';
+	} elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
+		// Get the absint & re-add the 'px'
+		$value = preg_replace('/\D/', '', $value) . 'px';
+	} else {
+		$value = preg_replace('/\D/', '', $value);
+	}
 
-    return $value;
+	return $value;
 }
 
 /**
@@ -52,35 +52,35 @@  discard block
 block discarded – undo
 function gdsc_validate_map_args($params)
 {
 
-    $params['width'] = gdsc_validate_measurements($params['width']);
-    $params['height'] = gdsc_validate_measurements($params['height']);
+	$params['width'] = gdsc_validate_measurements($params['width']);
+	$params['height'] = gdsc_validate_measurements($params['height']);
 
-    // Only accept our 4 maptypes. Otherwise, revert to the default.
-    if (!(in_array(geodir_strtoupper($params['maptype']), array('HYBRID', 'SATELLITE', 'ROADMAP', 'TERRAIN')))) {
-        $params['maptype'] = 'ROADMAP';
-    } else {
-        $params['maptype'] = geodir_strtoupper($params['maptype']);
-    }
+	// Only accept our 4 maptypes. Otherwise, revert to the default.
+	if (!(in_array(geodir_strtoupper($params['maptype']), array('HYBRID', 'SATELLITE', 'ROADMAP', 'TERRAIN')))) {
+		$params['maptype'] = 'ROADMAP';
+	} else {
+		$params['maptype'] = geodir_strtoupper($params['maptype']);
+	}
 
-    // Zoom accepts a value between 1 and 19
-    $params['zoom'] = absint($params['zoom']);
-    if (19 < $params['zoom']) {
-        $params['zoom'] = '19';
-    }
-    if (0 == $params['zoom']) {
-        $params['zoom'] = '1';
-    }
+	// Zoom accepts a value between 1 and 19
+	$params['zoom'] = absint($params['zoom']);
+	if (19 < $params['zoom']) {
+		$params['zoom'] = '19';
+	}
+	if (0 == $params['zoom']) {
+		$params['zoom'] = '1';
+	}
 
-    // Child_collapse must be boolean
-    $params['child_collapse'] = gdsc_to_bool_val($params['child_collapse']);
+	// Child_collapse must be boolean
+	$params['child_collapse'] = gdsc_to_bool_val($params['child_collapse']);
 
-    // Scrollwheel must be boolean
-    $params['scrollwheel'] = gdsc_to_bool_val($params['scrollwheel']);
+	// Scrollwheel must be boolean
+	$params['scrollwheel'] = gdsc_to_bool_val($params['scrollwheel']);
 
-    // Scrollwheel must be boolean
-    $params['autozoom'] = gdsc_to_bool_val($params['autozoom']);
+	// Scrollwheel must be boolean
+	$params['autozoom'] = gdsc_to_bool_val($params['autozoom']);
 
-    return $params;
+	return $params;
 }
 
 /**
@@ -99,52 +99,52 @@  discard block
 block discarded – undo
  */
 function gdsc_to_bool_val($in, $strict = false)
 {
-    $out = null;
-
-    // if not strict, we only have to check if something is false
-    if (in_array($in, array(
-        'false',
-        'False',
-        'FALSE',
-        'no',
-        'No',
-        'n',
-        'N',
-        '0',
-        'off',
-        'Off',
-        'OFF',
-        false,
-        0,
-        null
-    ), true)) {
-        $out = false;
-    } else if ($strict) {
-        // if strict, check the equivalent true values
-        if (in_array($in, array(
-            'true',
-            'True',
-            'TRUE',
-            'yes',
-            'Yes',
-            'y',
-            'Y',
-            '1',
-            'on',
-            'On',
-            'ON',
-            true,
-            1
-        ), true)) {
-            $out = true;
-        }
-    } else {
-        // not strict? let the regular php bool check figure it out (will
-        //     largely default to true)
-        $out = ($in ? true : false);
-    }
+	$out = null;
+
+	// if not strict, we only have to check if something is false
+	if (in_array($in, array(
+		'false',
+		'False',
+		'FALSE',
+		'no',
+		'No',
+		'n',
+		'N',
+		'0',
+		'off',
+		'Off',
+		'OFF',
+		false,
+		0,
+		null
+	), true)) {
+		$out = false;
+	} else if ($strict) {
+		// if strict, check the equivalent true values
+		if (in_array($in, array(
+			'true',
+			'True',
+			'TRUE',
+			'yes',
+			'Yes',
+			'y',
+			'Y',
+			'1',
+			'on',
+			'On',
+			'ON',
+			true,
+			1
+		), true)) {
+			$out = true;
+		}
+	} else {
+		// not strict? let the regular php bool check figure it out (will
+		//     largely default to true)
+		$out = ($in ? true : false);
+	}
 
-    return $out;
+	return $out;
 }
 
 /**
@@ -157,16 +157,16 @@  discard block
 block discarded – undo
  */
 function gdsc_is_post_type_valid($incoming_post_type)
 {
-    $post_types = geodir_get_posttypes();
-    $post_types = array_map('geodir_strtolower', $post_types);
-    $post_type_found = false;
-    foreach ($post_types as $type) {
-        if (geodir_strtolower($incoming_post_type) == geodir_strtolower($type)) {
-            $post_type_found = true;
-        }
-    }
+	$post_types = geodir_get_posttypes();
+	$post_types = array_map('geodir_strtolower', $post_types);
+	$post_type_found = false;
+	foreach ($post_types as $type) {
+		if (geodir_strtolower($incoming_post_type) == geodir_strtolower($type)) {
+			$post_type_found = true;
+		}
+	}
 
-    return $post_type_found;
+	return $post_type_found;
 }
 
 /**
@@ -186,52 +186,52 @@  discard block
 block discarded – undo
  */
 function gdsc_listing_loop_filter($query)
 {
-    global $wp_query, $geodir_post_type, $table, $plugin_prefix, $term;
-
-    $geodir_post_type = geodir_get_current_posttype();
-
-    if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
-        $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');
-
-        if (isset($wp_query->query[$taxonomies[0]])) {
-            $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
-            $request_term = end($request_term);
-            if (!term_exists($request_term)) {
-                $args = array('number' => '1',);
-                $terms_arr = get_terms($taxonomies[0], $args);
-                foreach ($terms_arr as $location_term) {
-                    $term_arr = $location_term;
-                    $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
-                }
-                $wp_query->queried_object_id = 1;
-                $wp_query->queried_object = $term_arr;
-            }
-        }
+	global $wp_query, $geodir_post_type, $table, $plugin_prefix, $term;
+
+	$geodir_post_type = geodir_get_current_posttype();
+
+	if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
+		$taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');
+
+		if (isset($wp_query->query[$taxonomies[0]])) {
+			$request_term = explode("/", $wp_query->query[$taxonomies[0]]);
+			$request_term = end($request_term);
+			if (!term_exists($request_term)) {
+				$args = array('number' => '1',);
+				$terms_arr = get_terms($taxonomies[0], $args);
+				foreach ($terms_arr as $location_term) {
+					$term_arr = $location_term;
+					$term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
+				}
+				$wp_query->queried_object_id = 1;
+				$wp_query->queried_object = $term_arr;
+			}
+		}
 
-    }
-    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
+	}
+	if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
+		$table = $plugin_prefix . $geodir_post_type . '_detail';
 
-        add_filter('posts_fields', 'geodir_posts_fields', 1);
-        add_filter('posts_join', 'geodir_posts_join', 1);
-        geodir_post_where();
-        if (!is_admin()) {
-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);
-        }
+		add_filter('posts_fields', 'geodir_posts_fields', 1);
+		add_filter('posts_join', 'geodir_posts_join', 1);
+		geodir_post_where();
+		if (!is_admin()) {
+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);
+		}
 
-        // advanced filter for popular post view widget
-        global $wp_query;
-        if (!is_admin()) {
-            if (!empty($wp_query->query['with_pics_only'])) {
-                add_filter('posts_join', 'geodir_filter_widget_join', 1000);
-            }
-            add_filter('posts_where', 'geodir_filter_widget_where', 1000);
-        }
+		// advanced filter for popular post view widget
+		global $wp_query;
+		if (!is_admin()) {
+			if (!empty($wp_query->query['with_pics_only'])) {
+				add_filter('posts_join', 'geodir_filter_widget_join', 1000);
+			}
+			add_filter('posts_where', 'geodir_filter_widget_where', 1000);
+		}
 
-    }
+	}
 
-    return $query;
+	return $query;
 }
 
 /**
@@ -245,40 +245,40 @@  discard block
 block discarded – undo
  */
 function gdsc_manage_category_choice($post_type, $category)
 {
-    if (0 == $category || '' == $category) {
-        return '';
-    }
+	if (0 == $category || '' == $category) {
+		return '';
+	}
 
-    if (!(gdsc_is_post_type_valid($post_type))) {
-        return '';
-    }
+	if (!(gdsc_is_post_type_valid($post_type))) {
+		return '';
+	}
 
-    $taxonomies = geodir_get_taxonomies($post_type);
+	$taxonomies = geodir_get_taxonomies($post_type);
 
-    $categories = get_terms(array('taxonomy' => $taxonomies[0],'hide_empty' => false));
+	$categories = get_terms(array('taxonomy' => $taxonomies[0],'hide_empty' => false));
 
-    $cat_id = 0;
+	$cat_id = 0;
 
-    foreach ($categories as $cat) {
-        if (is_numeric($category)) {
-            if (absint($category) == $cat->term_id) {
-                $cat_id = $cat->term_id;
-                break;
-            }
-        } else {
-            if ($category == $cat->slug) {
-                $cat_id = $cat->term_id;
-                break;
-            }
+	foreach ($categories as $cat) {
+		if (is_numeric($category)) {
+			if (absint($category) == $cat->term_id) {
+				$cat_id = $cat->term_id;
+				break;
+			}
+		} else {
+			if ($category == $cat->slug) {
+				$cat_id = $cat->term_id;
+				break;
+			}
 
-            if ($category == $cat->name) {
-                $cat_id = $cat->term_id;
-                break;
-            }
-        }
-    }
+			if ($category == $cat->name) {
+				$cat_id = $cat->term_id;
+				break;
+			}
+		}
+	}
 
-    return $cat_id;
+	return $cat_id;
 }
 
 // @todo: Extract this
@@ -288,11 +288,11 @@  discard block
 block discarded – undo
 	 * Adds the script in the page footer for the home page google map.
 	 *
 	 * @since 1.0.0
-     * @return string Print the script in page footer.
+	 * @return string Print the script in page footer.
 	 */
 	function geodir_home_map_add_script()
-    {
-        ?>
+	{
+		?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
                 geoDirMapSlide();
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
             }
         </script>
     <?php
-    }
+	}
 }
 
 /**
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
  */
 function geodir_popular_category_add_scripts()
 {
-    ?>
+	?>
     <script type="text/javascript">
         jQuery(function ($) {
             $('.geodir-showcat').click(function () {
@@ -406,56 +406,56 @@  discard block
 block discarded – undo
  */
 function gdsc_validate_layout_choice($layout_choice)
 {
-    switch (geodir_strtolower($layout_choice)) {
-        case 'list';
-        case 'one';
-        case 'one_column';
-        case 'onecolumn';
-        case '1';
-            $layout_choice = 'list';
-            break;
-        case 'gridview_onehalf';
-        case 'two';
-        case 'two_column';
-        case 'two_columns';
-        case 'twocolumn';
-        case 'twocolumns';
-        case '2';
-            $layout_choice = 'gridview_onehalf';
-            break;
-        case 'gridview_onethird';
-        case 'three';
-        case 'three_column';
-        case 'three_columns';
-        case 'threecolumn';
-        case 'threecolumns';
-        case '3';
-            $layout_choice = 'gridview_onethird';
-            break;
-        case 'gridview_onefourth';
-        case 'four';
-        case 'four_column';
-        case 'four_columns';
-        case 'fourcolumn';
-        case 'fourcolumns';
-        case '4';
-            $layout_choice = 'gridview_onefourth';
-            break;
-        case 'gridview_onefifth';
-        case 'five';
-        case 'five_column';
-        case 'five_columns';
-        case 'fivecolumn';
-        case 'fivecolumns';
-        case '5';
-            $layout_choice = 'gridview_onefifth';
-            break;
-        default:
-            $layout_choice = 'gridview_onehalf';
-            break;
-    }
+	switch (geodir_strtolower($layout_choice)) {
+		case 'list';
+		case 'one';
+		case 'one_column';
+		case 'onecolumn';
+		case '1';
+			$layout_choice = 'list';
+			break;
+		case 'gridview_onehalf';
+		case 'two';
+		case 'two_column';
+		case 'two_columns';
+		case 'twocolumn';
+		case 'twocolumns';
+		case '2';
+			$layout_choice = 'gridview_onehalf';
+			break;
+		case 'gridview_onethird';
+		case 'three';
+		case 'three_column';
+		case 'three_columns';
+		case 'threecolumn';
+		case 'threecolumns';
+		case '3';
+			$layout_choice = 'gridview_onethird';
+			break;
+		case 'gridview_onefourth';
+		case 'four';
+		case 'four_column';
+		case 'four_columns';
+		case 'fourcolumn';
+		case 'fourcolumns';
+		case '4';
+			$layout_choice = 'gridview_onefourth';
+			break;
+		case 'gridview_onefifth';
+		case 'five';
+		case 'five_column';
+		case 'five_columns';
+		case 'fivecolumn';
+		case 'fivecolumns';
+		case '5';
+			$layout_choice = 'gridview_onefifth';
+			break;
+		default:
+			$layout_choice = 'gridview_onehalf';
+			break;
+	}
 
-    return $layout_choice;
+	return $layout_choice;
 }
 
 /**
@@ -472,34 +472,34 @@  discard block
 block discarded – undo
  */
 function gdsc_validate_sort_choice($sort_choice, $post_type = '')
 {
-    global $plugin_prefix;
-
-    $sorts = array(
-        'az',
-        'latest',
-        'featured',
-        'high_review',
-        'high_rating',
-        'random',
-    );
-
-    if (in_array($sort_choice, $sorts)) {
-        return $sort_choice;
-    }
+	global $plugin_prefix;
+
+	$sorts = array(
+		'az',
+		'latest',
+		'featured',
+		'high_review',
+		'high_rating',
+		'random',
+	);
+
+	if (in_array($sort_choice, $sorts)) {
+		return $sort_choice;
+	}
 
-    if (!empty($post_type)) {
-        $table = $plugin_prefix . $post_type . '_detail';
+	if (!empty($post_type)) {
+		$table = $plugin_prefix . $post_type . '_detail';
         
-        if (!geodir_prepare_custom_sorting($sort_choice, $table)) {
-            $sort_choice = '';
-        }
-    }
+		if (!geodir_prepare_custom_sorting($sort_choice, $table)) {
+			$sort_choice = '';
+		}
+	}
 
-    if (empty($post_type) || empty($sort_choice)) {
-        $sort_choice = 'latest';
-    }
+	if (empty($post_type) || empty($sort_choice)) {
+		$sort_choice = 'latest';
+	}
 
-    return $sort_choice;
+	return $sort_choice;
 }
 
 /**
@@ -512,22 +512,22 @@  discard block
 block discarded – undo
  */
 function gdsc_validate_listing_width($width_choice)
 {
-    if (!(empty($width_choice))) {
-        $width_choice = absint($width_choice);
-    } else {
-        return '';
-    }
+	if (!(empty($width_choice))) {
+		$width_choice = absint($width_choice);
+	} else {
+		return '';
+	}
 
-    if (100 < $width_choice) {
-        $width_choice = 100;
-    }
+	if (100 < $width_choice) {
+		$width_choice = 100;
+	}
 
-    // If listing_width is too narrow, it won't work, arbitrarily set to 10% here
-    if (10 > $width_choice) {
-        $width_choice = 10;
-    }
+	// If listing_width is too narrow, it won't work, arbitrarily set to 10% here
+	if (10 > $width_choice) {
+		$width_choice = 10;
+	}
 
-    return $width_choice;
+	return $width_choice;
 }
 
 /**
@@ -540,18 +540,18 @@  discard block
 block discarded – undo
  */
 function gdsc_validate_list_filter_choice($filter_choice)
 {
-    $filters = array(
-        'all',
-        'today',
-        'upcoming',
-        'past',
-    );
-
-    if (!(in_array($filter_choice, $filters))) {
-        $filter_choice = 'all';
-    }
+	$filters = array(
+		'all',
+		'today',
+		'upcoming',
+		'past',
+	);
+
+	if (!(in_array($filter_choice, $filters))) {
+		$filter_choice = 'all';
+	}
 
-    return $filter_choice;
+	return $filter_choice;
 }
 
 /**
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
  * @return string Listings HTML content.
  */
 function geodir_sc_gd_listings_output($args = array()) {
-    $title				 = !empty($args['title']) ? __($args['title'], 'geodirectory') : '';
+	$title				 = !empty($args['title']) ? __($args['title'], 'geodirectory') : '';
 	$post_type 			 = !empty($args['post_type']) ? $args['post_type'] : 'gd_place';
 	$category 			 = !empty($args['category']) ? $args['category'] : '0';
 	$post_number		 = !empty($args['post_number']) ? $args['post_number'] : 10;
@@ -585,17 +585,17 @@  discard block
 block discarded – undo
 	$listing_width 		 = !empty($args['listing_width']) ? $args['listing_width'] : '';
 	$with_pagination 	 = !empty($args['with_pagination']) ? true : false;
 	$event_type 	 	 = !empty($args['event_type']) ? $args['event_type'] : '';
-    $shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
-    $tags                = !empty($args['tags']) ? $args['tags'] : array();
-    /**
-     * Filter the content text displayed when no listings found.
-     *
-     * @since 1.6.0
-     *
-     * @param string $shortcode_content The shortcode content text.
-     * @param array $args Array of arguements to filter listings.
-     */
-    $shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
+	$shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
+	$tags                = !empty($args['tags']) ? $args['tags'] : array();
+	/**
+	 * Filter the content text displayed when no listings found.
+	 *
+	 * @since 1.6.0
+	 *
+	 * @param string $shortcode_content The shortcode content text.
+	 * @param array $args Array of arguements to filter listings.
+	 */
+	$shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
 		
 	$top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
 	$bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
@@ -607,92 +607,92 @@  discard block
 block discarded – undo
 	$pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
 	
 	$query_args = array(
-        'posts_per_page' => $post_number,
-        'is_geodir_loop' => true,
-        'gd_location' => $add_location_filter,
-        'post_type' => $post_type,
-        'order_by' => $list_sort,
+		'posts_per_page' => $post_number,
+		'is_geodir_loop' => true,
+		'gd_location' => $add_location_filter,
+		'post_type' => $post_type,
+		'order_by' => $list_sort,
 		'pageno' => $pageno
-    );
+	);
 
-    if ($character_count >= 0) {
-        $query_args['excerpt_length'] = $character_count;
-    }
+	if ($character_count >= 0) {
+		$query_args['excerpt_length'] = $character_count;
+	}
     
-    if (!empty($args['post_author'])) {
-        $query_args['post_author'] = $args['post_author'];
-    }
+	if (!empty($args['post_author'])) {
+		$query_args['post_author'] = $args['post_author'];
+	}
 
-    if (!empty($args['show_featured_only'])) {
-        $query_args['show_featured_only'] = 1;
-    }
+	if (!empty($args['show_featured_only'])) {
+		$query_args['show_featured_only'] = 1;
+	}
 
-    if (!empty($args['show_special_only'])) {
-        $query_args['show_special_only'] = 1;
-    }
+	if (!empty($args['show_special_only'])) {
+		$query_args['show_special_only'] = 1;
+	}
 
-    if (!empty($args['with_pics_only'])) {
-        $query_args['with_pics_only'] = 0;
-        $query_args['featured_image_only'] = 1;
-    }
+	if (!empty($args['with_pics_only'])) {
+		$query_args['with_pics_only'] = 0;
+		$query_args['featured_image_only'] = 1;
+	}
 
-    if (!empty($args['with_videos_only'])) {
-        $query_args['with_videos_only'] = 1;
-    }
+	if (!empty($args['with_videos_only'])) {
+		$query_args['with_videos_only'] = 1;
+	}
     
-    if (!empty($args['show_favorites_only'])) {
-        $query_args['show_favorites_only'] = 1;
-        $query_args['favorites_by_user'] = !empty($args['favorites_by_user']) ? $args['favorites_by_user'] : 0;
-    }
-    $with_no_results = !empty($args['without_no_results']) ? false : true;
+	if (!empty($args['show_favorites_only'])) {
+		$query_args['show_favorites_only'] = 1;
+		$query_args['favorites_by_user'] = !empty($args['favorites_by_user']) ? $args['favorites_by_user'] : 0;
+	}
+	$with_no_results = !empty($args['without_no_results']) ? false : true;
 
-    if (!empty($category) && isset($category[0]) && $category[0] != '0') {
-        $category_taxonomy = geodir_get_taxonomies($post_type);
+	if (!empty($category) && isset($category[0]) && $category[0] != '0') {
+		$category_taxonomy = geodir_get_taxonomies($post_type);
 
-        ######### WPML #########
-        if (geodir_wpml_is_taxonomy_translated($category_taxonomy[0])) {
-            $category = gd_lang_object_ids($category, $category_taxonomy[0]);
-        }
-        ######### WPML #########
+		######### WPML #########
+		if (geodir_wpml_is_taxonomy_translated($category_taxonomy[0])) {
+			$category = gd_lang_object_ids($category, $category_taxonomy[0]);
+		}
+		######### WPML #########
 
-        $tax_query = array(
-            'taxonomy' => $category_taxonomy[0],
-            'field' => 'id',
-            'terms' => $category
-        );
+		$tax_query = array(
+			'taxonomy' => $category_taxonomy[0],
+			'field' => 'id',
+			'terms' => $category
+		);
 
-        $query_args['tax_query'] = array($tax_query);
-    }
+		$query_args['tax_query'] = array($tax_query);
+	}
     
-    if (!empty($tags)) {
-        // Clean tags
-        if (!is_array($tags)) {
-            $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
-                $tags = str_replace($comma, ',', $tags);
-            }
-            $tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
-            $tags = array_map('trim', $tags);
-        }
+	if (!empty($tags)) {
+		// Clean tags
+		if (!is_array($tags)) {
+			$comma = _x(',', 'tag delimiter');
+			if ( ',' !== $comma ) {
+				$tags = str_replace($comma, ',', $tags);
+			}
+			$tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
+			$tags = array_map('trim', $tags);
+		}
         
-        if (!empty($tags)) {
-            $tag_query = array(
-                'taxonomy' => $post_type . '_tags',
-                'field' => 'name',
-                'terms' => $tags
-            );
-
-            if (!empty($query_args['tax_query'])) {
-                $query_args['tax_query'][] = $tag_query;
-            } else {
-                $query_args['tax_query'] = array($tag_query);
-            }
-        }
-    }
+		if (!empty($tags)) {
+			$tag_query = array(
+				'taxonomy' => $post_type . '_tags',
+				'field' => 'name',
+				'terms' => $tags
+			);
+
+			if (!empty($query_args['tax_query'])) {
+				$query_args['tax_query'][] = $tag_query;
+			} else {
+				$query_args['tax_query'] = array($tag_query);
+			}
+		}
+	}
 
-    global $gridview_columns_widget, $geodir_is_widget_listing;
+	global $gridview_columns_widget, $geodir_is_widget_listing;
 
-    if ($post_type == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
+	if ($post_type == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
 		global $geodir_event_widget_listview;
 		$geodir_event_widget_listview = true;
 		
@@ -707,16 +707,16 @@  discard block
 block discarded – undo
 		$widget_listings = $total_posts > 0 ? geodir_get_widget_listings($query_args) : array();
 	}
 	$current_gridview_columns_widget = $gridview_columns_widget;
-    $identifier = ' gd-wgt-pagi-' . mt_rand();
-    ob_start();
+	$identifier = ' gd-wgt-pagi-' . mt_rand();
+	ob_start();
 	if (!empty($widget_listings) || $with_no_results) {
 		if (!$geodir_ajax) {
-        /**
-         * Called before the shortcode [gd_listings] content is output.
-         *
-         * @since 1.0.0
-         */
-        do_action('geodir_before_sc_gd_listings');
+		/**
+		 * Called before the shortcode [gd_listings] content is output.
+		 *
+		 * @since 1.0.0
+		 */
+		do_action('geodir_before_sc_gd_listings');
 		?>
         <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier;?>">
             <?php if ($title != '') { ?>
@@ -727,63 +727,63 @@  discard block
 block discarded – undo
             <div class="gd-sc-loader">
                 <div class="gd-sc-content">
             <?php }
-            if (!(empty($widget_listings) && !empty($shortcode_content))) {
-                if (strstr($layout, 'gridview')) {
-                    $listing_view_exp = explode('_', $layout);
-                    $gridview_columns_widget = $layout;
-                    $layout = $listing_view_exp[0];
-                } else {
-                    $gridview_columns_widget = '';
-                }
-
-                /**
-                 * Filter the widget listing listview template.
-                 *
-                 * @since 1.0.0
-                 *
-                 * @param string The template file to display listing.
-                 */
-                $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
+			if (!(empty($widget_listings) && !empty($shortcode_content))) {
+				if (strstr($layout, 'gridview')) {
+					$listing_view_exp = explode('_', $layout);
+					$gridview_columns_widget = $layout;
+					$layout = $listing_view_exp[0];
+				} else {
+					$gridview_columns_widget = '';
+				}
+
+				/**
+				 * Filter the widget listing listview template.
+				 *
+				 * @since 1.0.0
+				 *
+				 * @param string The template file to display listing.
+				 */
+				$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
                             
-                global $post, $map_jason, $map_canvas_arr, $gd_session;
-
-                $current_post = $post;
-                $current_map_jason = $map_jason;
-                $current_map_canvas_arr = $map_canvas_arr;
-                $geodir_is_widget_listing = true;
-                $gd_session->un_set('gd_listing_view');
-
-                if ($with_pagination && $top_pagination) {				
-                    echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
-                }
-
-                /**
-                 * Includes listing listview template.
-                 *
-                 * @since 1.0.0
-                 */
-                include($template);
+				global $post, $map_jason, $map_canvas_arr, $gd_session;
+
+				$current_post = $post;
+				$current_map_jason = $map_jason;
+				$current_map_canvas_arr = $map_canvas_arr;
+				$geodir_is_widget_listing = true;
+				$gd_session->un_set('gd_listing_view');
+
+				if ($with_pagination && $top_pagination) {				
+					echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+				}
+
+				/**
+				 * Includes listing listview template.
+				 *
+				 * @since 1.0.0
+				 */
+				include($template);
                 
-                if ($with_pagination && $bottom_pagination) {				
-                    echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
-                }
-
-                $geodir_is_widget_listing = false;
-
-                $GLOBALS['post'] = $current_post;
-                if (!empty($current_post)) {
-                    setup_postdata($current_post);
-                }
-                $map_jason = $current_map_jason;
-                $map_canvas_arr = $current_map_canvas_arr;
-                global $gridview_columns_widget;
-                $gridview_columns_widget = $current_gridview_columns_widget;
-            } else {
-                echo $shortcode_content;
-            }
+				if ($with_pagination && $bottom_pagination) {				
+					echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+				}
+
+				$geodir_is_widget_listing = false;
+
+				$GLOBALS['post'] = $current_post;
+				if (!empty($current_post)) {
+					setup_postdata($current_post);
+				}
+				$map_jason = $current_map_jason;
+				$map_canvas_arr = $current_map_canvas_arr;
+				global $gridview_columns_widget;
+				$gridview_columns_widget = $current_gridview_columns_widget;
+			} else {
+				echo $shortcode_content;
+			}
 			?>
 			<?php
-            if (!$geodir_ajax) { 
+			if (!$geodir_ajax) { 
 			?>
             </div><p class="geodir-sclisting-loading" style="display:none;"><i class="fas fa-cog fa-spin"></i></p></div>
 <script type="text/javascript">
@@ -822,10 +822,10 @@  discard block
 block discarded – undo
             loading.hide();
             jQuery(items).html(response);
             <?php
-              /**
-               * if lazyload images enabled then refresh them once ajax page changed.
-               */
-              if (get_option('geodir_lazy_load', 1)) { ?>
+			  /**
+			   * if lazyload images enabled then refresh them once ajax page changed.
+			   */
+			  if (get_option('geodir_lazy_load', 1)) { ?>
               geodir_init_lazy_load();
               <?php } ?>
         }
@@ -836,11 +836,11 @@  discard block
 block discarded – undo
 </div>
 		<?php } ?>
     <?php
-    }
+	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -867,15 +867,15 @@  discard block
 block discarded – undo
  * @return string Listings pagination HTML content.
  */
 function geodir_sc_listings_pagination($total_posts, $posts_per_page, $pageno, $before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {
-    if (empty($prelabel)) {
-        $prelabel = '<strong>&laquo;</strong>';
-    }
+	if (empty($prelabel)) {
+		$prelabel = '<strong>&laquo;</strong>';
+	}
 
-    if (empty($nxtlabel)) {
-        $nxtlabel = '<strong>&raquo;</strong>';
-    }
+	if (empty($nxtlabel)) {
+		$nxtlabel = '<strong>&raquo;</strong>';
+	}
 
-    $half_pages_to_show = round($pages_to_show / 2);
+	$half_pages_to_show = round($pages_to_show / 2);
 
 	$numposts = $total_posts;
 
@@ -908,7 +908,7 @@  discard block
 block discarded – undo
 		}
 		
 		if (($pageno - 1) > 0) {
-            echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a>&nbsp;';
+			echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a>&nbsp;';
 		}
 		
 		for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
@@ -931,9 +931,9 @@  discard block
 block discarded – undo
 		echo "</div> $after </div>";
 	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -944,10 +944,10 @@  discard block
 block discarded – undo
  * @return string Listings HTML content.
  */
 function geodir_sclistings_callback() {
-    check_ajax_referer('geodir-sclistings-nonce', 'geodir_sclistings_nonce');
-    //set variables
-    $scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
-    $pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
+	check_ajax_referer('geodir-sclistings-nonce', 'geodir_sclistings_nonce');
+	//set variables
+	$scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
+	$pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
 	
 	$shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
 	
@@ -959,7 +959,7 @@  discard block
 block discarded – undo
 	} else {
 		echo 0;
 	}
-    wp_die();
+	wp_die();
 }
 add_action('wp_ajax_geodir_sclistings', 'geodir_sclistings_callback');
 add_action('wp_ajax_nopriv_geodir_sclistings', 'geodir_sclistings_callback');
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -29,10 +29,10 @@  discard block
 block discarded – undo
             $value = 100;
         }
         // Re-add the percent symbol
-        $value = $value . '%';
+        $value = $value.'%';
     } elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
         // Get the absint & re-add the 'px'
-        $value = preg_replace('/\D/', '', $value) . 'px';
+        $value = preg_replace('/\D/', '', $value).'px';
     } else {
         $value = preg_replace('/\D/', '', $value);
     }
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
     }
     if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
+        $table = $plugin_prefix.$geodir_post_type.'_detail';
 
         add_filter('posts_fields', 'geodir_posts_fields', 1);
         add_filter('posts_join', 'geodir_posts_join', 1);
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
 
     $taxonomies = geodir_get_taxonomies($post_type);
 
-    $categories = get_terms(array('taxonomy' => $taxonomies[0],'hide_empty' => false));
+    $categories = get_terms(array('taxonomy' => $taxonomies[0], 'hide_empty' => false));
 
     $cat_id = 0;
 
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
     }
 
     if (!empty($post_type)) {
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
         
         if (!geodir_prepare_custom_sorting($sort_choice, $table)) {
             $sort_choice = '';
@@ -581,10 +581,10 @@  discard block
 block discarded – undo
 	$add_location_filter = !empty($args['add_location_filter']) ? true : false;
 	$list_sort 			 = !empty($args['list_sort']) ? $args['list_sort'] : 'latest';
 	$character_count	 = isset($args['character_count']) ? $args['character_count'] : '';
-	$layout 			 = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
+	$layout = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
 	$listing_width 		 = !empty($args['listing_width']) ? $args['listing_width'] : '';
-	$with_pagination 	 = !empty($args['with_pagination']) ? true : false;
-	$event_type 	 	 = !empty($args['event_type']) ? $args['event_type'] : '';
+	$with_pagination = !empty($args['with_pagination']) ? true : false;
+	$event_type = !empty($args['event_type']) ? $args['event_type'] : '';
     $shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
     $tags                = !empty($args['tags']) ? $args['tags'] : array();
     /**
@@ -598,13 +598,13 @@  discard block
 block discarded – undo
     $shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
 		
 	$top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
-	$bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
+	$bottom_pagination = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
 	
 	$shortcode_atts		 = !empty($args['shortcode_atts']) ? $args['shortcode_atts'] : array();
 
 	// ajax mode
-	$geodir_ajax		 = !empty($args['geodir_ajax']) ? true : false;
-	$pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
+	$geodir_ajax = !empty($args['geodir_ajax']) ? true : false;
+	$pageno = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
 	
 	$query_args = array(
         'posts_per_page' => $post_number,
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
         // Clean tags
         if (!is_array($tags)) {
             $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
+            if (',' !== $comma) {
                 $tags = str_replace($comma, ',', $tags);
             }
             $tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
         
         if (!empty($tags)) {
             $tag_query = array(
-                'taxonomy' => $post_type . '_tags',
+                'taxonomy' => $post_type.'_tags',
                 'field' => 'name',
                 'terms' => $tags
             );
@@ -707,7 +707,7 @@  discard block
 block discarded – undo
 		$widget_listings = $total_posts > 0 ? geodir_get_widget_listings($query_args) : array();
 	}
 	$current_gridview_columns_widget = $gridview_columns_widget;
-    $identifier = ' gd-wgt-pagi-' . mt_rand();
+    $identifier = ' gd-wgt-pagi-'.mt_rand();
     ob_start();
 	if (!empty($widget_listings) || $with_no_results) {
 		if (!$geodir_ajax) {
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
          */
         do_action('geodir_before_sc_gd_listings');
 		?>
-        <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier;?>">
+        <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier; ?>">
             <?php if ($title != '') { ?>
             <div class="geodir_list_heading clearfix">
                 <?php echo $title; ?>
@@ -788,8 +788,8 @@  discard block
 block discarded – undo
             </div><p class="geodir-sclisting-loading" style="display:none;"><i class="fas fa-cog fa-spin"></i></p></div>
 <script type="text/javascript">
 /* <![CDATA[ */
-jQuery(document).on('click', '.<?php echo trim($identifier);?> .gd-wgt-page', function(e) {
-    var container = jQuery( '.<?php echo trim($identifier);?>');
+jQuery(document).on('click', '.<?php echo trim($identifier); ?> .gd-wgt-page', function(e) {
+    var container = jQuery( '.<?php echo trim($identifier); ?>');
     var obj = this;
     var pid = parseInt(jQuery(this).data('page'));
     var items = jQuery(obj).closest('.gd-sc-content');
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
         return false;
     }
     
-    var scatts = "<?php echo addslashes(json_encode($shortcode_atts));?>";
+    var scatts = "<?php echo addslashes(json_encode($shortcode_atts)); ?>";
     
     var data = {
       'action': 'geodir_sclistings',
@@ -889,16 +889,16 @@  discard block
 block discarded – undo
 	if ($max_page > 1 || $always_show) {
 		// Extra pagination info
 		$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
-		$start_no = ( $pageno - 1 ) * $posts_per_page + 1;
+		$start_no = ($pageno - 1) * $posts_per_page + 1;
 		$end_no = min($pageno * $posts_per_page, $numposts);
 		
 		if ($geodir_pagination_more_info != '') {
-			$pagination_info = '<div class="gd-pagination-details gd-pagination-details-' . $geodir_pagination_more_info . '">' . wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts) . '</div>';
+			$pagination_info = '<div class="gd-pagination-details gd-pagination-details-'.$geodir_pagination_more_info.'">'.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;
+				$before = $before.$pagination_info;
 			} else if ($geodir_pagination_more_info == 'after') {
-				$after = $pagination_info . $after;
+				$after = $pagination_info.$after;
 			}
 		}
 			
@@ -908,7 +908,7 @@  discard block
 block discarded – undo
 		}
 		
 		if (($pageno - 1) > 0) {
-            echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a>&nbsp;';
+            echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="'.(int) ($pageno - 1).'" href="javascript:void(0);">'.$prelabel.'</a>&nbsp;';
 		}
 		
 		for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
@@ -916,17 +916,17 @@  discard block
 block discarded – undo
 				if ($i == $pageno) {
 					echo "<strong class='on' class='gd-page-sc-act'>$i</strong>";
 				} else {
-					echo ' <a class="gd-page-sc-no gd-wgt-page" data-page="' . (int)$i . '" href="javascript:void(0);">' . $i . '</a> ';
+					echo ' <a class="gd-page-sc-no gd-wgt-page" data-page="'.(int) $i.'" href="javascript:void(0);">'.$i.'</a> ';
 				}
 			}
 		}
 		
 		if (($pageno + 1) <= $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-nxt gd-wgt-page" data-page="' . (int)($pageno + 1) . '" href="javascript:void(0);">' . $nxtlabel . '</a>';
+			echo '&nbsp;<a class="gd-page-sc-nxt gd-wgt-page" data-page="'.(int) ($pageno + 1).'" href="javascript:void(0);">'.$nxtlabel.'</a>';
 		}
 		
 		if ($pageno < $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-lst gd-wgt-page" data-page="' . (int)$max_page . '" href="javascript:void(0);">&raquo;</a>';
+			echo '&nbsp;<a class="gd-page-sc-lst gd-wgt-page" data-page="'.(int) $max_page.'" href="javascript:void(0);">&raquo;</a>';
 		}
 		echo "</div> $after </div>";
 	}
@@ -949,7 +949,7 @@  discard block
 block discarded – undo
     $scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
     $pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
 	
-	$shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
+	$shortcode_atts = !empty($scatts) ? (array) json_decode(stripslashes_deep($scatts)) : NULL;
 	
 	if (!empty($shortcode_atts) && is_array($shortcode_atts)) {
 		$shortcode_atts['pageno'] = $pageno;

Please login to merge, or discard this patch.

geodirectory-functions/custom_fields_input_functions.php 1 patch

Spacing +233 added lines, -233 removed lines patch added patch discarded remove patch

@@ -17,12 +17,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_fieldset($html,$cf){
+function geodir_cfi_fieldset($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_fieldset_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_fieldset_{$html_var}")) {
         /**
          * Filter the fieldset html by individual custom field.
          *
@@ -30,18 +30,18 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         ?>
         <h5 id="geodir_fieldset_<?php echo (int) $cf['id']; ?>" class="geodir-fieldset-row"
-            gd-fieldset="<?php echo (int) $cf['id']; ?>"><?php echo __( $cf['site_title'], 'geodirectory' ); ?>
-            <?php if ( $cf['desc'] != '' ) {
-                echo '<small>( ' . __( $cf['desc'], 'geodirectory' ) . ' )</small>';
+            gd-fieldset="<?php echo (int) $cf['id']; ?>"><?php echo __($cf['site_title'], 'geodirectory'); ?>
+            <?php if ($cf['desc'] != '') {
+                echo '<small>( '.__($cf['desc'], 'geodirectory').' )</small>';
             } ?></h5>
         <?php
         $html = ob_get_clean();
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_fieldset','geodir_cfi_fieldset',10,2);
+add_filter('geodir_custom_field_input_fieldset', 'geodir_cfi_fieldset', 10, 2);
 
 
 
@@ -62,12 +62,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_text($html,$cf){
+function geodir_cfi_text($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_text_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_text_{$html_var}")) {
         /**
          * Filter the text html by individual custom field.
          *
@@ -75,41 +75,41 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_text_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_text_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
 
         $value = geodir_get_cf_value($cf);
         $type = $cf['type'];
         //number and float validation $validation_pattern
-        if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';}
-        elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
+        if (isset($cf['data_type']) && $cf['data_type'] == 'INT') {$type = 'number'; }
+        elseif (isset($cf['data_type']) && $cf['data_type'] == 'FLOAT') {$type = 'float'; }
 
         //validation
-        if(isset($cf['validation_pattern']) && $cf['validation_pattern']){
+        if (isset($cf['validation_pattern']) && $cf['validation_pattern']) {
             $validation = 'pattern="'.$cf['validation_pattern'].'"';
-        }else{$validation='';}
+        } else {$validation = ''; }
 
         // validation message
-        if(isset($cf['validation_msg']) && $cf['validation_msg']){
+        if (isset($cf['validation_msg']) && $cf['validation_msg']) {
             $validation_msg = 'title="'.$cf['validation_msg'].'"';
-        }else{$validation_msg='';}
+        } else {$validation_msg = ''; }
         ?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $type;?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <input field_type="<?php echo $type; ?>" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="<?php echo $type; ?>" class="geodir_textfield" <?php echo $validation; echo $validation_msg; ?> />
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_text','geodir_cfi_text',10,2);
+add_filter('geodir_custom_field_input_text', 'geodir_cfi_text', 10, 2);
 
 
 /**
@@ -133,12 +133,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_email($html,$cf){
+function geodir_cfi_email($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_email_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_email_{$html_var}")) {
         /**
          * Filter the email html by individual custom field.
          *
@@ -146,11 +146,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_email_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_email_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -159,16 +159,16 @@  discard block
 block discarded – undo
             $value = '';
         }?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php  echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="email" class="geodir_textfield"/>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_email','geodir_cfi_email',10,2);
+add_filter('geodir_custom_field_input_email', 'geodir_cfi_email', 10, 2);
 
 
 
@@ -193,12 +193,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_phone($html,$cf){
+function geodir_cfi_phone($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_phone_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_phone_{$html_var}")) {
         /**
          * Filter the phone html by individual custom field.
          *
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_phone_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_phone_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -219,16 +219,16 @@  discard block
 block discarded – undo
             $value = '';
         }?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php  echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="tel" class="geodir_textfield"/>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_phone','geodir_cfi_phone',10,2);
+add_filter('geodir_custom_field_input_phone', 'geodir_cfi_phone', 10, 2);
 
 
 
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_url($html,$cf){
+function geodir_cfi_url($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_url_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_url_{$html_var}")) {
         /**
          * Filter the url html by individual custom field.
          *
@@ -266,11 +266,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_url_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_url_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -279,19 +279,19 @@  discard block
 block discarded – undo
             $value = '';
         }?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="url" class="geodir_textfield"
                    oninvalid="setCustomValidity('<?php _e('Please enter a valid URL including http://', 'geodirectory'); ?>')"
                    onchange="try{setCustomValidity('')}catch(e){}"
             />
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_url','geodir_cfi_url',10,2);
+add_filter('geodir_custom_field_input_url', 'geodir_cfi_url', 10, 2);
 
 
 /**
@@ -315,12 +315,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_radio($html,$cf){
+function geodir_cfi_radio($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_radio_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_radio_{$html_var}")) {
         /**
          * Filter the radio html by individual custom field.
          *
@@ -328,22 +328,22 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_radio_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_radio_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
 
         ?>
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <?php if ($cf['option_values']) {
                 $option_values = geodir_string_values_to_options($cf['option_values'], true);
@@ -352,14 +352,14 @@  discard block
 block discarded – undo
                     foreach ($option_values as $option_value) {
                         if (empty($option_value['optgroup'])) {
                             ?>
-                            <span class="gd-radios"><input name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" <?php checked(stripslashes($value), $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="radio" /><?php echo $option_value['label']; ?></span>
+                            <span class="gd-radios"><input name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>" <?php checked(stripslashes($value), $option_value['value']); ?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $cf['type']; ?>" type="radio" /><?php echo $option_value['label']; ?></span>
                             <?php
                         }
                     }
                 }
             }
             ?>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_radio','geodir_cfi_radio',10,2);
+add_filter('geodir_custom_field_input_radio', 'geodir_cfi_radio', 10, 2);
 
 
 /**
@@ -383,12 +383,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_checkbox($html,$cf){
+function geodir_cfi_checkbox($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_checkbox_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_checkbox_{$html_var}")) {
         /**
          * Filter the checkbox html by individual custom field.
          *
@@ -396,11 +396,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -411,22 +411,22 @@  discard block
 block discarded – undo
         }
         ?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <?php if ($value != '1') {
                 $value = '0';
             }?>
-            <input type="hidden" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" value="<?php echo esc_attr($value);?>"/>
+            <input type="hidden" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>" value="<?php echo esc_attr($value); ?>"/>
             <input  <?php if ($value == '1') {
                 echo 'checked="checked"';
-            }?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="checkbox"
-                 onchange="if(this.checked){jQuery('#<?php echo $cf['name'];?>').val('1');} else{ jQuery('#<?php echo $cf['name'];?>').val('0');}"/>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            }?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type']; ?>" type="checkbox"
+                 onchange="if(this.checked){jQuery('#<?php echo $cf['name']; ?>').val('1');} else{ jQuery('#<?php echo $cf['name']; ?>').val('0');}"/>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_checkbox','geodir_cfi_checkbox',10,2);
+add_filter('geodir_custom_field_input_checkbox', 'geodir_cfi_checkbox', 10, 2);
 
 
 /**
@@ -450,12 +450,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_textarea($html,$cf){
+function geodir_cfi_textarea($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_textarea_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_textarea_{$html_var}")) {
         /**
          * Filter the textarea html by individual custom field.
          *
@@ -463,11 +463,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_textarea_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_textarea_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -475,32 +475,32 @@  discard block
 block discarded – undo
         $extra_fields = unserialize($cf['extra_fields']);
         ?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label><?php
 
 
             if (is_array($extra_fields) && in_array('1', $extra_fields)) {
 
-                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>
+                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>
 
-            <div class="editor" field_id="<?php echo $cf['name'];?>" field_type="editor">
+            <div class="editor" field_id="<?php echo $cf['name']; ?>" field_type="editor">
                 <?php wp_editor(stripslashes($value), $cf['name'], $editor_settings); ?>
                 </div><?php
 
             } else {
 
-                ?><textarea field_type="<?php echo $cf['type'];?>" class="geodir_textarea" name="<?php echo $cf['name'];?>"
-                            id="<?php echo $cf['name'];?>"><?php echo stripslashes($value);?></textarea><?php
+                ?><textarea field_type="<?php echo $cf['type']; ?>" class="geodir_textarea" name="<?php echo $cf['name']; ?>"
+                            id="<?php echo $cf['name']; ?>"><?php echo stripslashes($value); ?></textarea><?php
 
             }?>
 
 
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_textarea','geodir_cfi_textarea',10,2);
+add_filter('geodir_custom_field_input_textarea', 'geodir_cfi_textarea', 10, 2);
 
 
 /**
@@ -524,12 +524,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_select($html,$cf){
+function geodir_cfi_select($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_select_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_select_{$html_var}")) {
         /**
          * Filter the select html by individual custom field.
          *
@@ -537,22 +537,22 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_select_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_select_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
 
         ?>
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <?php
             $option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
@@ -562,22 +562,22 @@  discard block
 block discarded – undo
                     if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
                         $option_label = isset($option_row['label']) ? $option_row['label'] : '';
 
-                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="'.esc_attr($option_label).'">' : '</optgroup>';
                     } else {
                         $option_label = isset($option_row['label']) ? $option_row['label'] : '';
                         $option_value = isset($option_row['value']) ? $option_row['value'] : '';
                         $selected = $option_value == stripslashes($value) ? 'selected="selected"' : '';
 
-                        $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+                        $select_options .= '<option value="'.esc_attr($option_value).'" '.$selected.'>'.$option_label.'</option>';
                     }
                 }
             }
             ?>
-            <select field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
+            <select field_type="<?php echo $cf['type']; ?>" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
                     class="geodir_textfield textfield_x chosen_select"
-                    data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;';?>"
-                    option-ajaxchosen="false"><?php echo $select_options;?></select>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+                    data-placeholder="<?php echo __('Choose', 'geodirectory').' '.$site_title.'&hellip;'; ?>"
+                    option-ajaxchosen="false"><?php echo $select_options; ?></select>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_select','geodir_cfi_select',10,2);
+add_filter('geodir_custom_field_input_select', 'geodir_cfi_select', 10, 2);
 
 
 /**
@@ -601,12 +601,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_multiselect($html,$cf){
+function geodir_cfi_multiselect($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_multiselect_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_multiselect_{$html_var}")) {
         /**
          * Filter the multiselect html by individual custom field.
          *
@@ -614,11 +614,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -655,9 +655,9 @@  discard block
 block discarded – undo
                                 $option_label = isset($option_row['label']) ? $option_row['label'] : '';
 
                                 if ($multi_display == 'select') {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+                                    $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="'.esc_attr($option_label).'">' : '</optgroup>';
                                 } else {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';
+                                    $select_options .= $option_row['optgroup'] == 'start' ? '<li>'.$option_label.'</li>' : '';
                                 }
                             } else {
                                 if (!is_array($value) && $value != '') {
@@ -690,9 +690,9 @@  discard block
 block discarded – undo
                                 }
 
                                 if ($multi_display == 'select') {
-                                    $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+                                    $select_options .= '<option value="'.esc_attr($option_value).'" '.$selected.'>'.$option_label.'</option>';
                                 } else {
-                                    $select_options .= '<li><input name="' . $cf['name'] . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';
+                                    $select_options .= '<li><input name="'.$cf['name'].'[]" '.$checked.' value="'.esc_attr($option_value).'" class="gd-'.$multi_display.'" field_type="'.$multi_display.'" type="'.$multi_display.'" />&nbsp;'.$option_label.' </li>';
                                 }
                             }
                         }
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_multiselect','geodir_cfi_multiselect',10,2);
+add_filter('geodir_custom_field_input_multiselect', 'geodir_cfi_multiselect', 10, 2);
 
 
 /**
@@ -724,12 +724,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_html($html,$cf){
+function geodir_cfi_html($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_html_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_html_{$html_var}")) {
         /**
          * Filter the html html by individual custom field.
          *
@@ -737,11 +737,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_html_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_html_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_html','geodir_cfi_html',10,2);
+add_filter('geodir_custom_field_input_html', 'geodir_cfi_html', 10, 2);
 
 
 
@@ -787,12 +787,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_datepicker($html,$cf){
+function geodir_cfi_datepicker($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_datepicker_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_datepicker_{$html_var}")) {
         /**
          * Filter the datepicker html by individual custom field.
          *
@@ -800,11 +800,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -816,23 +816,23 @@  discard block
 block discarded – undo
             $extra_fields['date_format'] = 'yy-mm-dd';
 
         $date_format = $extra_fields['date_format'];
-        $jquery_date_format  = $date_format;
+        $jquery_date_format = $date_format;
 
 
         // check if we need to change the format or not
         $date_format_len = strlen(str_replace(' ', '', $date_format));
-        if($date_format_len>5){// if greater then 5 then it's the old style format.
+        if ($date_format_len > 5) {// if greater then 5 then it's the old style format.
 
-            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-            $replace = array('d','j','l','m','n','F','Y');//PHP date format
+            $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
+            $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
 
             $date_format = str_replace($search, $replace, $date_format);
-        }else{
-            $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );
+        } else {
+            $jquery_date_format = geodir_date_format_php_to_jqueryui($jquery_date_format);
         }
 
-        if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty
-        if($value && !isset($_REQUEST['backandedit'])) {
+        if ($value == '0000-00-00') {$value = ''; }//if date not set, then mark it empty
+        if ($value && !isset($_REQUEST['backandedit'])) {
             //$time = strtotime($value);
             //$value = date_i18n($date_format, $time);
         }
@@ -843,37 +843,37 @@  discard block
 block discarded – undo
 
             jQuery(function () {
 
-                jQuery("#<?php echo $cf['name'];?>").datepicker({changeMonth: true, changeYear: true <?php
+                jQuery("#<?php echo $cf['name']; ?>").datepicker({changeMonth: true, changeYear: true <?php
                     /**
                      * Used to add extra option to datepicker per custom field.
                      *
                      * @since 1.5.7
                      * @param string $name The custom field name.
                      */
-                    echo apply_filters("gd_datepicker_extra_{$name}",'');?>});
+                    echo apply_filters("gd_datepicker_extra_{$name}", ''); ?>});
 
-                jQuery("#<?php echo $name;?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format;?>');
+                jQuery("#<?php echo $name; ?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format; ?>');
 
-                <?php if(!empty($value)){?>
-                jQuery("#<?php echo $name;?>").datepicker("setDate", '<?php echo $value;?>');
+                <?php if (!empty($value)) {?>
+                jQuery("#<?php echo $name; ?>").datepicker("setDate", '<?php echo $value; ?>');
                 <?php } ?>
 
             });
 
         </script>
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
 
-            <input field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>" id="<?php echo $name;?>"
-                   value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"
+                   value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>
 
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_datepicker','geodir_cfi_datepicker',10,2);
+add_filter('geodir_custom_field_input_datepicker', 'geodir_cfi_datepicker', 10, 2);
 
 
 /**
@@ -897,12 +897,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_time($html,$cf){
+function geodir_cfi_time($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_time_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_time_{$html_var}")) {
         /**
          * Filter the time html by individual custom field.
          *
@@ -910,11 +910,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_time_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_time_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -927,25 +927,25 @@  discard block
 block discarded – undo
         <script type="text/javascript">
             jQuery(document).ready(function () {
 
-                jQuery('#<?php echo $name;?>').timepicker({
+                jQuery('#<?php echo $name; ?>').timepicker({
                     showPeriod: true,
                     showLeadingZero: true,
                     showPeriod: true,
                 });
             });
         </script>
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input readonly="readonly" field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>"
-                   id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>
+            <input readonly="readonly" field_type="<?php echo $cf['type']; ?>" name="<?php echo $name; ?>"
+                   id="<?php echo $name; ?>" value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>
 
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -956,7 +956,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_time','geodir_cfi_time',10,2);
+add_filter('geodir_custom_field_input_time', 'geodir_cfi_time', 10, 2);
 
 
 /**
@@ -968,12 +968,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_address($html,$cf){
+function geodir_cfi_address($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_address_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_address_{$html_var}")) {
         /**
          * Filter the address html by individual custom field.
          *
@@ -981,11 +981,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_address_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_address_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         global $gd_session;
         ob_start(); // Start  buffering;
@@ -998,12 +998,12 @@  discard block
 block discarded – undo
         $site_title = $cf['site_title'];
         $is_admin = $cf['is_admin'];
         $extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
-        $prefix = $name . '_';
+        $prefix = $name.'_';
 
-        ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');
-        ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');
+        ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix.' address');
+        ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix.' zip/post code ');
         ($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');
-        ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');
+        ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix.' mapview');
 
         $address = '';
         $zip = '';
@@ -1014,21 +1014,21 @@  discard block
 block discarded – undo
 
         if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
             $post = $gd_ses_listing;
-            $address = $post[$prefix . 'address'];
-            $zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';
-            $lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';
-            $lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';
-            $mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';
+            $address = $post[$prefix.'address'];
+            $zip = isset($post[$prefix.'zip']) ? $post[$prefix.'zip'] : '';
+            $lat = isset($post[$prefix.'latitude']) ? $post[$prefix.'latitude'] : '';
+            $lng = isset($post[$prefix.'longitude']) ? $post[$prefix.'longitude'] : '';
+            $mapview = isset($post[$prefix.'mapview']) ? $post[$prefix.'mapview'] : '';
+            $mapzoom = isset($post[$prefix.'mapzoom']) ? $post[$prefix.'mapzoom'] : '';
         } else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {
-            $post_info = (array)$post_info;
-
-            $address = $post_info[$prefix . 'address'];
-            $zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';
-            $lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';
-            $lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';
-            $mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';
+            $post_info = (array) $post_info;
+
+            $address = $post_info[$prefix.'address'];
+            $zip = isset($post_info[$prefix.'zip']) ? $post_info[$prefix.'zip'] : '';
+            $lat = isset($post_info[$prefix.'latitude']) ? $post_info[$prefix.'latitude'] : '';
+            $lng = isset($post_info[$prefix.'longitude']) ? $post_info[$prefix.'longitude'] : '';
+            $mapview = isset($post_info[$prefix.'mapview']) ? $post_info[$prefix.'mapview'] : '';
+            $mapzoom = isset($post_info[$prefix.'mapzoom']) ? $post_info[$prefix.'mapzoom'] : '';
         }
 
         $location = geodir_get_default_location();
@@ -1066,18 +1066,18 @@  discard block
 block discarded – undo
         $locate_me = !empty($extra_fields['show_map']) && geodir_map_name() != 'none' ? true : false;
         $locate_me_class = $locate_me ? ' gd-form-control' : '';
         ?>
-        <div id="geodir_<?php echo $prefix . 'address';?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
-            <label><?php _e($address_title, 'geodirectory'); ?> <?php if ($is_required) echo '<span>*</span>';?></label>
+        <div id="geodir_<?php echo $prefix.'address'; ?>_row"
+             class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
+            <label><?php _e($address_title, 'geodirectory'); ?> <?php if ($is_required) echo '<span>*</span>'; ?></label>
             <?php if ($locate_me) { ?>
             <div class="gd-input-group gd-locate-me">
             <?php } ?>
-                <input type="text" field_type="<?php echo $type;?>" name="<?php echo $prefix . 'address';?>" id="<?php echo $prefix . 'address';?>" class="geodir_textfield<?php echo $locate_me_class;?>" value="<?php echo esc_attr(stripslashes($address)); ?>" />
+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'address'; ?>" id="<?php echo $prefix.'address'; ?>" class="geodir_textfield<?php echo $locate_me_class; ?>" value="<?php echo esc_attr(stripslashes($address)); ?>" />
                 <?php if ($locate_me) { ?>
                 <span onclick="gdGeoLocateMe(this, 'add-listing');" class="gd-locate-me-btn gd-input-group-addon" title="<?php esc_attr_e('My location', 'geodirlocation'); ?>"><i class="fas fa-crosshairs fa-fw" aria-hidden="true"></i></span>
             </div>
             <?php } ?>
-            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>
             <?php if ($is_required) { ?>
                 <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>
             <?php } ?>
@@ -1096,14 +1096,14 @@  discard block
 block discarded – undo
 
         if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>
 
-            <div id="geodir_<?php echo $prefix . 'zip'; ?>_row"
+            <div id="geodir_<?php echo $prefix.'zip'; ?>_row"
                  class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix gd-fieldset-details">
                 <label>
                     <?php _e($zip_title, 'geodirectory'); ?>
                     <?php /*if($is_required) echo '<span>*</span>';*/ ?>
                 </label>
-                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'zip'; ?>"
-                       id="<?php echo $prefix . 'zip'; ?>" class="geodir_textfield autofill"
+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'zip'; ?>"
+                       id="<?php echo $prefix.'zip'; ?>" class="geodir_textfield autofill"
                        value="<?php echo esc_attr(stripslashes($zip)); ?>"/>
                 <?php /*if($is_required) {?>
 					<span class="geodir_message_error"><?php echo _e($required_msg,'geodirectory');?></span>
@@ -1113,14 +1113,14 @@  discard block
 block discarded – undo
 
         <?php if (isset($extra_fields['show_map']) && $extra_fields['show_map']) { ?>
 
-            <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
+            <div id="geodir_<?php echo $prefix.'map'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
                 <?php
                 /**
                  * Contains add listing page map functions.
                  *
                  * @since 1.0.0
                  */
-                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");
+                include(geodir_plugin_path()."/geodirectory-functions/map-functions/map_on_add_listing_page.php");
                 if ($lat_lng_blank) {
                     $lat = '';
                     $lng = '';
@@ -1131,14 +1131,14 @@  discard block
 block discarded – undo
             <?php
             /* show lat lng */
             $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>
-            <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"
+            <div id="geodir_<?php echo $prefix.'latitude'; ?>_row"
                  class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
                     <?php echo PLACE_ADDRESS_LAT; ?>
                     <?php if ($is_required) echo '<span>*</span>'; ?>
                 </label>
-                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'latitude'; ?>"
-                       id="<?php echo $prefix . 'latitude'; ?>" class="geodir_textfield"
+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'latitude'; ?>"
+                       id="<?php echo $prefix.'latitude'; ?>" class="geodir_textfield"
                        value="<?php echo esc_attr(stripslashes($lat)); ?>" size="25"/>
                 <span class="geodir_message_note"><?php echo GET_LATITUDE_MSG; ?></span>
                 <?php if ($is_required) { ?>
@@ -1146,14 +1146,14 @@  discard block
 block discarded – undo
                 <?php } ?>
             </div>
 
-            <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"
+            <div id="geodir_<?php echo $prefix.'longitude'; ?>_row"
                  class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
                     <?php echo PLACE_ADDRESS_LNG; ?>
                     <?php if ($is_required) echo '<span>*</span>'; ?>
                 </label>
-                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'longitude'; ?>"
-                       id="<?php echo $prefix . 'longitude'; ?>" class="geodir_textfield"
+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'longitude'; ?>"
+                       id="<?php echo $prefix.'longitude'; ?>" class="geodir_textfield"
                        value="<?php echo esc_attr(stripslashes($lng)); ?>" size="25"/>
                 <span class="geodir_message_note"><?php echo GET_LOGNGITUDE_MSG; ?></span>
                 <?php if ($is_required) { ?>
@@ -1163,32 +1163,32 @@  discard block
 block discarded – undo
         <?php } ?>
 
         <?php if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) { ?>
-            <div id="geodir_<?php echo $prefix . 'mapview'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
+            <div id="geodir_<?php echo $prefix.'mapview'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
                 <label><?php _e($mapview_title, 'geodirectory'); ?></label>
 
 
                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
-                                                            name="<?php echo $prefix . 'mapview'; ?>"
-                                                            id="<?php echo $prefix . 'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {
+                                                            name="<?php echo $prefix.'mapview'; ?>"
+                                                            id="<?php echo $prefix.'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {
                             echo 'checked="checked"';
                         } ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>
                     <span class="geodir_user_define"> <input field_type="<?php echo $type; ?>" type="radio"
                                                              class="gd-checkbox"
-                                                             name="<?php echo $prefix . 'mapview'; ?>"
+                                                             name="<?php echo $prefix.'mapview'; ?>"
                                                              id="map_view1" <?php if ($mapview == 'SATELLITE') {
                             echo 'checked="checked"';
                         } ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>
 
                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
-                                                            name="<?php echo $prefix . 'mapview'; ?>"
+                                                            name="<?php echo $prefix.'mapview'; ?>"
                                                             id="map_view2" <?php if ($mapview == 'HYBRID') {
                             echo 'checked="checked"';
                         } ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>
 					<span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
-                                                            name="<?php echo $prefix . 'mapview'; ?>"
+                                                            name="<?php echo $prefix.'mapview'; ?>"
                                                             id="map_view3" <?php if ($mapview == 'TERRAIN') {
                             echo 'checked="checked"';
                         } ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>
@@ -1200,7 +1200,7 @@  discard block
 block discarded – undo
         <?php if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) { ?>
             <input type="hidden" value="<?php if (isset($mapzoom)) {
                 echo esc_attr($mapzoom);
-            } ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>
+            } ?>" name="<?php echo $prefix.'mapzoom'; ?>" id="<?php echo $prefix.'mapzoom'; ?>"/>
         <?php }
 
         $html = ob_get_clean();
@@ -1208,7 +1208,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_address','geodir_cfi_address',10,2);
+add_filter('geodir_custom_field_input_address', 'geodir_cfi_address', 10, 2);
 
 
 
@@ -1221,12 +1221,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_taxonomy($html,$cf){
+function geodir_cfi_taxonomy($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_taxonomy_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_taxonomy_{$html_var}")) {
         /**
          * Filter the taxonomy html by individual custom field.
          *
@@ -1234,11 +1234,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -1253,15 +1253,15 @@  discard block
 block discarded – undo
         if ($value == $cf['default']) {
             $value = '';
         } ?>
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($site_title, 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($is_required) echo '<span>*</span>';?>
+                <?php if ($is_required) echo '<span>*</span>'; ?>
             </label>
 
-            <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">
+            <div id="<?php echo $name; ?>" class="geodir_taxonomy_field" style="float:left; width:70%;">
                 <?php
                 global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;
 
@@ -1273,7 +1273,7 @@  discard block
 block discarded – undo
 
                     $package_info = array();
 
-                    $package_info = (array)geodir_post_package_info($package_info, $post, $post_type);
+                    $package_info = (array) geodir_post_package_info($package_info, $post, $post_type);
 
                     if (!empty($package_info)) {
 
@@ -1300,7 +1300,7 @@  discard block
 block discarded – undo
 
                     $catadd_limit = $wpdb->get_var(
                         $wpdb->prepare(
-                            "SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",
+                            "SELECT cat_limit FROM ".GEODIR_PRICE_TABLE." WHERE pid = %d",
                             array($package_id)
                         )
                     );
@@ -1316,13 +1316,13 @@  discard block
 block discarded – undo
                     $required_limit_msg = '';
                     if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {
 
-                        $required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');
+                        $required_limit_msg = __('Only select', 'geodirectory').' '.$catadd_limit.__(' categories for this package.', 'geodirectory');
 
                     } else {
                         $required_limit_msg = $required_msg;
                     }
 
-                    echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';
+                    echo '<input type="hidden" cat_limit="'.$catadd_limit.'" id="cat_limit" value="'.esc_attr($required_limit_msg).'" name="cat_limit['.$name.']"  />';
 
 
                     if ($cat_display == 'select' || $cat_display == 'multiselect') {
@@ -1332,11 +1332,11 @@  discard block
 block discarded – undo
                         if ($cat_display == 'multiselect')
                             $multiple = 'multiple="multiple"';
 
-                        echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';
+                        echo '<select id="'.$name.'" '.$multiple.' type="'.$name.'" name="post_category['.$name.'][]" alt="'.$name.'" field_type="'.$cat_display.'" class="geodir_textfield textfield_x chosen_select" data-placeholder="'.__('Select Category', 'geodirectory').'">';
 
 
                         if ($cat_display == 'select')
-                            echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+                            echo '<option value="">'.__('Select Category', 'geodirectory').'</option>';
 
                     }
 
@@ -1354,7 +1354,7 @@  discard block
 block discarded – undo
                 ?>
             </div>
 
-            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>
             <?php if ($is_required) { ?>
                 <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>
             <?php } ?>
@@ -1366,7 +1366,7 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_taxonomy','geodir_cfi_taxonomy',10,2);
+add_filter('geodir_custom_field_input_taxonomy', 'geodir_cfi_taxonomy', 10, 2);
 
 
 /**
@@ -1378,12 +1378,12 @@  discard block
 block discarded – undo
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_file($html,$cf){
+function geodir_cfi_file($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_file_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_file_{$html_var}")) {
         /**
          * Filter the file html by individual custom field.
          *
@@ -1391,11 +1391,11 @@  discard block
 block discarded – undo
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_file_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_file_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -1438,8 +1438,8 @@  discard block
 block discarded – undo
                 $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; ?>
@@ -1449,13 +1449,13 @@  discard block
 block discarded – undo
 			</h5>   <?php */
         ?>
 
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
 
             <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">
                 <label
                     style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');
-                    echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>
+                    echo $site_title; ?><?php if ($is_required) echo '<span>*</span>'; ?></label>
                 <input class="geodir-custom-file-upload" field_type="file" type="hidden"
                        name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"
                        value="<?php echo esc_attr($file_value); ?>"/>
@@ -1463,7 +1463,7 @@  discard block
 block discarded – undo
                        id="<?php echo $file_id; ?>image_limit" value="<?php echo $file_image_limit; ?>"/>
                 <?php if ($allowed_file_types != '') { ?>
                     <input type="hidden" name="<?php echo $file_id; ?>_allowed_types"
-                           id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types);?>"/>
+                           id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types); ?>"/>
                 <?php } ?>
                 <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"
                        value="<?php if (isset($file_totImg)) {
@@ -1479,10 +1479,10 @@  discard block
 block discarded – undo
                         <?php /*?><h4><?php _e('Drop files to upload');?></h4><br/><?php */
                         ?>
                         <input id="<?php echo $file_id; ?>plupload-browse-button" type="button"
-                               value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory') ); ?>"
+                               value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory')); ?>"
                                class="geodir_button" style="margin-top:10px;"/>
                             <span class="ajaxnonceplu"
-                                  id="ajaxnonceplu<?php echo wp_create_nonce($file_id . 'pluploadan'); ?>"></span>
+                                  id="ajaxnonceplu<?php echo wp_create_nonce($file_id.'pluploadan'); ?>"></span>
                         <?php if ($file_width && $file_height): ?>
                             <span class="plupload-resize"></span>
                             <span class="plupload-width" id="plupload-width<?php echo $file_width; ?>"></span>
@@ -1502,7 +1502,7 @@  discard block
 block discarded – undo
 
                 </div>
             </div>
-            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?> <?php echo ( $display_file_types != '' ? __('Allowed file types:', 'geodirectory') . ' ' . $display_file_types : '' );?></span>
+            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?> <?php echo ($display_file_types != '' ? __('Allowed file types:', 'geodirectory').' '.$display_file_types : ''); ?></span>
             <?php if ($is_required) { ?>
                 <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>
             <?php } ?>
@@ -1515,4 +1515,4 @@  discard block
 block discarded – undo
 
     return $html;
 }
-add_filter('geodir_custom_field_input_file','geodir_cfi_file',10,2);
\ No newline at end of file
+add_filter('geodir_custom_field_input_file', 'geodir_cfi_file', 10, 2);
\ No newline at end of file

Please login to merge, or discard this patch.

geodirectory-functions/post_functions.php 2 patches

Indentation +2375 added lines, -2375 removed lines patch added patch discarded remove patch

@@ -20,492 +20,492 @@  discard block
 block discarded – undo
 function geodir_set_postcat_structure($post_id, $taxonomy, $default_cat = '', $category_str = '')
 {
 
-    $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);
-    if (!empty($post_cat_ids))
-        $post_cat_array = explode(",", trim($post_cat_ids, ","));
-
-    if (!isset($default_cat) || empty($default_cat)) {
-        $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';
-    }else{
-        if(!is_int($default_cat)){
-            $category = get_term_by('name', $default_cat, $taxonomy);
-            if(isset($category->term_id)){
-                $default_cat =  $category->term_id;
-            }
-        }
+	$post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);
+	if (!empty($post_cat_ids))
+		$post_cat_array = explode(",", trim($post_cat_ids, ","));
+
+	if (!isset($default_cat) || empty($default_cat)) {
+		$default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';
+	}else{
+		if(!is_int($default_cat)){
+			$category = get_term_by('name', $default_cat, $taxonomy);
+			if(isset($category->term_id)){
+				$default_cat =  $category->term_id;
+			}
+		}
 
-    }
+	}
 
 
-    geodir_save_post_meta($post_id, 'default_category', $default_cat);
+	geodir_save_post_meta($post_id, 'default_category', $default_cat);
 
-    if (isset($category_str) && empty($category_str)) {
+	if (isset($category_str) && empty($category_str)) {
 
-        $post_cat_str = '';
-        $post_categories = array();
-        if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {
-            $post_cat_str = implode(",y:#", $post_cat_array);
-            $post_cat_str .= ",y:";
-            $post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));
-        }
-        $post_categories[$taxonomy] = $post_cat_str;
-        $category_str = $post_categories;
-    }
+		$post_cat_str = '';
+		$post_categories = array();
+		if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {
+			$post_cat_str = implode(",y:#", $post_cat_array);
+			$post_cat_str .= ",y:";
+			$post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));
+		}
+		$post_categories[$taxonomy] = $post_cat_str;
+		$category_str = $post_categories;
+	}
 
-    $change_cat_str = $category_str[$taxonomy];
+	$change_cat_str = $category_str[$taxonomy];
 
-    $default_pos = strpos($change_cat_str, 'd:');
+	$default_pos = strpos($change_cat_str, 'd:');
 
-    if ($default_pos === false) {
+	if ($default_pos === false) {
 
-        $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);
+		$change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);
 
-    }
+	}
 
-    $category_str[$taxonomy] = $change_cat_str;
+	$category_str[$taxonomy] = $change_cat_str;
 
-    update_post_meta($post_id, 'post_categories', $category_str);
+	update_post_meta($post_id, 'post_categories', $category_str);
 
 }
 
 
 if (!function_exists('geodir_save_listing')) {
-    /**
-     * Saves listing in the database using given information.
-     *
-     * @since 1.0.0
-     * @since 1.5.4 New parameter $wp_error added.
-     * @since 1.6.18 Admin use only date field should not lost value if saved by user - FIXED
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global object $post The current post object.
-     * @global object $current_user Current user object.
-     * @global object $gd_session GeoDirectory Session object.
-     * @param array $request_info {
-     *    Array of request info arguments.
-     *
-     *    @type string $action                                  Ajax action name.
-     *    @type string $geodir_ajax                             Ajax type.
-     *    @type string $ajax_action                             Ajax action.
-     *    @type string $listing_type                            Listing type.
-     *    @type string $pid                                     Default Post ID.
-     *    @type string $preview                                 Todo Desc needed.
-     *    @type string $add_listing_page_id                     Add listing page ID.
-     *    @type string $post_title                              Listing title.
-     *    @type string $post_desc                               Listing Description.
-     *    @type string $post_tags                               Listing tags.
-     *    @type array  $cat_limit                               Category limit.
-     *    @type array  $post_category                           Category IDs.
-     *    @type array  $post_category_str                       Category string.
-     *    @type string $post_default_category                   Default category ID.
-     *    @type string $post_address                            Listing address.
-     *    @type string $geodir_location_add_listing_country_val Add listing country value.
-     *    @type string $post_country                            Listing country.
-     *    @type string $geodir_location_add_listing_region_val  Add listing region value.
-     *    @type string $post_region                             Listing region.
-     *    @type string $geodir_location_add_listing_city_val    Add listing city value.
-     *    @type string $post_city                               Listing city.
-     *    @type string $post_zip                                Listing zip.
-     *    @type string $post_latitude                           Listing latitude.
-     *    @type string $post_longitude                          Listing longitude.
-     *    @type string $post_mapview                            Listing mapview. Default "ROADMAP".
-     *    @type string $post_mapzoom                            Listing mapzoom Default "9".
-     *    @type string $geodir_timing                           Business timing info.
-     *    @type string $geodir_contact                          Contact number.
-     *    @type string $geodir_email                            Business contact email.
-     *    @type string $geodir_website                          Business website.
-     *    @type string $geodir_twitter                          Twitter link.
-     *    @type string $geodir_facebook                         Facebook link.
-     *    @type string $geodir_video                            Video link.
-     *    @type string $geodir_special_offers                   Special offers.
-     *    @type string $post_images                             Post image urls.
-     *    @type string $post_imagesimage_limit                  Post images limit.
-     *    @type string $post_imagestotImg                       Todo Desc needed.
-     *    @type string $geodir_accept_term_condition            Has accepted terms and conditions?.
-     *    @type string $geodir_spamblocker                      Todo Desc needed.
-     *    @type string $geodir_filled_by_spam_bot               Todo Desc needed.
-     *
-     * }
-     * @param bool $dummy Optional. Is this a dummy listing? Default false.
-     * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false.
-     * @return int|string|WP_Error Created post id or WP_Error on failure.
-     */
-    function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false)
-    {
-        global $wpdb, $current_user, $gd_session;
-
-        $last_post_id = '';
-
-        if ($gd_session->get('listing') && !$dummy) {
-            $request_info = array();
-            $request_session = $gd_session->get('listing');
-            $request_info = array_merge($_REQUEST, $request_session);
-        } else if (!$gd_session->get('listing') && !$dummy) {
-            global $post;
+	/**
+	 * Saves listing in the database using given information.
+	 *
+	 * @since 1.0.0
+	 * @since 1.5.4 New parameter $wp_error added.
+	 * @since 1.6.18 Admin use only date field should not lost value if saved by user - FIXED
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global object $post The current post object.
+	 * @global object $current_user Current user object.
+	 * @global object $gd_session GeoDirectory Session object.
+	 * @param array $request_info {
+	 *    Array of request info arguments.
+	 *
+	 *    @type string $action                                  Ajax action name.
+	 *    @type string $geodir_ajax                             Ajax type.
+	 *    @type string $ajax_action                             Ajax action.
+	 *    @type string $listing_type                            Listing type.
+	 *    @type string $pid                                     Default Post ID.
+	 *    @type string $preview                                 Todo Desc needed.
+	 *    @type string $add_listing_page_id                     Add listing page ID.
+	 *    @type string $post_title                              Listing title.
+	 *    @type string $post_desc                               Listing Description.
+	 *    @type string $post_tags                               Listing tags.
+	 *    @type array  $cat_limit                               Category limit.
+	 *    @type array  $post_category                           Category IDs.
+	 *    @type array  $post_category_str                       Category string.
+	 *    @type string $post_default_category                   Default category ID.
+	 *    @type string $post_address                            Listing address.
+	 *    @type string $geodir_location_add_listing_country_val Add listing country value.
+	 *    @type string $post_country                            Listing country.
+	 *    @type string $geodir_location_add_listing_region_val  Add listing region value.
+	 *    @type string $post_region                             Listing region.
+	 *    @type string $geodir_location_add_listing_city_val    Add listing city value.
+	 *    @type string $post_city                               Listing city.
+	 *    @type string $post_zip                                Listing zip.
+	 *    @type string $post_latitude                           Listing latitude.
+	 *    @type string $post_longitude                          Listing longitude.
+	 *    @type string $post_mapview                            Listing mapview. Default "ROADMAP".
+	 *    @type string $post_mapzoom                            Listing mapzoom Default "9".
+	 *    @type string $geodir_timing                           Business timing info.
+	 *    @type string $geodir_contact                          Contact number.
+	 *    @type string $geodir_email                            Business contact email.
+	 *    @type string $geodir_website                          Business website.
+	 *    @type string $geodir_twitter                          Twitter link.
+	 *    @type string $geodir_facebook                         Facebook link.
+	 *    @type string $geodir_video                            Video link.
+	 *    @type string $geodir_special_offers                   Special offers.
+	 *    @type string $post_images                             Post image urls.
+	 *    @type string $post_imagesimage_limit                  Post images limit.
+	 *    @type string $post_imagestotImg                       Todo Desc needed.
+	 *    @type string $geodir_accept_term_condition            Has accepted terms and conditions?.
+	 *    @type string $geodir_spamblocker                      Todo Desc needed.
+	 *    @type string $geodir_filled_by_spam_bot               Todo Desc needed.
+	 *
+	 * }
+	 * @param bool $dummy Optional. Is this a dummy listing? Default false.
+	 * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false.
+	 * @return int|string|WP_Error Created post id or WP_Error on failure.
+	 */
+	function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false)
+	{
+		global $wpdb, $current_user, $gd_session;
+
+		$last_post_id = '';
+
+		if ($gd_session->get('listing') && !$dummy) {
+			$request_info = array();
+			$request_session = $gd_session->get('listing');
+			$request_info = array_merge($_REQUEST, $request_session);
+		} else if (!$gd_session->get('listing') && !$dummy) {
+			global $post;
             
-            $gd_post = $post;
-            if (!empty($gd_post) && is_array($gd_post)) {
-                $gd_post = (object)$post;
+			$gd_post = $post;
+			if (!empty($gd_post) && is_array($gd_post)) {
+				$gd_post = (object)$post;
                 
-                // Fix WPML duplicate.
-                if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {
-                    return false;
-                }
-            }
+				// Fix WPML duplicate.
+				if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {
+					return false;
+				}
+			}
             
-            $request_info['pid'] = !empty($gd_post->ID) ? $gd_post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL);
-            $request_info['post_title'] = $request_info['post_title'];
-            $request_info['listing_type'] = !empty($gd_post->post_type) ? $gd_post->post_type : (!empty($request_info['post_type']) ? $request_info['post_type'] : get_post_type($request_info['pid']));
-            $request_info['post_desc'] = $request_info['content'];
-        } else if (!$dummy) {
-            return false;
-        }
-
-        /**
-         * Filter the request_info array.
-         *
-         * You can use this filter to modify request_info array.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         * @param array $request_info See {@see geodir_save_listing()} for accepted args.
-         */
-        $request_info = apply_filters('geodir_action_get_request_info', $request_info);
-
-        // Check if we need to save post location as new location
-        $location_result = geodir_get_default_location();
-
-        if ($location_result->location_id > 0) {
-            if (isset($request_info['post_city']) && isset($request_info['post_region'])) {
-                $request_info['post_location'] = array(
-                    'city' => $request_info['post_city'],
-                    'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '',
-                    'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '',
-                    'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '',
-                    'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : ''
-                );
-
-                $post_location_info = $request_info['post_location'];
-
-                if ($location_id = geodir_add_new_location($post_location_info)) {
-                    $post_location_id = $location_id;
-                }
-            } else {
-                $post_location_id = $location_result->location_id;
-            }
-        } else {
-            $post_location_id = $location_result->location_id;
-        }
-
-        if ($dummy) {
-            $post_status = 'publish';
-        } else {
-            $post_status = geodir_new_post_default_status();
-        }
-
-        if (isset($request_info['pid']) && $request_info['pid'] != '') {
-            $post_status = get_post_status($request_info['pid']);
-        }
-
-        /* fix change of slug on every title edit */
-        if (!isset($request_info['post_name'])) {
-            $request_info['post_name'] = $request_info['post_title'];
-
-            if (!empty($request_info['pid'])) {
-                $post_info = get_post($request_info['pid']);
-
-                if (!empty($post_info) && isset($post_info->post_name)) {
-                    $request_info['post_name'] = $post_info->post_name;
-                }
-            }
-        }
-
-        $post = array(
-            'post_content' => $request_info['post_desc'],
-            'post_status' => $post_status,
-            'post_title' => $request_info['post_title'],
-            'post_name' => $request_info['post_name'],
-            'post_type' => $request_info['listing_type']
-        );
-
-        /**
-         * Called before a listing is saved to the database.
-         *
-         * @since 1.0.0
-         * @param object $post The post object.
-         */
-        do_action_ref_array('geodir_before_save_listing', $post);
+			$request_info['pid'] = !empty($gd_post->ID) ? $gd_post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL);
+			$request_info['post_title'] = $request_info['post_title'];
+			$request_info['listing_type'] = !empty($gd_post->post_type) ? $gd_post->post_type : (!empty($request_info['post_type']) ? $request_info['post_type'] : get_post_type($request_info['pid']));
+			$request_info['post_desc'] = $request_info['content'];
+		} else if (!$dummy) {
+			return false;
+		}
+
+		/**
+		 * Filter the request_info array.
+		 *
+		 * You can use this filter to modify request_info array.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 * @param array $request_info See {@see geodir_save_listing()} for accepted args.
+		 */
+		$request_info = apply_filters('geodir_action_get_request_info', $request_info);
+
+		// Check if we need to save post location as new location
+		$location_result = geodir_get_default_location();
+
+		if ($location_result->location_id > 0) {
+			if (isset($request_info['post_city']) && isset($request_info['post_region'])) {
+				$request_info['post_location'] = array(
+					'city' => $request_info['post_city'],
+					'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '',
+					'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '',
+					'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '',
+					'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : ''
+				);
+
+				$post_location_info = $request_info['post_location'];
+
+				if ($location_id = geodir_add_new_location($post_location_info)) {
+					$post_location_id = $location_id;
+				}
+			} else {
+				$post_location_id = $location_result->location_id;
+			}
+		} else {
+			$post_location_id = $location_result->location_id;
+		}
 
-        $send_post_submit_mail = false;
+		if ($dummy) {
+			$post_status = 'publish';
+		} else {
+			$post_status = geodir_new_post_default_status();
+		}
 
-        // unhook this function so it doesn't loop infinitely
-        remove_action('save_post', 'geodir_post_information_save',10,2);
+		if (isset($request_info['pid']) && $request_info['pid'] != '') {
+			$post_status = get_post_status($request_info['pid']);
+		}
 
-        if (isset($request_info['pid']) && $request_info['pid'] != '') {
-            $post['ID'] = $request_info['pid'];
+		/* fix change of slug on every title edit */
+		if (!isset($request_info['post_name'])) {
+			$request_info['post_name'] = $request_info['post_title'];
 
-            $last_post_id = wp_update_post($post, $wp_error);
-        } else {
-            $last_post_id = wp_insert_post($post, $wp_error);
+			if (!empty($request_info['pid'])) {
+				$post_info = get_post($request_info['pid']);
 
-            if (!$dummy && $last_post_id) {
-                $send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email)
-                //geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);
-            }
-        }
+				if (!empty($post_info) && isset($post_info->post_name)) {
+					$request_info['post_name'] = $post_info->post_name;
+				}
+			}
+		}
+
+		$post = array(
+			'post_content' => $request_info['post_desc'],
+			'post_status' => $post_status,
+			'post_title' => $request_info['post_title'],
+			'post_name' => $request_info['post_name'],
+			'post_type' => $request_info['listing_type']
+		);
+
+		/**
+		 * Called before a listing is saved to the database.
+		 *
+		 * @since 1.0.0
+		 * @param object $post The post object.
+		 */
+		do_action_ref_array('geodir_before_save_listing', $post);
+
+		$send_post_submit_mail = false;
+
+		// unhook this function so it doesn't loop infinitely
+		remove_action('save_post', 'geodir_post_information_save',10,2);
+
+		if (isset($request_info['pid']) && $request_info['pid'] != '') {
+			$post['ID'] = $request_info['pid'];
+
+			$last_post_id = wp_update_post($post, $wp_error);
+		} else {
+			$last_post_id = wp_insert_post($post, $wp_error);
+
+			if (!$dummy && $last_post_id) {
+				$send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email)
+				//geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);
+			}
+		}
 
-        if ($wp_error && is_wp_error($last_post_id)) {
-            return $last_post_id; // Return WP_Error on save failure.
-        }
+		if ($wp_error && is_wp_error($last_post_id)) {
+			return $last_post_id; // Return WP_Error on save failure.
+		}
 
-        if (!$last_post_id) {
-            return false; // Save failure.
-        }
+		if (!$last_post_id) {
+			return false; // Save failure.
+		}
 
-        // re-hook this function
-        add_action('save_post', 'geodir_post_information_save',10,2);
+		// re-hook this function
+		add_action('save_post', 'geodir_post_information_save',10,2);
 
-        $post_tags = '';
-        if (!isset($request_info['post_tags'])) {
+		$post_tags = '';
+		if (!isset($request_info['post_tags'])) {
 
-            $post_type = $request_info['listing_type'];
-            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
+			$post_type = $request_info['listing_type'];
+			$post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
 
-        }
+		}
 
-        $gd_post_info = array(
-            "post_title" => $request_info['post_title'],
-            "post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags,
-            "post_status" => $post_status,
-            "post_location_id" => $post_location_id,
-            "claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '',
-            "businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '',
-            "submit_time" => time(),
-            "submit_ip" => $_SERVER['REMOTE_ADDR'],
-        );
+		$gd_post_info = array(
+			"post_title" => $request_info['post_title'],
+			"post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags,
+			"post_status" => $post_status,
+			"post_location_id" => $post_location_id,
+			"claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '',
+			"businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '',
+			"submit_time" => time(),
+			"submit_ip" => $_SERVER['REMOTE_ADDR'],
+		);
 
-        $payment_info = array();
-        $package_info = array();
+		$payment_info = array();
+		$package_info = array();
 
-        $package_info = (array)geodir_post_package_info($package_info, $post);
+		$package_info = (array)geodir_post_package_info($package_info, $post);
 
-        $post_package_id = geodir_get_post_meta($last_post_id, 'package_id');
+		$post_package_id = geodir_get_post_meta($last_post_id, 'package_id');
 
-        if (!empty($package_info) && !$post_package_id) {
-            if (isset($package_info['days']) && $package_info['days'] != 0) {
-                $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
-            } else {
-                $payment_info['expire_date'] = 'Never';
-            }
+		if (!empty($package_info) && !$post_package_id) {
+			if (isset($package_info['days']) && $package_info['days'] != 0) {
+				$payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
+			} else {
+				$payment_info['expire_date'] = 'Never';
+			}
 
-            $payment_info['package_id'] = $package_info['pid'];
-            $payment_info['alive_days'] = $package_info['days'];
-            $payment_info['is_featured'] = $package_info['is_featured'];
+			$payment_info['package_id'] = $package_info['pid'];
+			$payment_info['alive_days'] = $package_info['days'];
+			$payment_info['is_featured'] = $package_info['is_featured'];
 
-            $gd_post_info = array_merge($gd_post_info, $payment_info);
-        }
+			$gd_post_info = array_merge($gd_post_info, $payment_info);
+		}
 
-        $custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);
+		$custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);
 
-        foreach ($custom_metaboxes as $key => $val):
+		foreach ($custom_metaboxes as $key => $val):
 
-            $name = $val['name'];
-            $type = $val['type'];
-            $extrafields = $val['extra_fields'];
+			$name = $val['name'];
+			$type = $val['type'];
+			$extrafields = $val['extra_fields'];
 
-            if (trim($type) == 'address') {
-                $prefix = $name . '_';
-                $address = $prefix . 'address';
+			if (trim($type) == 'address') {
+				$prefix = $name . '_';
+				$address = $prefix . 'address';
 
-                if (isset($request_info[$address]) && $request_info[$address] != '') {
-                    $gd_post_info[$address] = wp_slash($request_info[$address]);
-                }
+				if (isset($request_info[$address]) && $request_info[$address] != '') {
+					$gd_post_info[$address] = wp_slash($request_info[$address]);
+				}
 
-                if ($extrafields != '') {
-                    $extrafields = unserialize($extrafields);
+				if ($extrafields != '') {
+					$extrafields = unserialize($extrafields);
 
 
-                    if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
+					if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
 
-                        $location_result = geodir_get_default_location();
+						$location_result = geodir_get_default_location();
 
-                        $gd_post_info[$prefix . 'city'] = $location_result->city;
-                        $gd_post_info[$prefix . 'region'] = $location_result->region;
-                        $gd_post_info[$prefix . 'country'] = $location_result->country;
+						$gd_post_info[$prefix . 'city'] = $location_result->city;
+						$gd_post_info[$prefix . 'region'] = $location_result->region;
+						$gd_post_info[$prefix . 'country'] = $location_result->country;
 
-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
+						$gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
 
-                    } else {
+					} else {
 
-                        $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];
-                        $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];
-                        $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];
+						$gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];
+						$gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];
+						$gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];
 
-                        //----------set post locations when import dummy data-------
-                        $location_result = geodir_get_default_location();
+						//----------set post locations when import dummy data-------
+						$location_result = geodir_get_default_location();
 
-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
-                        //-----------------------------------------------------------------
+						$gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
+						//-----------------------------------------------------------------
 
-                    }
+					}
 
 
-                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
-                        $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];
-                    }
+					if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
+						$gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];
+					}
 
 
-                    if (isset($extrafields['show_map']) && $extrafields['show_map']) {
+					if (isset($extrafields['show_map']) && $extrafields['show_map']) {
 
-                        if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
-                            $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];
-                        }
+						if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
+							$gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];
+						}
 
-                        if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
-                            $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];
-                        }
+						if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
+							$gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];
+						}
 
-                        if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
-                            $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];
-                        }
+						if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
+							$gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];
+						}
 
-                        if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
-                            $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];
-                        }
+						if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
+							$gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];
+						}
 
-                    }
+					}
 
-                    // show lat lng
-                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
-                        $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];
-                    }
-                }
+					// show lat lng
+					if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
+						$gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];
+					}
+				}
 
-            } elseif (trim($type) == 'file') {
-                if (isset($request_info[$name])) {
-                    $request_files = array();
-                    if ($request_info[$name] != '')
-                        $request_files = explode(",", $request_info[$name]);
+			} elseif (trim($type) == 'file') {
+				if (isset($request_info[$name])) {
+					$request_files = array();
+					if ($request_info[$name] != '')
+						$request_files = explode(",", $request_info[$name]);
 
-                    $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;
-                    geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);
-                }
-            } elseif (trim($type) == 'datepicker') {
-                if (isset($request_info[$name])) {
-                    $datetime = '';
+					$extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;
+					geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);
+				}
+			} elseif (trim($type) == 'datepicker') {
+				if (isset($request_info[$name])) {
+					$datetime = '';
                     
-                    if (!empty($request_info[$name])) {
-                        $date_format = geodir_default_date_format();
-                        if (isset($val['extra_fields']) && $val['extra_fields'] != '') {
-                            $extra_fields = unserialize($val['extra_fields']);
-                            $date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format;
-                        }
-
-                        // check if we need to change the format or not
-                        $date_format_len = strlen(str_replace(' ', '', $date_format));
-                        if($date_format_len>5){// if greater then 5 then it's the old style format.
+					if (!empty($request_info[$name])) {
+						$date_format = geodir_default_date_format();
+						if (isset($val['extra_fields']) && $val['extra_fields'] != '') {
+							$extra_fields = unserialize($val['extra_fields']);
+							$date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format;
+						}
 
-                            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-                            $replace = array('d','j','l','m','n','F','Y');//PHP date format
+						// check if we need to change the format or not
+						$date_format_len = strlen(str_replace(' ', '', $date_format));
+						if($date_format_len>5){// if greater then 5 then it's the old style format.
 
-                            $date_format = str_replace($search, $replace, $date_format);
+							$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
+							$replace = array('d','j','l','m','n','F','Y');//PHP date format
 
-                            $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
+							$date_format = str_replace($search, $replace, $date_format);
 
-                        }else{
-                            $post_htmlvar_value = $request_info[$name];
-                        }
+							$post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
 
-                        $post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d
-                        $datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated
-                    }
+						}else{
+							$post_htmlvar_value = $request_info[$name];
+						}
 
-                    $gd_post_info[$name] = $datetime;
-                }
-            } else if ($type == 'multiselect') {
-                if (isset($request_info[$name])) {
-                    $gd_post_info[$name] = $request_info[$name];
-                } else {
-                    if (isset($request_info['gd_field_' . $name])) {
-                        $gd_post_info[$name] = ''; /* fix de-select for multiselect */
-                    }
-                }
-            } else if (isset($request_info[$name])) {
-                $gd_post_info[$name] = $request_info[$name];
-            }
+						$post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d
+						$datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated
+					}
 
-        endforeach;
+					$gd_post_info[$name] = $datetime;
+				}
+			} else if ($type == 'multiselect') {
+				if (isset($request_info[$name])) {
+					$gd_post_info[$name] = $request_info[$name];
+				} else {
+					if (isset($request_info['gd_field_' . $name])) {
+						$gd_post_info[$name] = ''; /* fix de-select for multiselect */
+					}
+				}
+			} else if (isset($request_info[$name])) {
+				$gd_post_info[$name] = $request_info[$name];
+			}
 
-        if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {
-            $gd_post_info['post_dummy'] = $request_info['post_dummy'];
-        }
+		endforeach;
 
-        // Save post detail info in detail table
-        if (!empty($gd_post_info)) {
-            geodir_save_post_info($last_post_id, $gd_post_info);
-        }
+		if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {
+			$gd_post_info['post_dummy'] = $request_info['post_dummy'];
+		}
 
+		// Save post detail info in detail table
+		if (!empty($gd_post_info)) {
+			geodir_save_post_info($last_post_id, $gd_post_info);
+		}
 
-        // Set categories to the listing
-        if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {
-            $post_category = array();
 
-            foreach ($request_info['post_category'] as $taxonomy => $cat) {
+		// Set categories to the listing
+		if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {
+			$post_category = array();
 
-                if ($dummy)
-                    $post_category = $cat;
-                else {
+			foreach ($request_info['post_category'] as $taxonomy => $cat) {
 
-                    if (!is_array($cat) && strstr($cat, ','))
-                        $cat = explode(',', $cat);
+				if ($dummy)
+					$post_category = $cat;
+				else {
 
-                    if (!empty($cat) && is_array($cat))
-                        $post_category = array_map('intval', $cat);
-                }
+					if (!is_array($cat) && strstr($cat, ','))
+						$cat = explode(',', $cat);
 
-                wp_set_object_terms($last_post_id, $post_category, $taxonomy);
-            }
+					if (!empty($cat) && is_array($cat))
+						$post_category = array_map('intval', $cat);
+				}
 
-            $post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : '';
+				wp_set_object_terms($last_post_id, $post_category, $taxonomy);
+			}
 
-            $post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : '';
-            geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str);
+			$post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : '';
 
-        }
+			$post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : '';
+			geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str);
 
-        $post_tags = '';
-        // Set tags to the listing
-        if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
-            $post_tags = explode(",", $request_info['post_tags']);
-        } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
-            if ($dummy)
-                $post_tags = $request_info['post_tags'];
-        } else {
-            if ($dummy)
-                $post_tags = array($request_info['post_title']);
-        }
+		}
 
-        if (is_array($post_tags)) {
-            $taxonomy = $request_info['listing_type'] . '_tags';
-            wp_set_object_terms($last_post_id, $post_tags, $taxonomy);
-        }
+		$post_tags = '';
+		// Set tags to the listing
+		if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
+			$post_tags = explode(",", $request_info['post_tags']);
+		} elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
+			if ($dummy)
+				$post_tags = $request_info['post_tags'];
+		} else {
+			if ($dummy)
+				$post_tags = array($request_info['post_title']);
+		}
 
+		if (is_array($post_tags)) {
+			$taxonomy = $request_info['listing_type'] . '_tags';
+			wp_set_object_terms($last_post_id, $post_tags, $taxonomy);
+		}
 
-        // Insert attachment
 
-        if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {
-            if (!$dummy) {
-                $tmpimgArr = trim($request_info['post_images'], ",");
-                $tmpimgArr = explode(",", $tmpimgArr);
-                geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);
-            } else{
-                geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);
-            }
+		// Insert attachment
+
+		if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {
+			if (!$dummy) {
+				$tmpimgArr = trim($request_info['post_images'], ",");
+				$tmpimgArr = explode(",", $tmpimgArr);
+				geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);
+			} else{
+				geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);
+			}
 
 
-        } elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {
+		} elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {
 
-            /* Delete Attachments
+			/* Delete Attachments
 			$postcurr_images = geodir_get_images($last_post_id);
 
 			$wpdb->query(
@@ -521,34 +521,34 @@  discard block
 block discarded – undo
 			geodir_save_post_info($last_post_id, $gd_post_featured_img);
 			*/
 
-        }
+		}
 
-        geodir_remove_temp_images();
-        geodir_set_wp_featured_image($last_post_id);
+		geodir_remove_temp_images();
+		geodir_set_wp_featured_image($last_post_id);
 
-        /**
-         * Called after a listing is saved to the database and before any email have been sent.
-         *
-         * @since 1.0.0
-         * @param int $last_post_id The saved post ID.
-         * @param array $request_info The post details in an array.
-         * @see 'geodir_after_save_listinginfo'
-         */
-        do_action('geodir_after_save_listing', $last_post_id, $request_info);
+		/**
+		 * Called after a listing is saved to the database and before any email have been sent.
+		 *
+		 * @since 1.0.0
+		 * @param int $last_post_id The saved post ID.
+		 * @param array $request_info The post details in an array.
+		 * @see 'geodir_after_save_listinginfo'
+		 */
+		do_action('geodir_after_save_listing', $last_post_id, $request_info);
 
-        //die;
+		//die;
 
-        if ($send_post_submit_mail) { // if new post send out email
-            $to_name = geodir_get_client_name($current_user->ID);
-            geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);
-        }
-        /*
+		if ($send_post_submit_mail) { // if new post send out email
+			$to_name = geodir_get_client_name($current_user->ID);
+			geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);
+		}
+		/*
          * Unset the session so we don't loop.
          */
-        $gd_session->un_set('listing');
-        return $last_post_id;
+		$gd_session->un_set('listing');
+		return $last_post_id;
 
-    }
+	}
 
 }
 
@@ -567,611 +567,611 @@  discard block
 block discarded – undo
 function geodir_get_post_info($post_id = '')
 {
 
-    global $wpdb, $plugin_prefix, $post, $post_info;
+	global $wpdb, $plugin_prefix, $post, $post_info;
 
-    if ($post_id == '' && !empty($post))
-        $post_id = $post->ID;
+	if ($post_id == '' && !empty($post))
+		$post_id = $post->ID;
 
-    $post_type = get_post_type($post_id);
+	$post_type = get_post_type($post_id);
 
-    $all_postypes = geodir_get_posttypes();
+	$all_postypes = geodir_get_posttypes();
 
-    if (!in_array($post_type, $all_postypes))
-        return false;
+	if (!in_array($post_type, $all_postypes))
+		return false;
 
-    $table = $plugin_prefix . $post_type . '_detail';
+	$table = $plugin_prefix . $post_type . '_detail';
 
-    /**
-     * Apply Filter to change Post info
-     *
-     * You can use this filter to change Post info.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     */
-    $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
+	/**
+	 * Apply Filter to change Post info
+	 *
+	 * You can use this filter to change Post info.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 */
+	$query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
 			  WHERE p.ID = pd.post_id
 			  AND pd.post_id = %d", $post_id));
 
-    $post_detail = $wpdb->get_row($query);
+	$post_detail = $wpdb->get_row($query);
 
-    return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false;
+	return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false;
 
 }
 
 
 if (!function_exists('geodir_save_post_info')) {
-    /**
-     * Saves post detail info in detail table.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param int $post_id The post ID.
-     * @param array $postinfo_array {
-     *    Post info that needs to be saved in detail table.
-     *
-     *    @type string $post_title              Listing title.
-     *    @type string $post_tags               Listing tags.
-     *    @type string $post_status             Listing post status.
-     *    @type string $post_location_id        Listing location ID.
-     *    @type string $claimed                 Todo Desc needed.
-     *    @type string $businesses              Todo Desc needed.
-     *    @type int    $submit_time             Submitted time in unix timestamp.
-     *    @type string $submit_ip               Submitted IP.
-     *    @type string $expire_date             Listing expiration date.
-     *    @type int    $package_id              Listing package ID.
-     *    @type int    $alive_days              Todo Desc needed.
-     *    @type int    $is_featured             Is this a featured listing?.
-     *    @type string $post_address            Listing address.
-     *    @type string $post_city               Listing city.
-     *    @type string $post_region             Listing region.
-     *    @type string $post_country            Listing country.
-     *    @type string $post_locations          Listing locations.
-     *    @type string $post_zip                Listing zip.
-     *    @type string $post_latitude           Listing latitude.
-     *    @type string $post_longitude          Listing longitude.
-     *    @type string $post_mapview            Listing mapview. Default "ROADMAP".
-     *    @type string $post_mapzoom            Listing mapzoom Default "9".
-     *    @type string $geodir_timing           Business timing info.
-     *    @type string $geodir_contact          Contact number.
-     *    @type string $geodir_email            Business contact email.
-     *    @type string $geodir_website          Business website.
-     *    @type string $geodir_twitter          Twitter link.
-     *    @type string $geodir_facebook         Facebook link.
-     *    @type string $geodir_video            Video link.
-     *    @type string $geodir_special_offers   Special offers.
-     *
-     * }
-     * @return bool
-     */
-    function geodir_save_post_info($post_id, $postinfo_array = array())
-    {
-        global $wpdb, $plugin_prefix;
-
-        $post_type = get_post_type($post_id);
-
-        $table = $plugin_prefix . $post_type . '_detail';
-
-        /**
-         * Filter to change Post info
-         *
-         * You can use this filter to change Post info.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
-         * @param int $post_id The post ID.
-         */
-        $postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);
+	/**
+	 * Saves post detail info in detail table.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param int $post_id The post ID.
+	 * @param array $postinfo_array {
+	 *    Post info that needs to be saved in detail table.
+	 *
+	 *    @type string $post_title              Listing title.
+	 *    @type string $post_tags               Listing tags.
+	 *    @type string $post_status             Listing post status.
+	 *    @type string $post_location_id        Listing location ID.
+	 *    @type string $claimed                 Todo Desc needed.
+	 *    @type string $businesses              Todo Desc needed.
+	 *    @type int    $submit_time             Submitted time in unix timestamp.
+	 *    @type string $submit_ip               Submitted IP.
+	 *    @type string $expire_date             Listing expiration date.
+	 *    @type int    $package_id              Listing package ID.
+	 *    @type int    $alive_days              Todo Desc needed.
+	 *    @type int    $is_featured             Is this a featured listing?.
+	 *    @type string $post_address            Listing address.
+	 *    @type string $post_city               Listing city.
+	 *    @type string $post_region             Listing region.
+	 *    @type string $post_country            Listing country.
+	 *    @type string $post_locations          Listing locations.
+	 *    @type string $post_zip                Listing zip.
+	 *    @type string $post_latitude           Listing latitude.
+	 *    @type string $post_longitude          Listing longitude.
+	 *    @type string $post_mapview            Listing mapview. Default "ROADMAP".
+	 *    @type string $post_mapzoom            Listing mapzoom Default "9".
+	 *    @type string $geodir_timing           Business timing info.
+	 *    @type string $geodir_contact          Contact number.
+	 *    @type string $geodir_email            Business contact email.
+	 *    @type string $geodir_website          Business website.
+	 *    @type string $geodir_twitter          Twitter link.
+	 *    @type string $geodir_facebook         Facebook link.
+	 *    @type string $geodir_video            Video link.
+	 *    @type string $geodir_special_offers   Special offers.
+	 *
+	 * }
+	 * @return bool
+	 */
+	function geodir_save_post_info($post_id, $postinfo_array = array())
+	{
+		global $wpdb, $plugin_prefix;
+
+		$post_type = get_post_type($post_id);
+
+		$table = $plugin_prefix . $post_type . '_detail';
+
+		/**
+		 * Filter to change Post info
+		 *
+		 * You can use this filter to change Post info.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
+		 * @param int $post_id The post ID.
+		 */
+		$postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);
+
+		$query_string_escaped = '';
+		$query_string_array = array();
+
+		if (!empty($postmeta) && $post_id) {
+
+			$columns = $wpdb->get_col("show columns from $table");
+			foreach ($postmeta as $mkey => $mval) {
+				if(in_array($mkey,$columns)) {
+					if (is_array($mval)) {
+						$mval = implode(",", $mval);
+					}
+					$query_string_escaped .= " $mkey = %s, "; // we can set the key here as we check if the column exists above
+					$query_string_array[] = stripslashes($mval); // we strip slashes as we are using wpdb prepare
 
-        $query_string_escaped = '';
-        $query_string_array = array();
+				}
+			}
 
-        if (!empty($postmeta) && $post_id) {
+			$query_string_escaped = trim($query_string_escaped, ", ");
 
-            $columns = $wpdb->get_col("show columns from $table");
-            foreach ($postmeta as $mkey => $mval) {
-                if(in_array($mkey,$columns)) {
-                    if (is_array($mval)) {
-                        $mval = implode(",", $mval);
-                    }
-                    $query_string_escaped .= " $mkey = %s, "; // we can set the key here as we check if the column exists above
-                    $query_string_array[] = stripslashes($mval); // we strip slashes as we are using wpdb prepare
+			if (empty($query_string_array) || trim($query_string_escaped) == '') {
+				return false;
+			}
 
-                }
-            }
+			$query_string_array = str_replace(array("'%", "%'"), array("'%%", "%%'"), $query_string_array);
 
-            $query_string_escaped = trim($query_string_escaped, ", ");
 
-            if (empty($query_string_array) || trim($query_string_escaped) == '') {
-                return false;
-            }
+			/**
+			 * Called before saving the listing info.
+			 *
+			 * @since 1.0.0
+			 * @package GeoDirectory
+			 * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
+			 * @param int $post_id The post ID.
+			 */
+			do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
 
-            $query_string_array = str_replace(array("'%", "%'"), array("'%%", "%%'"), $query_string_array);
+			if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
 
+				$query_string_array[] = $post_id;
+				$wpdb->query(
+					$wpdb->prepare(
+						"UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d",
+						$query_string_array
+					)
+				);
 
-            /**
-             * Called before saving the listing info.
-             *
-             * @since 1.0.0
-             * @package GeoDirectory
-             * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
-             * @param int $post_id The post ID.
-             */
-            do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
 
-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
+			} else {
 
-                $query_string_array[] = $post_id;
-                $wpdb->query(
-                    $wpdb->prepare(
-                        "UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d",
-                        $query_string_array
-                    )
-                );
+				array_unshift($query_string_array, $post_id);
+				$wpdb->query(
+					$wpdb->prepare(
+						"INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped,
+						$query_string_array
+					)
+				);
+                
+			}
 
+			/**
+			 * Called after saving the listing info.
+			 *
+			 * @since 1.0.0
+			 * @package GeoDirectory
+			 * @param array $postinfo_array Post info that needs to be saved in detail table.
+			 * @param int $post_id The post ID.
+			 * @see 'geodir_after_save_listing'
+			 */
+			do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
+
+			return true;
+		} else
+			return false;
 
-            } else {
+	}
+}
 
-                array_unshift($query_string_array, $post_id);
-                $wpdb->query(
-                    $wpdb->prepare(
-                        "INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped,
-                        $query_string_array
-                    )
-                );
-                
-            }
 
-            /**
-             * Called after saving the listing info.
-             *
-             * @since 1.0.0
-             * @package GeoDirectory
-             * @param array $postinfo_array Post info that needs to be saved in detail table.
-             * @param int $post_id The post ID.
-             * @see 'geodir_after_save_listing'
-             */
-            do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
+if (!function_exists('geodir_save_post_meta')) {
+	/**
+	 * Save or update post custom fields.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param int $post_id The post ID.
+	 * @param string $postmeta Detail table column name.
+	 * @param string $meta_value Detail table column value.
+	 * @return void|bool
+	 */
+	function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')
+	{
+
+		global $wpdb, $plugin_prefix;
+
+		$post_type = get_post_type($post_id);
+
+		$table = $plugin_prefix . $post_type . '_detail';
+
+		if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
+
+			if (is_array($meta_value)) {
+				$meta_value = implode(",", $meta_value);
+			}
 
-            return true;
-        } else
-            return false;
+			if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
 
-    }
-}
+				$wpdb->query(
+					$wpdb->prepare(
+						"UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",
+						array($post_id)
+					)
+				);
 
+			} else {
 
-if (!function_exists('geodir_save_post_meta')) {
-    /**
-     * Save or update post custom fields.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param int $post_id The post ID.
-     * @param string $postmeta Detail table column name.
-     * @param string $meta_value Detail table column value.
-     * @return void|bool
-     */
-    function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')
-    {
-
-        global $wpdb, $plugin_prefix;
-
-        $post_type = get_post_type($post_id);
-
-        $table = $plugin_prefix . $post_type . '_detail';
-
-        if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
-
-            if (is_array($meta_value)) {
-                $meta_value = implode(",", $meta_value);
-            }
-
-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
-
-                $wpdb->query(
-                    $wpdb->prepare(
-                        "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",
-                        array($post_id)
-                    )
-                );
-
-            } else {
-
-                $wpdb->query(
-                    $wpdb->prepare(
-                        "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",
-                        array($post_id)
-                    )
-                );
-            }
-
-
-        } else
-            return false;
-    }
+				$wpdb->query(
+					$wpdb->prepare(
+						"INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",
+						array($post_id)
+					)
+				);
+			}
+
+
+		} else
+			return false;
+	}
 }
 
 if (!function_exists('geodir_delete_post_meta')) {
-    /**
-     * Delete post custom fields.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param int $post_id The post ID.
-     * @param string $postmeta Detail table column name.
-     * @todo check if this is depreciated
-     * @todo Fix unknown variable mval
-     * @return bool
-     */
-    function geodir_delete_post_meta($post_id, $postmeta)
-    {
-
-        global $wpdb, $plugin_prefix;
-
-        $post_type = get_post_type($post_id);
-
-        $table = $plugin_prefix . $post_type . '_detail';
-
-        if (is_array($postmeta) && !empty($postmeta) && $post_id) {
-            $post_meta_set_query = '';
-
-            foreach ($postmeta as $mkey) {
-                if ($mval != '')
-                    $post_meta_set_query .= $mkey . " = '', ";
-            }
-
-            $post_meta_set_query = trim($post_meta_set_query, ", ");
+	/**
+	 * Delete post custom fields.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param int $post_id The post ID.
+	 * @param string $postmeta Detail table column name.
+	 * @todo check if this is depreciated
+	 * @todo Fix unknown variable mval
+	 * @return bool
+	 */
+	function geodir_delete_post_meta($post_id, $postmeta)
+	{
+
+		global $wpdb, $plugin_prefix;
+
+		$post_type = get_post_type($post_id);
+
+		$table = $plugin_prefix . $post_type . '_detail';
+
+		if (is_array($postmeta) && !empty($postmeta) && $post_id) {
+			$post_meta_set_query = '';
+
+			foreach ($postmeta as $mkey) {
+				if ($mval != '')
+					$post_meta_set_query .= $mkey . " = '', ";
+			}
+
+			$post_meta_set_query = trim($post_meta_set_query, ", ");
             
-            if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {
-                return false;
-            }
-
-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
-
-                $wpdb->query(
-                    $wpdb->prepare(
-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",
-                        array($post_id)
-                    )
-                );
-
-                return true;
-            }
-
-        } elseif ($postmeta != '' && $post_id) {
-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
-
-                $wpdb->query(
-                    $wpdb->prepare(
-                        "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",
-                        array($post_id)
-                    )
-                );
-
-                return true;
-            }
-
-        } else
-            return false;
-    }
+			if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {
+				return false;
+			}
+
+			if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
+
+				$wpdb->query(
+					$wpdb->prepare(
+						"UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",
+						array($post_id)
+					)
+				);
+
+				return true;
+			}
+
+		} elseif ($postmeta != '' && $post_id) {
+			if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
+
+				$wpdb->query(
+					$wpdb->prepare(
+						"UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",
+						array($post_id)
+					)
+				);
+
+				return true;
+			}
+
+		} else
+			return false;
+	}
 }
 
 
 if (!function_exists('geodir_get_post_meta')) {
-    /**
-     * Get post custom meta.
-     *
-     * @since 1.0.0
-     * @since 1.6.20 Hook added to filter value.
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param int $post_id The post ID.
-     * @param string $meta_key The meta key to retrieve.
-     * @param bool $single Optional. Whether to return a single value. Default false.
-     * @todo single variable not yet implemented.
-     * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.
-     */
-    function geodir_get_post_meta($post_id, $meta_key, $single = false) {
-        if (!$post_id) {
-            return false;
-        }
-        global $wpdb, $plugin_prefix;
-
-        $all_postypes = geodir_get_posttypes();
-
-        $post_type = get_post_type($post_id);
-
-        if (!in_array($post_type, $all_postypes))
-            return false;
-
-        $table = $plugin_prefix . $post_type . '_detail';
-
-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
-            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
+	/**
+	 * Get post custom meta.
+	 *
+	 * @since 1.0.0
+	 * @since 1.6.20 Hook added to filter value.
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param int $post_id The post ID.
+	 * @param string $meta_key The meta key to retrieve.
+	 * @param bool $single Optional. Whether to return a single value. Default false.
+	 * @todo single variable not yet implemented.
+	 * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.
+	 */
+	function geodir_get_post_meta($post_id, $meta_key, $single = false) {
+		if (!$post_id) {
+			return false;
+		}
+		global $wpdb, $plugin_prefix;
+
+		$all_postypes = geodir_get_posttypes();
+
+		$post_type = get_post_type($post_id);
+
+		if (!in_array($post_type, $all_postypes))
+			return false;
+
+		$table = $plugin_prefix . $post_type . '_detail';
+
+		if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
+			$meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
             
-            if ($meta_value && $meta_value !== '') {
-                $meta_value = maybe_serialize($meta_value);
-            }
-        } else {
-            $meta_value = false;
-        }
+			if ($meta_value && $meta_value !== '') {
+				$meta_value = maybe_serialize($meta_value);
+			}
+		} else {
+			$meta_value = false;
+		}
         
-        /**
-         * Filter the listing custom meta.
-         *
-         * @since 1.6.20
-         * 
-         * @param bool|mixed|null|string $meta_value Will be an array if $single is false. Will be value of meta data field if $single is true.
-         * @param int $post_id The post ID.
-         * @param string $meta_key The meta key to retrieve.
-         * @param bool $single Optional. Whether to return a single value. Default false.
-         */
-        return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single );
-    }
+		/**
+		 * Filter the listing custom meta.
+		 *
+		 * @since 1.6.20
+		 * 
+		 * @param bool|mixed|null|string $meta_value Will be an array if $single is false. Will be value of meta data field if $single is true.
+		 * @param int $post_id The post ID.
+		 * @param string $meta_key The meta key to retrieve.
+		 * @param bool $single Optional. Whether to return a single value. Default false.
+		 */
+		return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single );
+	}
 }
 
 
 if (!function_exists('geodir_save_post_images')) {
-    /**
-     * Save post attachments.
-     *
-     * @since 1.0.0
-     * @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 The post ID.
-     * @param array $post_image Post image urls as an array.
-     * @param bool $dummy Optional. Is this a dummy listing? Default false.
-     */
-    function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)
-    {
+	/**
+	 * Save post attachments.
+	 *
+	 * @since 1.0.0
+	 * @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 The post ID.
+	 * @param array $post_image Post image urls as an array.
+	 * @param bool $dummy Optional. Is this a dummy listing? Default false.
+	 */
+	function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)
+	{
 
 
-        global $wpdb, $plugin_prefix, $current_user;
+		global $wpdb, $plugin_prefix, $current_user;
 
-        $post_type = get_post_type($post_id);
+		$post_type = get_post_type($post_id);
 
-        $table = $plugin_prefix . $post_type . '_detail';
+		$table = $plugin_prefix . $post_type . '_detail';
 
-        $post_images = geodir_get_images($post_id);
+		$post_images = geodir_get_images($post_id);
 
-        $wpdb->query(
-            $wpdb->prepare(
-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",
-                array($post_id)
-            )
-        );
+		$wpdb->query(
+			$wpdb->prepare(
+				"UPDATE " . $table . " SET featured_image = '' where post_id =%d",
+				array($post_id)
+			)
+		);
 
-        $invalid_files = $post_images;
-        $valid_file_ids = array();
-        $valid_files_condition = '';
-        $geodir_uploaddir = '';
+		$invalid_files = $post_images;
+		$valid_file_ids = array();
+		$valid_files_condition = '';
+		$geodir_uploaddir = '';
 
-        $remove_files = array();
+		$remove_files = array();
 
-        if (!empty($post_image)) {
+		if (!empty($post_image)) {
 
-            $uploads = wp_upload_dir();
-            $uploads_dir = $uploads['path'];
+			$uploads = wp_upload_dir();
+			$uploads_dir = $uploads['path'];
 
-            $geodir_uploadpath = $uploads['path'];
-            $geodir_uploadurl = $uploads['url'];
-            $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';
+			$geodir_uploadpath = $uploads['path'];
+			$geodir_uploadurl = $uploads['url'];
+			$sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';
 
-            $invalid_files = array();
-            $postcurr_images = array();
+			$invalid_files = array();
+			$postcurr_images = array();
 
-            for ($m = 0; $m < count($post_image); $m++) {
-                $menu_order = $m + 1;
+			for ($m = 0; $m < count($post_image); $m++) {
+				$menu_order = $m + 1;
 
-                $file_path = '';
-                /* --------- start ------- */
+				$file_path = '';
+				/* --------- start ------- */
 
-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
+				$split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
 
-                $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';
+				$split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';
 
 
-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
+				if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
 
-                    /* --------- end ------- */
-                    $curr_img_url = $post_image[$m];
+					/* --------- end ------- */
+					$curr_img_url = $post_image[$m];
 
-                    $image_name_arr = explode('/', $curr_img_url);
+					$image_name_arr = explode('/', $curr_img_url);
 
-                    $count_image_name_arr = count($image_name_arr) - 2;
+					$count_image_name_arr = count($image_name_arr) - 2;
 
-                    $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;
+					$count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;
 
-                    $curr_img_dir = $image_name_arr[$count_image_name_arr];
+					$curr_img_dir = $image_name_arr[$count_image_name_arr];
 
-                    $filename = end($image_name_arr);
-                    if (strpos($filename, '?') !== false) {
-                        list($filename) = explode('?', $filename);
-                    }
+					$filename = end($image_name_arr);
+					if (strpos($filename, '?') !== false) {
+						list($filename) = explode('?', $filename);
+					}
 
-                    $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);
-                    $curr_img_dir = str_replace($filename, "", $curr_img_dir);
+					$curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);
+					$curr_img_dir = str_replace($filename, "", $curr_img_dir);
 
-                    $img_name_arr = explode('.', $filename);
+					$img_name_arr = explode('.', $filename);
 
-                    $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;
-                    if (!empty($img_name_arr) && count($img_name_arr) > 2) {
-                        $new_img_name_arr = $img_name_arr;
-                        if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
-                            unset($new_img_name_arr[count($img_name_arr) - 1]);
-                            $file_title = implode('.', $new_img_name_arr);
-                        }
-                    }
-                    $file_title = sanitize_file_name($file_title);
-                    $file_name = sanitize_file_name($filename);
+					$file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;
+					if (!empty($img_name_arr) && count($img_name_arr) > 2) {
+						$new_img_name_arr = $img_name_arr;
+						if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
+							unset($new_img_name_arr[count($img_name_arr) - 1]);
+							$file_title = implode('.', $new_img_name_arr);
+						}
+					}
+					$file_title = sanitize_file_name($file_title);
+					$file_name = sanitize_file_name($filename);
 
-                    $arr_file_type = wp_check_filetype($filename);
+					$arr_file_type = wp_check_filetype($filename);
 
-                    $uploaded_file_type = $arr_file_type['type'];
+					$uploaded_file_type = $arr_file_type['type'];
 
-                    // Set an array containing a list of acceptable formats
-                    $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
+					// Set an array containing a list of acceptable formats
+					$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
 
-                    // If the uploaded file is the right format
-                    if (in_array($uploaded_file_type, $allowed_file_types)) {
-                        if (!function_exists('wp_handle_upload')) {
-                            require_once(ABSPATH . 'wp-admin/includes/file.php');
-                        }
+					// If the uploaded file is the right format
+					if (in_array($uploaded_file_type, $allowed_file_types)) {
+						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);
+						}
 
-                        $external_img = false;
-                        if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
-                        } else {
-                            $external_img = true;
-                        }
+						$external_img = false;
+						if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
+						} else {
+							$external_img = true;
+						}
 
-                        if ($dummy || $external_img) {
-                            $uploaded_file = array();
-                            $uploaded = (array)fetch_remote_file($curr_img_url);
+						if ($dummy || $external_img) {
+							$uploaded_file = array();
+							$uploaded = (array)fetch_remote_file($curr_img_url);
 
-                            if (isset($uploaded['error']) && empty($uploaded['error'])) {
-                                $new_name = basename($uploaded['file']);
-                                $uploaded_file = $uploaded;
-                            }else{
-                                print_r($uploaded);exit;
-                            }
-                            $external_img = false;
-                        } else {
-                            $new_name = $post_id . '_' . $file_name;
+							if (isset($uploaded['error']) && empty($uploaded['error'])) {
+								$new_name = basename($uploaded['file']);
+								$uploaded_file = $uploaded;
+							}else{
+								print_r($uploaded);exit;
+							}
+							$external_img = false;
+						} else {
+							$new_name = $post_id . '_' . $file_name;
 
-                            if ($curr_img_dir == $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;
-                            }
+							if ($curr_img_dir == $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 = '';
+							$uploaded_file = '';
 
-                            if (file_exists($img_path)) {
-                                $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
-                                $file_path = '';
-                            } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
-                                $uploaded_file = true;
-                                $file_path = $curr_img_dir . '/' . $filename;
-                            }
+							if (file_exists($img_path)) {
+								$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
+								$file_path = '';
+							} else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
+								$uploaded_file = true;
+								$file_path = $curr_img_dir . '/' . $filename;
+							}
 
-                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))
-                                unlink($img_path);
-                        }
+							if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))
+								unlink($img_path);
+						}
 
-                        if (!empty($uploaded_file)) {
-                            if (!isset($file_path) || !$file_path) {
-                                $file_path = $sub_dir . '/' . $new_name;
-                            }
+						if (!empty($uploaded_file)) {
+							if (!isset($file_path) || !$file_path) {
+								$file_path = $sub_dir . '/' . $new_name;
+							}
 
-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
+							$postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
 
-                            if ($menu_order == 1) {
+							if ($menu_order == 1) {
 
-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
+								$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
 
-                            }
+							}
 
-                            // Set up options array to add this file as an attachment
-                            $attachment = array();
-                            $attachment['post_id'] = $post_id;
-                            $attachment['title'] = $file_title;
-                            $attachment['content'] = '';
-                            $attachment['file'] = $file_path;
-                            $attachment['mime_type'] = $uploaded_file_type;
-                            $attachment['menu_order'] = $menu_order;
-                            $attachment['is_featured'] = 0;
+							// Set up options array to add this file as an attachment
+							$attachment = array();
+							$attachment['post_id'] = $post_id;
+							$attachment['title'] = $file_title;
+							$attachment['content'] = '';
+							$attachment['file'] = $file_path;
+							$attachment['mime_type'] = $uploaded_file_type;
+							$attachment['menu_order'] = $menu_order;
+							$attachment['is_featured'] = 0;
 
-                            $attachment_set = '';
+							$attachment_set = '';
 
-                            foreach ($attachment as $key => $val) {
-                                if ($val != '')
-                                    $attachment_set .= $key . " = '" . $val . "', ";
-                            }
+							foreach ($attachment as $key => $val) {
+								if ($val != '')
+									$attachment_set .= $key . " = '" . $val . "', ";
+							}
 
-                            $attachment_set = trim($attachment_set, ", ");
+							$attachment_set = trim($attachment_set, ", ");
+
+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
 
-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
+							$valid_file_ids[] = $wpdb->insert_id;
+						}
 
-                            $valid_file_ids[] = $wpdb->insert_id;
-                        }
+					}
 
-                    }
 
+				} else {
+					$valid_file_ids[] = $find_image;
 
-                } else {
-                    $valid_file_ids[] = $find_image;
-
-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
+					$postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
 
-                    $wpdb->query(
-                        $wpdb->prepare(
-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",
-                            array($menu_order, $split_img_path[1], $post_id)
-                        )
-                    );
+					$wpdb->query(
+						$wpdb->prepare(
+							"UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",
+							array($menu_order, $split_img_path[1], $post_id)
+						)
+					);
 
-                    if ($menu_order == 1)
-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
+					if ($menu_order == 1)
+						$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
 
-                }
+				}
 
 
-            }
+			}
 
-            if (!empty($valid_file_ids)) {
+			if (!empty($valid_file_ids)) {
 
-                $remove_files = $valid_file_ids;
+				$remove_files = $valid_file_ids;
 
-                $remove_files_length = count($remove_files);
-                $remove_files_format = array_fill(0, $remove_files_length, '%d');
-                $format = implode(',', $remove_files_format);
-                $valid_files_condition = " ID NOT IN ($format) AND ";
+				$remove_files_length = count($remove_files);
+				$remove_files_format = array_fill(0, $remove_files_length, '%d');
+				$format = implode(',', $remove_files_format);
+				$valid_files_condition = " ID NOT IN ($format) AND ";
 
-            }
+			}
 
-            //Get and remove all old images of post from database to set by new order
+			//Get and remove all old images of post from database to set by new order
 
-            if (!empty($post_images)) {
+			if (!empty($post_images)) {
 
-                foreach ($post_images as $img) {
+				foreach ($post_images as $img) {
 
-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
+					if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
 
-                        $invalid_files[] = (object)array('src' => $img->src);
+						$invalid_files[] = (object)array('src' => $img->src);
 
-                    }
+					}
 
-                }
+				}
 
-            }
+			}
 
-            $invalid_files = (object)$invalid_files;
-        }
+			$invalid_files = (object)$invalid_files;
+		}
 
-        $remove_files[] = $post_id;
+		$remove_files[] = $post_id;
 
-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
+		$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
 
-        if (!empty($invalid_files))
-            geodir_remove_attachments($invalid_files);
-    }
+		if (!empty($invalid_files))
+			geodir_remove_attachments($invalid_files);
+	}
 
 }
 
@@ -1185,12 +1185,12 @@  discard block
 block discarded – undo
 function geodir_remove_temp_images()
 {
 
-    global $current_user;
+	global $current_user;
 
-    $uploads = wp_upload_dir();
-    $uploads_dir = $uploads['path'];
+	$uploads = wp_upload_dir();
+	$uploads_dir = $uploads['path'];
 
-    /*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
+	/*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
 
 			$dirPath = $uploads_dir.'/temp_'.$current_user->data->ID;
 			if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {
@@ -1207,8 +1207,8 @@  discard block
 block discarded – undo
 			rmdir($dirPath);
 	}	*/
 
-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;
-    geodir_delete_directory($dirname);
+	$dirname = $uploads_dir . '/temp_' . $current_user->ID;
+	geodir_delete_directory($dirname);
 }
 
 
@@ -1222,137 +1222,137 @@  discard block
 block discarded – undo
  */
 function geodir_delete_directory($dirname)
 {
-    $dir_handle = '';
-    if (is_dir($dirname))
-        $dir_handle = opendir($dirname);
-    if (!$dir_handle)
-        return false;
-    while ($file = readdir($dir_handle)) {
-        if ($file != "." && $file != "..") {
-            if (!is_dir($dirname . "/" . $file))
-                unlink($dirname . "/" . $file);
-            else
-                geodir_delete_directory($dirname . '/' . $file);
-        }
-    }
-    closedir($dir_handle);
-    rmdir($dirname);
-    return true;
+	$dir_handle = '';
+	if (is_dir($dirname))
+		$dir_handle = opendir($dirname);
+	if (!$dir_handle)
+		return false;
+	while ($file = readdir($dir_handle)) {
+		if ($file != "." && $file != "..") {
+			if (!is_dir($dirname . "/" . $file))
+				unlink($dirname . "/" . $file);
+			else
+				geodir_delete_directory($dirname . '/' . $file);
+		}
+	}
+	closedir($dir_handle);
+	rmdir($dirname);
+	return true;
 
 }
 
 
 if (!function_exists('geodir_remove_attachments')) {
-    /**
-     * Remove post attachments.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @param array $postcurr_images Array of image objects.
-     */
-    function geodir_remove_attachments($postcurr_images = array())
-    {
-        // Unlink all past images of post
-        if (!empty($postcurr_images)) {
-
-            $uploads = wp_upload_dir();
-            $uploads_dir = $uploads['path'];
-
-            foreach ($postcurr_images as $postimg) {
-                $image_name_arr = explode('/', $postimg->src);
-                $filename = end($image_name_arr);
-                if (file_exists($uploads_dir . '/' . $filename))
-                    unlink($uploads_dir . '/' . $filename);
-            }
-
-        } // endif
-        // Unlink all past images of post end
-    }
+	/**
+	 * Remove post attachments.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @param array $postcurr_images Array of image objects.
+	 */
+	function geodir_remove_attachments($postcurr_images = array())
+	{
+		// Unlink all past images of post
+		if (!empty($postcurr_images)) {
+
+			$uploads = wp_upload_dir();
+			$uploads_dir = $uploads['path'];
+
+			foreach ($postcurr_images as $postimg) {
+				$image_name_arr = explode('/', $postimg->src);
+				$filename = end($image_name_arr);
+				if (file_exists($uploads_dir . '/' . $filename))
+					unlink($uploads_dir . '/' . $filename);
+			}
+
+		} // endif
+		// Unlink all past images of post end
+	}
 }
 
 if (!function_exists('geodir_get_featured_image')) {
-    /**
-     * Gets the post featured image.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global object $post The current post object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param int|string $post_id The post ID.
-     * @param string $size Optional. Thumbnail size. Default: thumbnail.
-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
-     * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false.
-     * @return bool|object Image details as an object.
-     */
-    function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false)
-    {
-
-        /*$img_arr['src'] = get_the_post_thumbnail_url( $post_id,  'medium');//medium/thumbnail
+	/**
+	 * Gets the post featured image.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global object $post The current post object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param int|string $post_id The post ID.
+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.
+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
+	 * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false.
+	 * @return bool|object Image details as an object.
+	 */
+	function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false)
+	{
+
+		/*$img_arr['src'] = get_the_post_thumbnail_url( $post_id,  'medium');//medium/thumbnail
         $img_arr['path'] = '';
         $img_arr['width'] = '';
         $img_arr['height'] = '';
         $img_arr['title'] = '';
         return (object)$img_arr;*/
-        global $wpdb, $plugin_prefix, $post;
+		global $wpdb, $plugin_prefix, $post;
 
-        if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {
-            $post_type = $post->post_type;
-        } else {
-            $post_type = get_post_type($post_id);
-        }
+		if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {
+			$post_type = $post->post_type;
+		} else {
+			$post_type = get_post_type($post_id);
+		}
 
-        if (!in_array($post_type, geodir_get_posttypes())) {
-            return false;// if not a GD CPT return;
-        }
+		if (!in_array($post_type, geodir_get_posttypes())) {
+			return false;// if not a GD CPT return;
+		}
 
 
-        $list_img_size = get_option('geodir_listing_img_size','default');
+		$list_img_size = get_option('geodir_listing_img_size','default');
 
-        if( $size=='list-thumb' && $list_img_size != 'default' ){
-            $fimg = get_the_post_thumbnail_url($post_id,$list_img_size);
-            if($fimg){
-                $uploads = wp_upload_dir(); 
-                $uploads_baseurl = $uploads['baseurl'];
-                $file = str_replace($uploads_baseurl,'',$fimg);
-            }
-        }
+		if( $size=='list-thumb' && $list_img_size != 'default' ){
+			$fimg = get_the_post_thumbnail_url($post_id,$list_img_size);
+			if($fimg){
+				$uploads = wp_upload_dir(); 
+				$uploads_baseurl = $uploads['baseurl'];
+				$file = str_replace($uploads_baseurl,'',$fimg);
+			}
+		}
 
-        $table = $plugin_prefix . $post_type . '_detail';
+		$table = $plugin_prefix . $post_type . '_detail';
 
-        if (!$file) {
-            if (isset($post->featured_image)) {
-                $file = $post->featured_image;
-            } else {
-                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
-            }
-        }
+		if (!$file) {
+			if (isset($post->featured_image)) {
+				$file = $post->featured_image;
+			} else {
+				$file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
+			}
+		}
 
-        if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {
-            $img_arr = array();
+		if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {
+			$img_arr = array();
 
-            $file_info = pathinfo($file);
-            $sub_dir = '';
-            if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
-                $sub_dir = stripslashes_deep($file_info['dirname']);
-            }
+			$file_info = pathinfo($file);
+			$sub_dir = '';
+			if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+				$sub_dir = stripslashes_deep($file_info['dirname']);
+			}
 
-            $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
-            $uploads_baseurl = $uploads['baseurl'];
-            $uploads_path = $uploads['path'];
+			$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
+			$uploads_baseurl = $uploads['baseurl'];
+			$uploads_path = $uploads['path'];
 
-            $file_name = $file_info['basename'];
+			$file_name = $file_info['basename'];
 
-            $uploads_url = $uploads_baseurl . $sub_dir;
+			$uploads_url = $uploads_baseurl . $sub_dir;
 
-            $img_src = $uploads_url . '/' . $file_name;
+			$img_src = $uploads_url . '/' . $file_name;
 
-            // jetpack CDN check
-            if (strpos($file, '.wp.com/') !== false) {
-                $img_src = $file;
-            }
+			// jetpack CDN check
+			if (strpos($file, '.wp.com/') !== false) {
+				$img_src = $file;
+			}
 
-            /*
+			/*
              * Allows the filter of image src for such things as CDN change.
              *
              * @since 1.5.7
@@ -1361,158 +1361,158 @@  discard block
 block discarded – undo
              * @param string $uploads_url The server upload directory url.
              * @param string $uploads_baseurl The uploads dir base url.
              */
-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$img_src,$file_name,$uploads_url,$uploads_baseurl);
-            $img_arr['path'] = $uploads_path . '/' . $file_name;
-            $width = 0;
-            $height = 0;
-            if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
-                $imagesize = getimagesize($img_arr['path']);
-                $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
-                $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
-            }
-            $img_arr['width'] = $width;
-            $img_arr['height'] = $height;
-            $img_arr['title'] = $post->post_title;
-        } elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {
-            foreach ($post_images as $image) {
-                return $image;
-            }
-        } else if ($no_image) {
-            $img_arr = array();
-
-            $default_img = '';
-            if (isset($post->default_category) && $post->default_category) {
-                $default_cat = $post->default_category;
-            } else {
-                $default_cat = geodir_get_post_meta($post_id, 'default_category', true);
-            }
-
-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
-                $default_img = $default_catimg['src'];
-            elseif ($no_image) {
-                $default_img = get_option('geodir_listing_no_img');
-            }
-
-            if (!empty($default_img)) {
-                $uploads = wp_upload_dir(); // Array of key => value pairs
-                $uploads_baseurl = $uploads['baseurl'];
-                $uploads_path = $uploads['path'];
-
-                $img_arr = array();
-
-                $file_info = pathinfo($default_img);
-
-                $file_name = $file_info['basename'];
-
-                $img_arr['src'] = $default_img;
-                $img_arr['path'] = $uploads_path . '/' . $file_name;
-
-                $width = 0;
-                $height = 0;
-                if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
-                    $imagesize = getimagesize($img_arr['path']);
-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
-                }
-                $img_arr['width'] = $width;
-                $img_arr['height'] = $height;
-
-                $img_arr['title'] = $post->post_title; // add the title to the array
-            }
-        }
-
-        if (!empty($img_arr))
-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );
-        else
-            return false;
-    }
+			$img_arr['src'] = apply_filters('geodir_get_featured_image_src',$img_src,$file_name,$uploads_url,$uploads_baseurl);
+			$img_arr['path'] = $uploads_path . '/' . $file_name;
+			$width = 0;
+			$height = 0;
+			if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
+				$imagesize = getimagesize($img_arr['path']);
+				$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
+				$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
+			}
+			$img_arr['width'] = $width;
+			$img_arr['height'] = $height;
+			$img_arr['title'] = $post->post_title;
+		} elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {
+			foreach ($post_images as $image) {
+				return $image;
+			}
+		} else if ($no_image) {
+			$img_arr = array();
+
+			$default_img = '';
+			if (isset($post->default_category) && $post->default_category) {
+				$default_cat = $post->default_category;
+			} else {
+				$default_cat = geodir_get_post_meta($post_id, 'default_category', true);
+			}
+
+			if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
+				$default_img = $default_catimg['src'];
+			elseif ($no_image) {
+				$default_img = get_option('geodir_listing_no_img');
+			}
+
+			if (!empty($default_img)) {
+				$uploads = wp_upload_dir(); // Array of key => value pairs
+				$uploads_baseurl = $uploads['baseurl'];
+				$uploads_path = $uploads['path'];
+
+				$img_arr = array();
+
+				$file_info = pathinfo($default_img);
+
+				$file_name = $file_info['basename'];
+
+				$img_arr['src'] = $default_img;
+				$img_arr['path'] = $uploads_path . '/' . $file_name;
+
+				$width = 0;
+				$height = 0;
+				if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
+					$imagesize = getimagesize($img_arr['path']);
+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
+				}
+				$img_arr['width'] = $width;
+				$img_arr['height'] = $height;
+
+				$img_arr['title'] = $post->post_title; // add the title to the array
+			}
+		}
+
+		if (!empty($img_arr))
+			return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );
+		else
+			return false;
+	}
 }
 
 if (!function_exists('geodir_show_featured_image')) {
-    /**
-     * Gets the post featured image.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @param int|string $post_id The post ID.
-     * @param string $size Optional. Thumbnail size. Default: thumbnail.
-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
-     * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.
-     * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false.
-     * @return bool|string Returns image html.
-     */
-    function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false)
-    {
-        $image = geodir_get_featured_image($post_id, $size, $no_image, $fimage);
-
-        $html = geodir_show_image($image, $size, $no_image, false);
-
-        if (!empty($html) && $echo) {
-            echo $html;
-        } elseif (!empty($html)) {
-            return $html;
-        } else
-            return false;
-    }
+	/**
+	 * Gets the post featured image.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @param int|string $post_id The post ID.
+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.
+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
+	 * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.
+	 * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false.
+	 * @return bool|string Returns image html.
+	 */
+	function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false)
+	{
+		$image = geodir_get_featured_image($post_id, $size, $no_image, $fimage);
+
+		$html = geodir_show_image($image, $size, $no_image, false);
+
+		if (!empty($html) && $echo) {
+			echo $html;
+		} elseif (!empty($html)) {
+			return $html;
+		} else
+			return false;
+	}
 }
 
 if (!function_exists('geodir_get_images')) {
-    /**
-     * Gets the post images.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @param int $post_id The post ID.
-     * @param string $img_size Optional. Thumbnail size.
-     * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false.
-     * @param bool $add_featured Optional. Do you want to include featured images too? Default: true.
-     * @param int|string $limit Optional. Number of images.
-     * @return array|bool Returns images as an array. Each item is an object.
-     */
-    function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '')
-    {
-        global $wpdb;
-        if ($limit) {
-            $limit_q = " LIMIT $limit ";
-        } else {
-            $limit_q = '';
-        }
-        $not_featured = '';
-        $sub_dir = '';
-        if (!$add_featured)
-            $not_featured = " AND is_featured = 0 ";
-
-        $arrImages = $wpdb->get_results(
-            $wpdb->prepare(
-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",
-                array('%image%', $post_id)
-            )
-        );
-
-        $counter = 0;
-        $return_arr = array();
-
-        if (!empty($arrImages)) {
-            foreach ($arrImages as $attechment) {
-
-                $img_arr = array();
-                $img_arr['id'] = $attechment->ID;
-                $img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0;
-
-                $file_info = pathinfo($attechment->file);
-
-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
-                    $sub_dir = stripslashes_deep($file_info['dirname']);
-
-                $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
-                $uploads_baseurl = $uploads['baseurl'];
-                $uploads_path = $uploads['path'];
-
-                $file_name = $file_info['basename'];
-
-                $uploads_url = $uploads_baseurl . $sub_dir;
-                /*
+	/**
+	 * Gets the post images.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @param int $post_id The post ID.
+	 * @param string $img_size Optional. Thumbnail size.
+	 * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false.
+	 * @param bool $add_featured Optional. Do you want to include featured images too? Default: true.
+	 * @param int|string $limit Optional. Number of images.
+	 * @return array|bool Returns images as an array. Each item is an object.
+	 */
+	function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '')
+	{
+		global $wpdb;
+		if ($limit) {
+			$limit_q = " LIMIT $limit ";
+		} else {
+			$limit_q = '';
+		}
+		$not_featured = '';
+		$sub_dir = '';
+		if (!$add_featured)
+			$not_featured = " AND is_featured = 0 ";
+
+		$arrImages = $wpdb->get_results(
+			$wpdb->prepare(
+				"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",
+				array('%image%', $post_id)
+			)
+		);
+
+		$counter = 0;
+		$return_arr = array();
+
+		if (!empty($arrImages)) {
+			foreach ($arrImages as $attechment) {
+
+				$img_arr = array();
+				$img_arr['id'] = $attechment->ID;
+				$img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0;
+
+				$file_info = pathinfo($attechment->file);
+
+				if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
+					$sub_dir = stripslashes_deep($file_info['dirname']);
+
+				$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
+				$uploads_baseurl = $uploads['baseurl'];
+				$uploads_path = $uploads['path'];
+
+				$file_name = $file_info['basename'];
+
+				$uploads_url = $uploads_baseurl . $sub_dir;
+				/*
                 * Allows the filter of image src for such things as CDN change.
                 *
                 * @since 1.5.7
@@ -1521,532 +1521,532 @@  discard block
 block discarded – undo
                 * @param string $uploads_url The server upload directory url.
                 * @param string $uploads_baseurl The uploads dir base url.
                 */
-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
-                $img_arr['path'] = $uploads_path . '/' . $file_name;
-                $width = 0;
-                $height = 0;
-                if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
-                    $imagesize = getimagesize($img_arr['path']);
-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
-                }
-                $img_arr['width'] = $width;
-                $img_arr['height'] = $height;
-
-                $img_arr['file'] = $file_name; // add the title to the array
-                $img_arr['title'] = $attechment->title; // add the title to the array
-                $img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array
-                $img_arr['content'] = $attechment->content; // add the description to the array
-                $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.
-
-                $return_arr[] = (object)$img_arr;
-
-                $counter++;
-            }
-            //return (object)$return_arr;
-            /**
-             * Filter the images array so things can be changed.
-             *
-             * @since 1.6.20
-             * @param array $return_arr The array of image objects.
-             */
-            return apply_filters('geodir_get_images_arr',$return_arr);
-        } else if ($no_images) {
-            $default_img = '';
-            $default_cat = geodir_get_post_meta($post_id, 'default_category', true);
-            $post_type = get_post_type($post_id);
-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
-                $default_img = $default_catimg['src'];
-            elseif ($no_images) {
-                $default_img = get_option('geodir_listing_no_img');
-            }
-
-            if (!empty($default_img)) {
-                $uploads = wp_upload_dir(); // Array of key => value pairs
+				$img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
+				$img_arr['path'] = $uploads_path . '/' . $file_name;
+				$width = 0;
+				$height = 0;
+				if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
+					$imagesize = getimagesize($img_arr['path']);
+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
+				}
+				$img_arr['width'] = $width;
+				$img_arr['height'] = $height;
+
+				$img_arr['file'] = $file_name; // add the title to the array
+				$img_arr['title'] = $attechment->title; // add the title to the array
+				$img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array
+				$img_arr['content'] = $attechment->content; // add the description to the array
+				$img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.
+
+				$return_arr[] = (object)$img_arr;
+
+				$counter++;
+			}
+			//return (object)$return_arr;
+			/**
+			 * Filter the images array so things can be changed.
+			 *
+			 * @since 1.6.20
+			 * @param array $return_arr The array of image objects.
+			 */
+			return apply_filters('geodir_get_images_arr',$return_arr);
+		} else if ($no_images) {
+			$default_img = '';
+			$default_cat = geodir_get_post_meta($post_id, 'default_category', true);
+			$post_type = get_post_type($post_id);
+			if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))
+				$default_img = $default_catimg['src'];
+			elseif ($no_images) {
+				$default_img = get_option('geodir_listing_no_img');
+			}
+
+			if (!empty($default_img)) {
+				$uploads = wp_upload_dir(); // Array of key => value pairs
                 
-                $image_path = $default_img;
-                if (!path_is_absolute($image_path)) {
-                    $image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path);
-                }
-
-                $file_info = pathinfo($default_img);
-                $file_name = $file_info['basename'];
-
-                $width = '';
-                $height = '';
-                if (is_file($image_path) && file_exists($image_path)) {
-                    $imagesize = getimagesize($image_path);
-                    $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
-                }
+				$image_path = $default_img;
+				if (!path_is_absolute($image_path)) {
+					$image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path);
+				}
+
+				$file_info = pathinfo($default_img);
+				$file_name = $file_info['basename'];
+
+				$width = '';
+				$height = '';
+				if (is_file($image_path) && file_exists($image_path)) {
+					$imagesize = getimagesize($image_path);
+					$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
+				}
                 
-                $img_arr = array();
-                $img_arr['src'] = $default_img;
-                $img_arr['path'] = $image_path;
-                $img_arr['width'] = $width;
-                $img_arr['height'] = $height;
-                $img_arr['file'] = $file_name; // add the title to the array
-                $img_arr['title'] = $file_info['filename']; // add the title to the array
-                $img_arr['content'] = $file_info['filename']; // add the description to the array
-
-                $return_arr[] = (object)$img_arr;
-
-                /**
-                 * Filter the images array so things can be changed.
-                 * 
-                 * @since 1.6.20
-                 * @param array $return_arr The array of image objects.
-                 */
-                return apply_filters('geodir_get_images_arr',$return_arr);
-            } else
-                return false;
-        }
-    }
+				$img_arr = array();
+				$img_arr['src'] = $default_img;
+				$img_arr['path'] = $image_path;
+				$img_arr['width'] = $width;
+				$img_arr['height'] = $height;
+				$img_arr['file'] = $file_name; // add the title to the array
+				$img_arr['title'] = $file_info['filename']; // add the title to the array
+				$img_arr['content'] = $file_info['filename']; // add the description to the array
+
+				$return_arr[] = (object)$img_arr;
+
+				/**
+				 * Filter the images array so things can be changed.
+				 * 
+				 * @since 1.6.20
+				 * @param array $return_arr The array of image objects.
+				 */
+				return apply_filters('geodir_get_images_arr',$return_arr);
+			} else
+				return false;
+		}
+	}
 }
 
 if (!function_exists('geodir_show_image')) {
-    /**
-     * Show image using image details.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @param array|object $request Image info either as an array or object.
-     * @param string $size Optional. Thumbnail size. Default: thumbnail.
-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
-     * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.
-     * @return bool|string Returns image html.
-     */
-    function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true)
-    {
-        $image = new stdClass();
-
-        $html = '';
-        if (!empty($request)) {
-            if (!is_object($request)){
-                $request = (object)$request;
-            }
-
-            if (isset($request->src) && !isset($request->path)) {
-                $request->path = $request->src;
-            }
-
-            /*
+	/**
+	 * Show image using image details.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @param array|object $request Image info either as an array or object.
+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.
+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.
+	 * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.
+	 * @return bool|string Returns image html.
+	 */
+	function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true)
+	{
+		$image = new stdClass();
+
+		$html = '';
+		if (!empty($request)) {
+			if (!is_object($request)){
+				$request = (object)$request;
+			}
+
+			if (isset($request->src) && !isset($request->path)) {
+				$request->path = $request->src;
+			}
+
+			/*
              * getimagesize() works faster from path than url so we try and get path if we can.
              */
-            $upload_dir = wp_upload_dir();
-            $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
-            $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
-            if (strpos($img_no_http, $upload_no_http) !== false) {
-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);
-            }
+			$upload_dir = wp_upload_dir();
+			$img_no_http = str_replace(array("http://", "https://"), "", $request->path);
+			$upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
+			if (strpos($img_no_http, $upload_no_http) !== false) {
+				$request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);
+			}
             
-            $width = 0;
-            $height = 0;
-            if (is_file($request->path) && file_exists($request->path)) {
-                $imagesize = getimagesize($request->path);
-                $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
-                $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
-            }
-
-
-            $image->src = $request->src;
-            $image->width = $width;
-            $image->height = $height;
-            $image->title = isset($request->title) ? $request->title : '';
-
-            $max_size = (object)geodir_get_imagesize($size);
-
-            if (!is_wp_error($max_size)) {
-                if ($image->width) {
-                    if ($image->height >= $image->width) {
-                        $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);
-                    } else if ($image->width < ($max_size->h)) {
-                        $width_per = round((($image->width / $max_size->w) * 100), 2);
-                    } else
-                        $width_per = 100;
-                }
-
-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
-                    $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';
-                } else {
-                    if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
-                        $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>';
-                    }else{
-                        $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
-                    }
-
-                }
-            }
-        }
-
-        if (!empty($html) && $echo) {
-            echo $html;
-        } elseif (!empty($html)) {
-            return $html;
-        } else
-            return false;
-    }
-}
+			$width = 0;
+			$height = 0;
+			if (is_file($request->path) && file_exists($request->path)) {
+				$imagesize = getimagesize($request->path);
+				$width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : '';
+				$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';
+			}
 
-if (!function_exists('geodir_set_post_terms')) {
-    /**
-     * Set post Categories.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param int $post_id The post ID.
-     * @param array $terms An array of term objects.
-     * @param array $tt_ids An array of term taxonomy IDs.
-     * @param string $taxonomy Taxonomy slug.
-     */
-    function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy)
-    {
-        global $wpdb, $plugin_prefix;
 
-        $post_type = get_post_type($post_id);
+			$image->src = $request->src;
+			$image->width = $width;
+			$image->height = $height;
+			$image->title = isset($request->title) ? $request->title : '';
 
-        $table = $plugin_prefix . $post_type . '_detail';
+			$max_size = (object)geodir_get_imagesize($size);
 
-        if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
+			if (!is_wp_error($max_size)) {
+				if ($image->width) {
+					if ($image->height >= $image->width) {
+						$width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);
+					} else if ($image->width < ($max_size->h)) {
+						$width_per = round((($image->width / $max_size->w) * 100), 2);
+					} else
+						$width_per = 100;
+				}
 
-            if ($taxonomy == $post_type . '_tags') {
-                if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
-                    geodir_save_post_meta($post_id, 'post_tags', $terms);
-                }
-            } elseif ($taxonomy == $post_type . 'category') {
-                $srcharr = array('"', '\\');
-                $replarr = array("&quot;", '');
+				if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
+					$html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';
+				} else {
+					if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
+						$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>';
+					}else{
+						$html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
+					}
 
-                $post_obj = get_post($post_id);
+				}
+			}
+		}
+
+		if (!empty($html) && $echo) {
+			echo $html;
+		} elseif (!empty($html)) {
+			return $html;
+		} else
+			return false;
+	}
+}
 
-                $cat_ids = array('0');
-                if (is_array($tt_ids))
-                    $cat_ids = $tt_ids;
+if (!function_exists('geodir_set_post_terms')) {
+	/**
+	 * Set post Categories.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param int $post_id The post ID.
+	 * @param array $terms An array of term objects.
+	 * @param array $tt_ids An array of term taxonomy IDs.
+	 * @param string $taxonomy Taxonomy slug.
+	 */
+	function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy)
+	{
+		global $wpdb, $plugin_prefix;
+
+		$post_type = get_post_type($post_id);
+
+		$table = $plugin_prefix . $post_type . '_detail';
+
+		if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
+
+			if ($taxonomy == $post_type . '_tags') {
+				if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
+					geodir_save_post_meta($post_id, 'post_tags', $terms);
+				}
+			} elseif ($taxonomy == $post_type . 'category') {
+				$srcharr = array('"', '\\');
+				$replarr = array("&quot;", '');
 
+				$post_obj = get_post($post_id);
 
-                if (!empty($cat_ids)) {
-                    $cat_ids_array = $cat_ids;
-                    $cat_ids_length = count($cat_ids_array);
-                    $cat_ids_format = array_fill(0, $cat_ids_length, '%d');
-                    $format = implode(',', $cat_ids_format);
+				$cat_ids = array('0');
+				if (is_array($tt_ids))
+					$cat_ids = $tt_ids;
 
-                    $cat_ids_array_del = $cat_ids_array;
-                    $cat_ids_array_del[] = $post_id;
 
-                    $wpdb->get_var(
-                        $wpdb->prepare(
-                            "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",
-                            $cat_ids_array_del
-                        )
-                    );
+				if (!empty($cat_ids)) {
+					$cat_ids_array = $cat_ids;
+					$cat_ids_length = count($cat_ids_array);
+					$cat_ids_format = array_fill(0, $cat_ids_length, '%d');
+					$format = implode(',', $cat_ids_format);
 
+					$cat_ids_array_del = $cat_ids_array;
+					$cat_ids_array_del[] = $post_id;
 
-                    $post_term = $wpdb->get_col(
-                        $wpdb->prepare(
-                            "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",
-                            $cat_ids_array
-                        )
-                    );
+					$wpdb->get_var(
+						$wpdb->prepare(
+							"DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",
+							$cat_ids_array_del
+						)
+					);
 
-                }
 
-                $post_marker_json = '';
+					$post_term = $wpdb->get_col(
+						$wpdb->prepare(
+							"SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",
+							$cat_ids_array
+						)
+					);
 
-                if (!empty($post_term)):
+				}
 
-                    foreach ($post_term as $cat_id):
+				$post_marker_json = '';
 
-                        $term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type);
-                        $term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : '';
+				if (!empty($post_term)):
 
-                        $post_title = $post_obj->title;
-                        $title = str_replace($srcharr, $replarr, $post_title);
+					foreach ($post_term as $cat_id):
 
-                        $lat = geodir_get_post_meta($post_id, 'post_latitude', true);
-                        $lng = geodir_get_post_meta($post_id, 'post_longitude', true);
+						$term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type);
+						$term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : '';
 
-                        $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
-                        $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);
+						$post_title = $post_obj->title;
+						$title = str_replace($srcharr, $replarr, $post_title);
 
-                        $json = '{';
-                        $json .= '"id":"' . $post_id . '",';
-                        $json .= '"lat_pos": "' . $lat . '",';
-                        $json .= '"long_pos": "' . $lng . '",';
-                        $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';
-                        $json .= '"icon":"' . $term_icon . '",';
-                        $json .= '"group":"catgroup' . $cat_id . '"';
-                        $json .= '}';
+						$lat = geodir_get_post_meta($post_id, 'post_latitude', true);
+						$lng = geodir_get_post_meta($post_id, 'post_longitude', true);
 
+						$timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
+						$timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);
 
-                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))
-                            $post_marker_json = $json;
+						$json = '{';
+						$json .= '"id":"' . $post_id . '",';
+						$json .= '"lat_pos": "' . $lat . '",';
+						$json .= '"long_pos": "' . $lng . '",';
+						$json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';
+						$json .= '"icon":"' . $term_icon . '",';
+						$json .= '"group":"catgroup' . $cat_id . '"';
+						$json .= '}';
 
 
-                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
+						if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))
+							$post_marker_json = $json;
 
-                            $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
+
+						if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
+
+							$json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
 										post_title = %s,
 										json = %s
 										WHERE post_id = %d AND cat_id = %d ",
-                                array($post_title, $json, $post_id, $cat_id));
+								array($post_title, $json, $post_id, $cat_id));
 
-                        } else {
+						} else {
 
-                            $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
+							$json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
 										post_id = %d,
 										post_title = %s,
 										cat_id = %d,
 										json = %s",
-                                array($post_id, $post_title, $cat_id, $json));
+								array($post_id, $post_title, $cat_id, $json));
 
-                        }
+						}
 
-                        $wpdb->query($json_query);
+						$wpdb->query($json_query);
 
-                    endforeach;
+					endforeach;
 
-                endif;
+				endif;
 
-                if (!empty($post_term) && is_array($post_term)) {
-                    $categories = implode(',', $post_term);
+				if (!empty($post_term) && is_array($post_term)) {
+					$categories = implode(',', $post_term);
 
-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';
+					if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';
 
-                    if (empty($post_marker_json))
-                        $post_marker_json = isset($json) ? $json : '';
+					if (empty($post_marker_json))
+						$post_marker_json = isset($json) ? $json : '';
 
-                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
+					if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
 
-                        $wpdb->query(
-                            $wpdb->prepare(
-                                "UPDATE " . $table . " SET
+						$wpdb->query(
+							$wpdb->prepare(
+								"UPDATE " . $table . " SET
 								" . $taxonomy . " = %s,
 								marker_json = %s
 								where post_id = %d",
-                                array($categories, $post_marker_json, $post_id)
-                            )
-                        );
+								array($categories, $post_marker_json, $post_id)
+							)
+						);
 
-                        if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {
+						if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {
 
-                            $categories = trim($categories, ',');
+							$categories = trim($categories, ',');
 
-                            if ($categories) {
+							if ($categories) {
 
-                                $categories = explode(',', $categories);
+								$categories = explode(',', $categories);
 
-                                $default_category = geodir_get_post_meta($post_id, 'default_category', true);
+								$default_category = geodir_get_post_meta($post_id, 'default_category', true);
 
-                                if (!in_array($default_category, $categories)) {
+								if (!in_array($default_category, $categories)) {
 
-                                    $wpdb->query(
-                                        $wpdb->prepare(
-                                            "UPDATE " . $table . " SET
+									$wpdb->query(
+										$wpdb->prepare(
+											"UPDATE " . $table . " SET
 											default_category = %s
 											where post_id = %d",
-                                            array($categories[0], $post_id)
-                                        )
-                                    );
+											array($categories[0], $post_id)
+										)
+									);
 
-                                    $default_category = $categories[0];
+									$default_category = $categories[0];
 
-                                }
+								}
 
-                                if ($default_category == '')
-                                    $default_category = $categories[0];
+								if ($default_category == '')
+									$default_category = $categories[0];
 
-                                geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');
+								geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');
 
-                            }
+							}
 
-                        }
+						}
 
 
-                    } else {
+					} else {
 
-                        $wpdb->query(
-                            $wpdb->prepare(
-                                "INSERT INTO " . $table . " SET
+						$wpdb->query(
+							$wpdb->prepare(
+								"INSERT INTO " . $table . " SET
 								post_id = %d,
 								" . $taxonomy . " = %s,
 								marker_json = %s ",
 
-                                array($post_id, $categories, $post_marker_json)
-                            )
-                        );
-                    }
-                }
-            }
-        }
-    }
+								array($post_id, $categories, $post_marker_json)
+							)
+						);
+					}
+				}
+			}
+		}
+	}
 }
 
 if (!function_exists('geodir_get_infowindow_html')) {
-    /**
-     * Set post Map Marker info html.
-     *
-     * @since 1.0.0
-     * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before".
-     * @since 1.6.16 Changes for disable review stars for certain post type.
-     * @since 1.6.18 Fix: Map marker not showing custom fields in bubble info.
-     * @package GeoDirectory
-     * @global array $geodir_addon_list List of active GeoDirectory extensions.
-     * @global object $gd_session GeoDirectory Session object.
-     * @param object $postinfo_obj The post details object.
-     * @param string $post_preview Is this a post preview?.
-     * @global object $post WordPress Post object.
-     * @return mixed|string|void
-     */
-    function geodir_get_infowindow_html($postinfo_obj, $post_preview = '') {
-        global $preview, $post, $gd_session;
-        $srcharr = array("'", "/", "-", '"', '\\');
-        $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');
-
-        if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
-            $ID = '';
-            $plink = '';
-
-            if (isset($postinfo_obj->pid)) {
-                $ID = $postinfo_obj->pid;
-                $plink = get_permalink($ID);
-            }
-
-            $title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title));
-            $lat = $postinfo_obj->post_latitude;
-            $lng = $postinfo_obj->post_longitude;
-        } else {
-            $ID = $postinfo_obj->post_id;
-            $title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan
-            $title = wp_specialchars_decode($title); // Fixed #post-320722 on 2016-12-08
-            $plink = get_permalink($ID);
-            $lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true));
-            $lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true));
-        }
+	/**
+	 * Set post Map Marker info html.
+	 *
+	 * @since 1.0.0
+	 * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before".
+	 * @since 1.6.16 Changes for disable review stars for certain post type.
+	 * @since 1.6.18 Fix: Map marker not showing custom fields in bubble info.
+	 * @package GeoDirectory
+	 * @global array $geodir_addon_list List of active GeoDirectory extensions.
+	 * @global object $gd_session GeoDirectory Session object.
+	 * @param object $postinfo_obj The post details object.
+	 * @param string $post_preview Is this a post preview?.
+	 * @global object $post WordPress Post object.
+	 * @return mixed|string|void
+	 */
+	function geodir_get_infowindow_html($postinfo_obj, $post_preview = '') {
+		global $preview, $post, $gd_session;
+		$srcharr = array("'", "/", "-", '"', '\\');
+		$replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');
+
+		if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
+			$ID = '';
+			$plink = '';
+
+			if (isset($postinfo_obj->pid)) {
+				$ID = $postinfo_obj->pid;
+				$plink = get_permalink($ID);
+			}
+
+			$title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title));
+			$lat = $postinfo_obj->post_latitude;
+			$lng = $postinfo_obj->post_longitude;
+		} else {
+			$ID = $postinfo_obj->post_id;
+			$title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan
+			$title = wp_specialchars_decode($title); // Fixed #post-320722 on 2016-12-08
+			$plink = get_permalink($ID);
+			$lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true));
+			$lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true));
+		}
         
-        // Some theme overwrites global gd listing $post
-        if (!empty($ID) && (!empty($post->ID) && $post->ID != $ID) || empty($post)) {
-            $post = geodir_get_post_info($ID);
-        }
+		// Some theme overwrites global gd listing $post
+		if (!empty($ID) && (!empty($post->ID) && $post->ID != $ID) || empty($post)) {
+			$post = geodir_get_post_info($ID);
+		}
         
-        $post_type = $ID ? get_post_type($ID) : '';
-
-        // filter field as per price package
-        global $geodir_addon_list;
-        if ($post_type && defined('GEODIRPAYMENT_VERSION')) {
-            $package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL;
-            $field_name = 'geodir_contact';
-            if (!check_field_visibility($package_id, $field_name, $post_type)) {
-                $contact = '';
-            }
-
-            $field_name = 'geodir_timing';
-            if (!check_field_visibility($package_id, $field_name, $post_type)) {
-                $timing = '';
-            }
-        }
-
-        if ($lat && $lng) {
-            ob_start(); ?>
+		$post_type = $ID ? get_post_type($ID) : '';
+
+		// filter field as per price package
+		global $geodir_addon_list;
+		if ($post_type && defined('GEODIRPAYMENT_VERSION')) {
+			$package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL;
+			$field_name = 'geodir_contact';
+			if (!check_field_visibility($package_id, $field_name, $post_type)) {
+				$contact = '';
+			}
+
+			$field_name = 'geodir_timing';
+			if (!check_field_visibility($package_id, $field_name, $post_type)) {
+				$timing = '';
+			}
+		}
+
+		if ($lat && $lng) {
+			ob_start(); ?>
             <div class="gd-bubble" style="">
                 <div class="gd-bubble-inside">
                     <?php
-                    $comment_count = '';
-                    $rating_star = '';
-                    if ($ID != '' && $post_type != '' && !geodir_cpt_has_rating_disabled($post_type)) {
-                        $rating_star = '';
-                        $comment_count = geodir_get_review_count_total($ID);
-
-                        if (!$preview) {
-                            $post_avgratings = geodir_get_post_rating($ID);
-
-                            $rating_star = geodir_get_rating_stars($post_avgratings, $ID, false);
-
-                            /**
-                             * Filter to change rating stars
-                             *
-                             * You can use this filter to change Rating stars.
-                             *
-                             * @since 1.0.0
-                             * @package GeoDirectory
-                             * @param string $rating_star Rating stars.
-                             * @param float $post_avgratings Average ratings of the post.
-                             * @param int $ID The post ID.
-                             */
-                            $rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);
-                        }
-                    }
-                    ?>
+					$comment_count = '';
+					$rating_star = '';
+					if ($ID != '' && $post_type != '' && !geodir_cpt_has_rating_disabled($post_type)) {
+						$rating_star = '';
+						$comment_count = geodir_get_review_count_total($ID);
+
+						if (!$preview) {
+							$post_avgratings = geodir_get_post_rating($ID);
+
+							$rating_star = geodir_get_rating_stars($post_avgratings, $ID, false);
+
+							/**
+							 * Filter to change rating stars
+							 *
+							 * You can use this filter to change Rating stars.
+							 *
+							 * @since 1.0.0
+							 * @package GeoDirectory
+							 * @param string $rating_star Rating stars.
+							 * @param float $post_avgratings Average ratings of the post.
+							 * @param int $ID The post ID.
+							 */
+							$rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);
+						}
+					}
+					?>
                     <div class="geodir-bubble_desc">
                         <h4>
                             <a href="<?php if ($plink != '') {
-                                echo $plink;
-                            } else {
-                                echo 'javascript:void(0);';
-                            } ?>"><?php echo $title; ?></a>
+								echo $plink;
+							} else {
+								echo 'javascript:void(0);';
+							} ?>"><?php echo $title; ?></a>
                         </h4>
                         <?php
-                        if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
-                            $post_images = array();
-                            if (!empty($postinfo_obj->post_images)) {
-                                $post_images = explode(",", $postinfo_obj->post_images);
-                            }
-
-                            if (!empty($post_images)) {
-                                ?>
+						if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
+							$post_images = array();
+							if (!empty($postinfo_obj->post_images)) {
+								$post_images = explode(",", $postinfo_obj->post_images);
+							}
+
+							if (!empty($post_images)) {
+								?>
                                 <div class="geodir-bubble_image"><a href="<?php if ($plink != '') {
-                                        echo $plink;
-                                    } else {
-                                        echo 'javascript:void(0);';
-                                    } ?>"><img alt="bubble image" style="max-height:50px;"
+										echo $plink;
+									} else {
+										echo 'javascript:void(0);';
+									} ?>"><img alt="bubble image" style="max-height:50px;"
                                                src="<?php echo $post_images[0]; ?>"/></a></div>
                             <?php
-                            }else{
-                                echo '<div class="geodir-bubble_image"></div>';
-                            }
-                        } else {
-                            if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {
-                                ?>
+							}else{
+								echo '<div class="geodir-bubble_image"></div>';
+							}
+						} else {
+							if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {
+								?>
                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>
                             <?php
-                            }else{
-                                echo '<div class="geodir-bubble_image"></div>';
-                            }
-                        }
-                        ?>
+							}else{
+								echo '<div class="geodir-bubble_image"></div>';
+							}
+						}
+						?>
                         <div class="geodir-bubble-meta-side">
                             <?php
-                            /**
-                             * Fires before the meta info in the map info window.
-                             *
-                             * This can be used to add more info to the map info window before the normal meta info.
-                             *
-                             * @since 1.5.4
-                             * @param int $ID The post id.
-                             * @param object $postinfo_obj The posts info as an object.
-                             * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *
-                             */
-                            do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);
-
-                            echo geodir_show_listing_info('mapbubble');
-
-                            /**
-                             * Fires after the meta info in the map info window.
-                             *
-                             * This can be used to add more info to the map info window after the normal meta info.
-                             *
-                             * @since 1.4.2
-                             * @param object $postinfo_obj The posts info as an object.
-                             * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *
-                             */
-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
-                            ?>
+							/**
+							 * Fires before the meta info in the map info window.
+							 *
+							 * This can be used to add more info to the map info window before the normal meta info.
+							 *
+							 * @since 1.5.4
+							 * @param int $ID The post id.
+							 * @param object $postinfo_obj The posts info as an object.
+							 * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *
+							 */
+							do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);
+
+							echo geodir_show_listing_info('mapbubble');
+
+							/**
+							 * Fires after the meta info in the map info window.
+							 *
+							 * This can be used to add more info to the map info window after the normal meta info.
+							 *
+							 * @since 1.4.2
+							 * @param object $postinfo_obj The posts info as an object.
+							 * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *
+							 */
+							do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
+							?>
                         </div>
                         <?php
-                        if ($ID) {
-                            $post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);
-                            ?>
+						if ($ID) {
+							$post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);
+							?>
                             <div class="geodir-bubble-meta-fade"></div>
                             <div class="geodir-bubble-meta-bottom">
                                 <?php if ($rating_star != '') { ?>
@@ -2062,22 +2062,22 @@  discard block
 block discarded – undo
                 </div>
             </div>
             <?php
-            $html = ob_get_clean();
-            /**
-             * Filter to change infowindow html
-             *
-             * You can use this filter to change infowindow html.
-             *
-             * @since 1.0.0
-             * @package GeoDirectory
-             * @param string $html Infowindow html.
-             * @param object $postinfo_obj The Post object.
-             * @param bool|string $post_preview Is this a post preview?
-             */
-            $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
-            return $html;
-        }
-    }
+			$html = ob_get_clean();
+			/**
+			 * Filter to change infowindow html
+			 *
+			 * You can use this filter to change infowindow html.
+			 *
+			 * @since 1.0.0
+			 * @package GeoDirectory
+			 * @param string $html Infowindow html.
+			 * @param object $postinfo_obj The Post object.
+			 * @param bool|string $post_preview Is this a post preview?
+			 */
+			$html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
+			return $html;
+		}
+	}
 }
 
 
@@ -2091,47 +2091,47 @@  discard block
 block discarded – undo
 function geodir_new_post_default_status()
 {
 
-    $status = get_option( 'geodir_new_post_default_status' );
+	$status = get_option( 'geodir_new_post_default_status' );
 
-    if ( empty( $status ) ) {
-        $status = 'publish';
-    }
+	if ( empty( $status ) ) {
+		$status = 'publish';
+	}
 
-    /**
-     * Filter the new post status.
-     *
-     * @since 1.6.23
-     */
-    return apply_filters( 'geodir_new_post_default_status', $status );
+	/**
+	 * Filter the new post status.
+	 *
+	 * @since 1.6.23
+	 */
+	return apply_filters( 'geodir_new_post_default_status', $status );
 
 }
 
 if (!function_exists('geodir_change_post_status')) {
-    /**
-     * Change post status of a post.
-     *
-     * @global object $wpdb WordPress Database object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param int|string $post_id The post ID.
-     * @param string $status New post status. Ex: draft, publish etc.
-     */
-    function geodir_change_post_status($post_id = '', $status = '')
-    {
-        global $wpdb, $plugin_prefix;
-
-        $post_type = get_post_type($post_id);
-
-        $table = $plugin_prefix . $post_type . '_detail';
-
-        $wpdb->query(
-            $wpdb->prepare(
-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",
-                array($status, $post_id)
-            )
-        );
-
-
-    }
+	/**
+	 * Change post status of a post.
+	 *
+	 * @global object $wpdb WordPress Database object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param int|string $post_id The post ID.
+	 * @param string $status New post status. Ex: draft, publish etc.
+	 */
+	function geodir_change_post_status($post_id = '', $status = '')
+	{
+		global $wpdb, $plugin_prefix;
+
+		$post_type = get_post_type($post_id);
+
+		$table = $plugin_prefix . $post_type . '_detail';
+
+		$wpdb->query(
+			$wpdb->prepare(
+				"UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",
+				array($status, $post_id)
+			)
+		);
+
+
+	}
 }
 
 /**
@@ -2145,13 +2145,13 @@  discard block
 block discarded – undo
  */
 function geodir_set_post_status($pid, $status)
 {
-    if ($pid) {
-        global $wpdb;
-        $my_post = array();
-        $my_post['post_status'] = $status;
-        $my_post['ID'] = $pid;
-        $last_postid = wp_update_post($my_post);
-    }
+	if ($pid) {
+		global $wpdb;
+		$my_post = array();
+		$my_post['post_status'] = $status;
+		$my_post['ID'] = $pid;
+		$last_postid = wp_update_post($my_post);
+	}
 }
 
 
@@ -2167,407 +2167,407 @@  discard block
 block discarded – undo
  */
 function geodir_update_poststatus($new_status, $old_status, $post)
 {
-    global $wpdb;
+	global $wpdb;
 
-    $geodir_posttypes = geodir_get_posttypes();
+	$geodir_posttypes = geodir_get_posttypes();
 
-    if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {
+	if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {
 
-        geodir_change_post_status($post->ID, $new_status);
-    }
+		geodir_change_post_status($post->ID, $new_status);
+	}
 }
 
 
 if (!function_exists('geodir_update_listing_info')) {
-    /**
-     * Update post info.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param int $updatingpost The updating post ID.
-     * @param int $temppost The temporary post ID.
-     * @todo fix post_id variable
-     */
-    function geodir_update_listing_info($updatingpost, $temppost)
-    {
-
-        global $wpdb, $plugin_prefix;
-
-        $post_type = get_post_type($post_id);
-
-        $table = $plugin_prefix . $post_type . '_detail';
-
-        $wpdb->query(
-            $wpdb->prepare(
-                "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",
-                array($updatingpost, $temppost)
-            )
-        );
-
-        $wpdb->query(
-            $wpdb->prepare(
-                "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
-                array($updatingpost, $temppost)
-            )
-        );
-
-        /* Update Attachments*/
-
-        $wpdb->query(
-            $wpdb->prepare(
-                "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
-                array($updatingpost, $temppost)
-            )
-        );
-
-    }
+	/**
+	 * Update post info.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param int $updatingpost The updating post ID.
+	 * @param int $temppost The temporary post ID.
+	 * @todo fix post_id variable
+	 */
+	function geodir_update_listing_info($updatingpost, $temppost)
+	{
+
+		global $wpdb, $plugin_prefix;
+
+		$post_type = get_post_type($post_id);
+
+		$table = $plugin_prefix . $post_type . '_detail';
+
+		$wpdb->query(
+			$wpdb->prepare(
+				"UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",
+				array($updatingpost, $temppost)
+			)
+		);
+
+		$wpdb->query(
+			$wpdb->prepare(
+				"UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
+				array($updatingpost, $temppost)
+			)
+		);
+
+		/* Update Attachments*/
+
+		$wpdb->query(
+			$wpdb->prepare(
+				"UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
+				array($updatingpost, $temppost)
+			)
+		);
+
+	}
 }
 
 
 if (!function_exists('geodir_delete_listing_info')) {
-    /**
-     * Delete Listing info from details table for the given post id.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param int $deleted_postid The post ID.
-     * @param bool $force Optional. Do you want to force delete it? Default: false.
-     * @return bool|void
-     */
-    function geodir_delete_listing_info($deleted_postid, $force = false)
-    {
-        global $wpdb, $plugin_prefix;
-
-        // check for multisite deletions
-        if (strpos($plugin_prefix, $wpdb->prefix) !== false) {
-        } else {
-            return;
-        }
-
-        $post_type = get_post_type($deleted_postid);
-
-        $all_postypes = geodir_get_posttypes();
-
-        if (!in_array($post_type, $all_postypes))
-            return false;
-
-        $table = $plugin_prefix . $post_type . '_detail';
-
-        /* Delete custom post meta*/
-        $wpdb->query(
-            $wpdb->prepare(
-                "DELETE FROM " . $table . " WHERE `post_id` = %d",
-                array($deleted_postid)
-            )
-        );
-
-        /* Delete post map icons*/
-        $wpdb->query(
-            $wpdb->prepare(
-                "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",
-                array($deleted_postid)
-            )
-        );
-
-        /* Delete Attachments*/
-        $feat_id = get_post_thumbnail_id( $deleted_postid );// make sure to remove the smaller images
-        if($feat_id){
-            wp_delete_attachment( $feat_id, true);
-        }
-
-        $postcurr_images = geodir_get_images($deleted_postid);
-
-        $wpdb->query(
-            $wpdb->prepare(
-                "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",
-                array($deleted_postid)
-            )
-        );
-        geodir_remove_attachments($postcurr_images);
-
-    }
+	/**
+	 * Delete Listing info from details table for the given post id.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param int $deleted_postid The post ID.
+	 * @param bool $force Optional. Do you want to force delete it? Default: false.
+	 * @return bool|void
+	 */
+	function geodir_delete_listing_info($deleted_postid, $force = false)
+	{
+		global $wpdb, $plugin_prefix;
+
+		// check for multisite deletions
+		if (strpos($plugin_prefix, $wpdb->prefix) !== false) {
+		} else {
+			return;
+		}
+
+		$post_type = get_post_type($deleted_postid);
+
+		$all_postypes = geodir_get_posttypes();
+
+		if (!in_array($post_type, $all_postypes))
+			return false;
+
+		$table = $plugin_prefix . $post_type . '_detail';
+
+		/* Delete custom post meta*/
+		$wpdb->query(
+			$wpdb->prepare(
+				"DELETE FROM " . $table . " WHERE `post_id` = %d",
+				array($deleted_postid)
+			)
+		);
+
+		/* Delete post map icons*/
+		$wpdb->query(
+			$wpdb->prepare(
+				"DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",
+				array($deleted_postid)
+			)
+		);
+
+		/* Delete Attachments*/
+		$feat_id = get_post_thumbnail_id( $deleted_postid );// make sure to remove the smaller images
+		if($feat_id){
+			wp_delete_attachment( $feat_id, true);
+		}
+
+		$postcurr_images = geodir_get_images($deleted_postid);
+
+		$wpdb->query(
+			$wpdb->prepare(
+				"DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",
+				array($deleted_postid)
+			)
+		);
+		geodir_remove_attachments($postcurr_images);
+
+	}
 }
 
 
 if (!function_exists('geodir_add_to_favorite')) {
-    /**
-     * This function would add listing to favorite listing.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $current_user Current user object.
-     * @param int $post_id The post ID.
-     */
-    function geodir_add_to_favorite($post_id)
-    {
-
-        global $current_user;
-
-        /**
-         * Filter to modify "Unfavorite" text
-         *
-         * You can use this filter to rename "Unfavorite" text to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
-
-        /**
-         * Filter to modify "Remove from Favorites" text
-         *
-         * You can use this filter to rename "Remove from Favorites" text to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
-
-        /**
-         * Filter to modify "fas fa-heart" icon
-         *
-         * You can use this filter to change "fas fa-heart" icon to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fas fa-heart');
-
-        $site_id = '';
-        if ( is_multisite() ) {
-            $blog_id = get_current_blog_id();
-            if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
-        }
-
-        $user_meta_data = geodir_get_user_favourites($current_user->data->ID);
-        $user_meta_data = !empty($user_meta_data) && is_array($user_meta_data) ? $user_meta_data : array();
-
-        if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {
-            $user_meta_data[] = $post_id;
-        }
-
-        update_user_meta($current_user->data->ID, 'gd_user_favourite_post'.$site_id, $user_meta_data);
-
-        /**
-         * Called before adding the post from favourites.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         * @param int $post_id The post ID.
-         */
-        do_action('geodir_before_add_from_favorite', $post_id);
-
-        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';
-
-        /**
-         * Called after adding the post from favourites.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         * @param int $post_id The post ID.
-         */
-        do_action('geodir_after_add_from_favorite', $post_id);
+	/**
+	 * This function would add listing to favorite listing.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $current_user Current user object.
+	 * @param int $post_id The post ID.
+	 */
+	function geodir_add_to_favorite($post_id)
+	{
+
+		global $current_user;
+
+		/**
+		 * Filter to modify "Unfavorite" text
+		 *
+		 * You can use this filter to rename "Unfavorite" text to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
+
+		/**
+		 * Filter to modify "Remove from Favorites" text
+		 *
+		 * You can use this filter to rename "Remove from Favorites" text to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
+
+		/**
+		 * Filter to modify "fas fa-heart" icon
+		 *
+		 * You can use this filter to change "fas fa-heart" icon to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fas fa-heart');
+
+		$site_id = '';
+		if ( is_multisite() ) {
+			$blog_id = get_current_blog_id();
+			if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+		}
+
+		$user_meta_data = geodir_get_user_favourites($current_user->data->ID);
+		$user_meta_data = !empty($user_meta_data) && is_array($user_meta_data) ? $user_meta_data : array();
+
+		if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {
+			$user_meta_data[] = $post_id;
+		}
+
+		update_user_meta($current_user->data->ID, 'gd_user_favourite_post'.$site_id, $user_meta_data);
+
+		/**
+		 * Called before adding the post from favourites.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 * @param int $post_id The post ID.
+		 */
+		do_action('geodir_before_add_from_favorite', $post_id);
+
+		echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';
+
+		/**
+		 * Called after adding the post from favourites.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 * @param int $post_id The post ID.
+		 */
+		do_action('geodir_after_add_from_favorite', $post_id);
 
-    }
+	}
 }
 
 if (!function_exists('geodir_remove_from_favorite')) {
-    /**
-     * This function would remove the favourited property earlier.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $current_user Current user object.
-     * @param int $post_id The post ID.
-     */
-    function geodir_remove_from_favorite($post_id)
-    {
-        global $current_user;
-
-        /**
-         * Filter to modify "Add to Favorites" text
-         *
-         * You can use this filter to rename "Add to Favorites" text to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
-
-        /**
-         * Filter to modify "Favourite" text
-         *
-         * You can use this filter to rename "Favourite" text to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
-
-        /**
-         * Filter to modify "fas fa-heart" icon
-         *
-         * You can use this filter to change "fas fa-heart" icon to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fas fa-heart');
-
-        $site_id = '';
-        if ( is_multisite() ) {
-            $blog_id = get_current_blog_id();
-            if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
-        }
-
-        $user_meta_data = array();
-        $user_meta_data = geodir_get_user_favourites($current_user->data->ID);
-
-        if (!empty($user_meta_data)) {
-
-            if (($key = array_search($post_id, $user_meta_data)) !== false) {
-                unset($user_meta_data[$key]);
-            }
+	/**
+	 * This function would remove the favourited property earlier.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $current_user Current user object.
+	 * @param int $post_id The post ID.
+	 */
+	function geodir_remove_from_favorite($post_id)
+	{
+		global $current_user;
+
+		/**
+		 * Filter to modify "Add to Favorites" text
+		 *
+		 * You can use this filter to rename "Add to Favorites" text to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
+
+		/**
+		 * Filter to modify "Favourite" text
+		 *
+		 * You can use this filter to rename "Favourite" text to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
+
+		/**
+		 * Filter to modify "fas fa-heart" icon
+		 *
+		 * You can use this filter to change "fas fa-heart" icon to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fas fa-heart');
+
+		$site_id = '';
+		if ( is_multisite() ) {
+			$blog_id = get_current_blog_id();
+			if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+		}
+
+		$user_meta_data = array();
+		$user_meta_data = geodir_get_user_favourites($current_user->data->ID);
+
+		if (!empty($user_meta_data)) {
+
+			if (($key = array_search($post_id, $user_meta_data)) !== false) {
+				unset($user_meta_data[$key]);
+			}
 
-        }
+		}
 
-        update_user_meta($current_user->data->ID, 'gd_user_favourite_post'.$site_id, $user_meta_data);
+		update_user_meta($current_user->data->ID, 'gd_user_favourite_post'.$site_id, $user_meta_data);
 
-        /**
-         * Called before removing the post from favourites.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         * @param int $post_id The post ID.
-         */
-        do_action('geodir_before_remove_from_favorite', $post_id);
+		/**
+		 * Called before removing the post from favourites.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 * @param int $post_id The post ID.
+		 */
+		do_action('geodir_before_remove_from_favorite', $post_id);
 
-        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';
+		echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';
 
-        /**
-         * Called after removing the post from favourites.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         * @param int $post_id The post ID.
-         */
-        do_action('geodir_after_remove_from_favorite', $post_id);
+		/**
+		 * Called after removing the post from favourites.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 * @param int $post_id The post ID.
+		 */
+		do_action('geodir_after_remove_from_favorite', $post_id);
 
-    }
+	}
 }
 
 if (!function_exists('geodir_favourite_html')) {
-    /**
-     * This function would display the html content for add to favorite or remove from favorite.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $current_user Current user object.
-     * @global object $post The current post object.
-     * @param int $user_id The user ID.
-     * @param int $post_id The post ID.
-     */
-    function geodir_favourite_html($user_id, $post_id)
-    {
-
-        global $current_user, $post;
-
-        /**
-         * Filter to modify "Add to Favorites" text
-         *
-         * You can use this filter to rename "Add to Favorites" text to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
-
-        /**
-         * Filter to modify "Favourite" text
-         *
-         * You can use this filter to rename "Favourite" text to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
-
-        /**
-         * Filter to modify "Unfavorite" text
-         *
-         * You can use this filter to rename "Unfavorite" text to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
-
-        /**
-         * Filter to modify "Remove from Favorites" text
-         *
-         * You can use this filter to rename "Remove from Favorites" text to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
-
-        /**
-         * Filter to modify "fas fa-heart" icon
-         *
-         * You can use this filter to change "fas fa-heart" icon to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fas fa-heart');
-
-        /**
-         * Filter to modify "fas fa-heart" icon for "remove from favorites" link
-         *
-         * You can use this filter to change "fas fa-heart" icon to something else.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fas fa-heart');
-
-
-        $site_id = '';
-        if ( is_multisite() ) {
-            $blog_id = get_current_blog_id();
-            if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
-        }
-
-        $user_meta_data = '';
-        if (isset($current_user->data->ID))
-            $user_meta_data = geodir_get_user_favourites($current_user->data->ID);
-
-        if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a
+	/**
+	 * This function would display the html content for add to favorite or remove from favorite.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $current_user Current user object.
+	 * @global object $post The current post object.
+	 * @param int $user_id The user ID.
+	 * @param int $post_id The post ID.
+	 */
+	function geodir_favourite_html($user_id, $post_id)
+	{
+
+		global $current_user, $post;
+
+		/**
+		 * Filter to modify "Add to Favorites" text
+		 *
+		 * You can use this filter to rename "Add to Favorites" text to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
+
+		/**
+		 * Filter to modify "Favourite" text
+		 *
+		 * You can use this filter to rename "Favourite" text to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
+
+		/**
+		 * Filter to modify "Unfavorite" text
+		 *
+		 * You can use this filter to rename "Unfavorite" text to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
+
+		/**
+		 * Filter to modify "Remove from Favorites" text
+		 *
+		 * You can use this filter to rename "Remove from Favorites" text to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
+
+		/**
+		 * Filter to modify "fas fa-heart" icon
+		 *
+		 * You can use this filter to change "fas fa-heart" icon to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fas fa-heart');
+
+		/**
+		 * Filter to modify "fas fa-heart" icon for "remove from favorites" link
+		 *
+		 * You can use this filter to change "fas fa-heart" icon to something else.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		$unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fas fa-heart');
+
+
+		$site_id = '';
+		if ( is_multisite() ) {
+			$blog_id = get_current_blog_id();
+			if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+		}
+
+		$user_meta_data = '';
+		if (isset($current_user->data->ID))
+			$user_meta_data = geodir_get_user_favourites($current_user->data->ID);
+
+		if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
+			?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a
                 class="geodir-removetofav-icon" href="javascript:void(0);"
                 onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"
                 title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>
             </a>   </span><?php
 
-        } else {
+		} else {
 
-            if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
-                $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';
-            } else
-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
+			if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
+				$script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';
+			} else
+				$script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
 
-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"
+			?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"
                                                                                         href="javascript:void(0);"
                                                                                         onclick="<?php echo $script_text;?>"
                                                                                         title="<?php echo $add_favourite_text;?>"><i
                     class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>
         <?php }
-    }
+	}
 }
 
 
@@ -2584,54 +2584,54 @@  discard block
 block discarded – undo
 function geodir_get_cat_postcount($term = array())
 {
 
-    if (!empty($term)) {
+	if (!empty($term)) {
 
-        global $wpdb, $plugin_prefix;
+		global $wpdb, $plugin_prefix;
 
-        $where = '';
-        $join = '';
-        if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
-            $taxonomy_obj = get_taxonomy($term->taxonomy);
+		$where = '';
+		$join = '';
+		if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
+			$taxonomy_obj = get_taxonomy($term->taxonomy);
 
-            $post_type = $taxonomy_obj->object_type[0];
+			$post_type = $taxonomy_obj->object_type[0];
 
-            $table = $plugin_prefix . $post_type . '_detail';
+			$table = $plugin_prefix . $post_type . '_detail';
 
-            /**
-             * Filter to modify the 'join' query
-             *
-             * @since 1.0.0
-             * @package GeoDirectory
-             * @param object|array $term category / term object that need to be processed.
-             * @param string $join The join query.
-             */
-            $join = apply_filters('geodir_cat_post_count_join', $join, $term);
+			/**
+			 * Filter to modify the 'join' query
+			 *
+			 * @since 1.0.0
+			 * @package GeoDirectory
+			 * @param object|array $term category / term object that need to be processed.
+			 * @param string $join The join query.
+			 */
+			$join = apply_filters('geodir_cat_post_count_join', $join, $term);
 
-            /**
-             * Filter to modify the 'where' query
-             *
-             * @since 1.0.0
-             * @package GeoDirectory
-             * @param object|array $term category / term object that need to be processed.
-             * @param string $where The where query.
-             */
-            $where = apply_filters('geodir_cat_post_count_where', $where, $term);
+			/**
+			 * Filter to modify the 'where' query
+			 *
+			 * @since 1.0.0
+			 * @package GeoDirectory
+			 * @param object|array $term category / term object that need to be processed.
+			 * @param string $where The where query.
+			 */
+			$where = apply_filters('geodir_cat_post_count_where', $where, $term);
 
-            $count_query = "SELECT count(post_id) FROM
+			$count_query = "SELECT count(post_id) FROM
 							" . $table . " as pd " . $join . "
 							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
 
-            $cat_post_count = $wpdb->get_var($count_query);
-            if (empty($cat_post_count) || is_wp_error($cat_post_count))
-                $cat_post_count = 0;
+			$cat_post_count = $wpdb->get_var($count_query);
+			if (empty($cat_post_count) || is_wp_error($cat_post_count))
+				$cat_post_count = 0;
 
-            return $cat_post_count;
+			return $cat_post_count;
 
-        } else
+		} else
 
-            return $term->count;
-    }
-    return false;
+			return $term->count;
+	}
+	return false;
 
 }
 
@@ -2644,17 +2644,17 @@  discard block
 block discarded – undo
  */
 function geodir_allow_post_type_frontend()
 {
-    $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
+	$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
 
-    if (!is_admin() && isset($_REQUEST['listing_type'])
-        && !empty($geodir_allow_posttype_frontend)
-        && !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend)
-    ) {
+	if (!is_admin() && isset($_REQUEST['listing_type'])
+		&& !empty($geodir_allow_posttype_frontend)
+		&& !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend)
+	) {
 
-        wp_redirect(home_url());
-        exit;
+		wp_redirect(home_url());
+		exit;
 
-    }
+	}
 
 }
 
@@ -2671,20 +2671,20 @@  discard block
 block discarded – undo
  */
 function geodir_excerpt_length($length)
 {
-    global $wp_query, $geodir_is_widget_listing;
+	global $wp_query, $geodir_is_widget_listing;
 	if ($geodir_is_widget_listing) {
 		return $length;
 	}
 	
-    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
-        $length = get_option('geodir_desc_word_limit');
-    elseif (get_query_var('excerpt_length'))
-        $length = get_query_var('excerpt_length');
+	if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
+		$length = get_option('geodir_desc_word_limit');
+	elseif (get_query_var('excerpt_length'))
+		$length = get_query_var('excerpt_length');
 
-    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
-        $length = get_option('geodir_author_desc_word_limit');
+	if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
+		$length = get_option('geodir_author_desc_word_limit');
 
-    return $length;
+	return $length;
 }
 
 /**
@@ -2699,21 +2699,21 @@  discard block
 block discarded – undo
  */
 function geodir_excerpt_more($more)
 {
-    global $post;
-    $all_postypes = geodir_get_posttypes();
-    if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
-        $out = ' <a class="excerpt-read-more" href="' .  get_permalink($post->ID) . '" title="' . get_the_title($post->ID) . '">';
-        /**
-         * Filter excerpt read more text.
-         *
-         * @since 1.0.0
-         */
-        $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );
-        $out .= '</a>';
-        return $out;
-    }
+	global $post;
+	$all_postypes = geodir_get_posttypes();
+	if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
+		$out = ' <a class="excerpt-read-more" href="' .  get_permalink($post->ID) . '" title="' . get_the_title($post->ID) . '">';
+		/**
+		 * Filter excerpt read more text.
+		 *
+		 * @since 1.0.0
+		 */
+		$out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );
+		$out .= '</a>';
+		return $out;
+	}
 
-    return $more;
+	return $more;
 }
 
 
@@ -2730,63 +2730,63 @@  discard block
 block discarded – undo
  */
 function geodir_update_markers_oncatedit($term_id, $tt_id, $taxonomy)
 {
-    global $plugin_prefix, $wpdb;
+	global $plugin_prefix, $wpdb;
 
-    $gd_taxonomies = geodir_get_taxonomies();
+	$gd_taxonomies = geodir_get_taxonomies();
 
-    if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
+	if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
 
-        $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
+		$geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);
+		$table = $plugin_prefix . $geodir_post_type . '_detail';
 
-        $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);
-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';
+		$path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);
+		$term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';
 
-        $posts = $wpdb->get_results(
-            $wpdb->prepare(
-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",
-                array($term_id, $taxonomy)
-            )
-        );
+		$posts = $wpdb->get_results(
+			$wpdb->prepare(
+				"SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",
+				array($term_id, $taxonomy)
+			)
+		);
 
-        if (!empty($posts)):
-            foreach ($posts as $post_obj) {
+		if (!empty($posts)):
+			foreach ($posts as $post_obj) {
 
-                $lat = $post_obj->post_latitude;
-                $lng = $post_obj->post_longitude;
+				$lat = $post_obj->post_latitude;
+				$lng = $post_obj->post_longitude;
 
-                $json = '{';
-                $json .= '"id":"' . $post_obj->post_id . '",';
-                $json .= '"lat_pos": "' . $lat . '",';
-                $json .= '"long_pos": "' . $lng . '",';
-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';
-                $json .= '"icon":"' . $term_icon . '",';
-                $json .= '"group":"catgroup' . $term_id . '"';
-                $json .= '}';
+				$json = '{';
+				$json .= '"id":"' . $post_obj->post_id . '",';
+				$json .= '"lat_pos": "' . $lat . '",';
+				$json .= '"long_pos": "' . $lng . '",';
+				$json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';
+				$json .= '"icon":"' . $term_icon . '",';
+				$json .= '"group":"catgroup' . $term_id . '"';
+				$json .= '}';
 
-                if ($post_obj->default_category == $term_id) {
+				if ($post_obj->default_category == $term_id) {
 
-                    $wpdb->query(
-                        $wpdb->prepare(
-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",
-                            array($json, $post_obj->post_id)
-                        )
-                    );
-                }
+					$wpdb->query(
+						$wpdb->prepare(
+							"UPDATE " . $table . " SET marker_json = %s where post_id = %d",
+							array($json, $post_obj->post_id)
+						)
+					);
+				}
 
-                $wpdb->query(
-                    $wpdb->prepare(
-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",
-                        array($json, $post_obj->post_id, $term_id)
-                    )
-                );
+				$wpdb->query(
+					$wpdb->prepare(
+						"UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",
+						array($json, $post_obj->post_id, $term_id)
+					)
+				);
 
-            }
+			}
 
 
-        endif;
+		endif;
 
-    }
+	}
 
 }
 
@@ -2800,14 +2800,14 @@  discard block
 block discarded – undo
  */
 function geodir_get_listing_author($listing_id = '')
 {
-    if ($listing_id == '') {
-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
-            $listing_id = $_REQUEST['pid'];
-        }
-    }
-    $listing = get_post(strip_tags($listing_id));
-    $listing_author_id = $listing->post_author;
-    return $listing_author_id;
+	if ($listing_id == '') {
+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+			$listing_id = $_REQUEST['pid'];
+		}
+	}
+	$listing = get_post(strip_tags($listing_id));
+	$listing_author_id = $listing->post_author;
+	return $listing_author_id;
 }
 
 
@@ -2822,11 +2822,11 @@  discard block
 block discarded – undo
  */
 function geodir_lisiting_belong_to_user($listing_id, $user_id)
 {
-    $listing_author_id = geodir_get_listing_author($listing_id);
-    if ($listing_author_id == $user_id)
-        return true;
-    else
-        return false;
+	$listing_author_id = geodir_get_listing_author($listing_id);
+	if ($listing_author_id == $user_id)
+		return true;
+	else
+		return false;
 
 }
 
@@ -2842,29 +2842,29 @@  discard block
 block discarded – undo
  */
 function geodir_listing_belong_to_current_user($listing_id = '', $exclude_admin = true)
 {
-    global $current_user;
-    if ($exclude_admin) {
-        foreach ($current_user->caps as $key => $caps) {
-            if (geodir_strtolower($key) == 'administrator') {
-                return true;
-                break;
-            }
-        }
-    }
-
-    $result = geodir_lisiting_belong_to_user($listing_id, $current_user->ID);
-
-    /**
-     * Filter if the listing belongs to a user.
-     *
-     * @since 1.6.23
-     * @param bool $result The result, true:false
-     * @param int $listing_id The post ID.
-     * @param int $current_user->ID The current user ID.
-     * @param bool $exclude_admin Do you want to exclude admin from the check?. Default true.
-     * return bool
-     */
-    return apply_filters('geodir_listing_belong_to_current_user',$result,$listing_id,$current_user->ID,$exclude_admin);
+	global $current_user;
+	if ($exclude_admin) {
+		foreach ($current_user->caps as $key => $caps) {
+			if (geodir_strtolower($key) == 'administrator') {
+				return true;
+				break;
+			}
+		}
+	}
+
+	$result = geodir_lisiting_belong_to_user($listing_id, $current_user->ID);
+
+	/**
+	 * Filter if the listing belongs to a user.
+	 *
+	 * @since 1.6.23
+	 * @param bool $result The result, true:false
+	 * @param int $listing_id The post ID.
+	 * @param int $current_user->ID The current user ID.
+	 * @param bool $exclude_admin Do you want to exclude admin from the check?. Default true.
+	 * return bool
+	 */
+	return apply_filters('geodir_listing_belong_to_current_user',$result,$listing_id,$current_user->ID,$exclude_admin);
 }
 
 
@@ -2880,17 +2880,17 @@  discard block
 block discarded – undo
 function geodir_only_supportable_attachments_remove($file)
 {
 
-    global $wpdb;
+	global $wpdb;
 
-    $matches = array();
+	$matches = array();
 
-    $pattern = '/-\d+x\d+\./';
-    preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);
+	$pattern = '/-\d+x\d+\./';
+	preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);
 
-    if (empty($matches))
-        return '';
-    else
-        return $file;
+	if (empty($matches))
+		return '';
+	else
+		return $file;
 
 }
 
@@ -2907,78 +2907,78 @@  discard block
 block discarded – undo
 function geodir_set_wp_featured_image($post_id)
 {
 
-    global $wpdb, $plugin_prefix;
-    $uploads = wp_upload_dir();
+	global $wpdb, $plugin_prefix;
+	$uploads = wp_upload_dir();
 //	print_r($uploads ) ;
-    $post_first_image = $wpdb->get_results(
-        $wpdb->prepare(
-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)
-        )
-    );
+	$post_first_image = $wpdb->get_results(
+		$wpdb->prepare(
+			"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)
+		)
+	);
 
-    $old_attachment_name = '';
-    $post_thumbnail_id = '';
-    if (has_post_thumbnail($post_id)) {
+	$old_attachment_name = '';
+	$post_thumbnail_id = '';
+	if (has_post_thumbnail($post_id)) {
 
-        if (has_post_thumbnail($post_id)) {
+		if (has_post_thumbnail($post_id)) {
 
-            $post_thumbnail_id = get_post_thumbnail_id($post_id);
+			$post_thumbnail_id = get_post_thumbnail_id($post_id);
 
-            $old_attachment_name = basename(get_attached_file($post_thumbnail_id));
+			$old_attachment_name = basename(get_attached_file($post_thumbnail_id));
 
-        }
-    }
-
-    if (!empty($post_first_image)) {
+		}
+	}
 
-        $post_type = get_post_type($post_id);
+	if (!empty($post_first_image)) {
 
-        $table_name = $plugin_prefix . $post_type . '_detail';
+		$post_type = get_post_type($post_id);
 
-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
+		$table_name = $plugin_prefix . $post_type . '_detail';
 
-        $new_attachment_name = basename($post_first_image[0]->file);
+		$wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
 
-        if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
+		$new_attachment_name = basename($post_first_image[0]->file);
 
-            if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
+		if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
 
-                add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
+			if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
 
-                wp_delete_attachment($post_thumbnail_id);
+				add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
 
-            }
-            $filename = $uploads['basedir'] . $post_first_image[0]->file;
+				wp_delete_attachment($post_thumbnail_id);
 
-            $attachment = array(
-                'post_mime_type' => $post_first_image[0]->mime_type,
-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,
-                'post_parent' => $post_id,
-                'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
-                'post_content' => ''
-            );
+			}
+			$filename = $uploads['basedir'] . $post_first_image[0]->file;
+
+			$attachment = array(
+				'post_mime_type' => $post_first_image[0]->mime_type,
+				'guid' => $uploads['baseurl'] . $post_first_image[0]->file,
+				'post_parent' => $post_id,
+				'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
+				'post_content' => ''
+			);
 
 
-            $id = wp_insert_attachment($attachment, $filename, $post_id);
+			$id = wp_insert_attachment($attachment, $filename, $post_id);
 
-            if (!is_wp_error($id)) {
+			if (!is_wp_error($id)) {
 
-                set_post_thumbnail($post_id, $id);
+				set_post_thumbnail($post_id, $id);
 
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
-                wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
+				require_once(ABSPATH . 'wp-admin/includes/image.php');
+				wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
 
-            }
+			}
 
-        }
+		}
 
-    } else {
-        //set_post_thumbnail($post_id,-1);
+	} else {
+		//set_post_thumbnail($post_id,-1);
 
-        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))
-            wp_delete_attachment($post_thumbnail_id);
+		if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))
+			wp_delete_attachment($post_thumbnail_id);
 
-    }
+	}
 }
 
 
@@ -2993,53 +2993,53 @@  discard block
 block discarded – undo
  */
 function gd_copy_original_translation()
 {
-    if (geodir_is_wpml()) {
-        global $wpdb, $table_prefix, $plugin_prefix;
-        $post_id = absint($_POST['post_id']);
-        $upload_dir = wp_upload_dir();
-        $post_type = get_post_type($_POST['post_id']);
-        $table = $plugin_prefix . $post_type . '_detail';
-
-        $post_arr = $wpdb->get_results($wpdb->prepare(
-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
-            array($post_id)
-        )
-            , ARRAY_A);
-
-        $arrImages = $wpdb->get_results(
-            $wpdb->prepare(
-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
-                array('%image%', $post_id)
-            )
-        );
-        if ($arrImages) {
-            $image_arr = array();
-            foreach ($arrImages as $img) {
-                $image_arr[] = $upload_dir['baseurl'] . $img->file;
-            }
-            $comma_separated = implode(",", $image_arr);
-            $post_arr[0]['post_images'] = $comma_separated;
-        }
-
-
-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];
-        $cat_arr = array_filter(explode(",", $cats));
-        $trans_cat = array();
-        foreach ($cat_arr as $cat) {
-            $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false);
-        }
-
-
-        $post_arr[0]['categories'] = array_filter($trans_cat);
+	if (geodir_is_wpml()) {
+		global $wpdb, $table_prefix, $plugin_prefix;
+		$post_id = absint($_POST['post_id']);
+		$upload_dir = wp_upload_dir();
+		$post_type = get_post_type($_POST['post_id']);
+		$table = $plugin_prefix . $post_type . '_detail';
+
+		$post_arr = $wpdb->get_results($wpdb->prepare(
+			"SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
+			array($post_id)
+		)
+			, ARRAY_A);
+
+		$arrImages = $wpdb->get_results(
+			$wpdb->prepare(
+				"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
+				array('%image%', $post_id)
+			)
+		);
+		if ($arrImages) {
+			$image_arr = array();
+			foreach ($arrImages as $img) {
+				$image_arr[] = $upload_dir['baseurl'] . $img->file;
+			}
+			$comma_separated = implode(",", $image_arr);
+			$post_arr[0]['post_images'] = $comma_separated;
+		}
+
+
+		$cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];
+		$cat_arr = array_filter(explode(",", $cats));
+		$trans_cat = array();
+		foreach ($cat_arr as $cat) {
+			$trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false);
+		}
+
+
+		$post_arr[0]['categories'] = array_filter($trans_cat);
 //print_r($image_arr);
-        //print_r($arrImages);
-        //echo $_REQUEST['lang'];
+		//print_r($arrImages);
+		//echo $_REQUEST['lang'];
 //print_r($post_arr);
 //print_r($trans_cat);
-        echo json_encode($post_arr[0]);
+		echo json_encode($post_arr[0]);
 
-    }
-    die();
+	}
+	die();
 }
 
 
@@ -3059,54 +3059,54 @@  discard block
 block discarded – undo
 function geodir_get_custom_fields_type($listing_type = '')
 {
 
-    global $wpdb;
+	global $wpdb;
 
-    if ($listing_type == '')
-        $listing_type = 'gd_place';
+	if ($listing_type == '')
+		$listing_type = 'gd_place';
 
-    $fields_info = array();
+	$fields_info = array();
 
-    $get_data = $wpdb->get_results(
-        $wpdb->prepare(
-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",
-            array($listing_type)
-        )
-    );
+	$get_data = $wpdb->get_results(
+		$wpdb->prepare(
+			"SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",
+			array($listing_type)
+		)
+	);
 
-    if (!empty($get_data)) {
+	if (!empty($get_data)) {
 
-        foreach ($get_data as $data) {
+		foreach ($get_data as $data) {
 
-            if ($data->field_type == 'address') {
+			if ($data->field_type == 'address') {
 
-                $extra_fields = unserialize($data->extra_fields);
+				$extra_fields = unserialize($data->extra_fields);
 
-                $prefix = $data->htmlvar_name . '_';
+				$prefix = $data->htmlvar_name . '_';
 
-                $fields_info[$prefix . 'address'] = $data->field_type;
+				$fields_info[$prefix . 'address'] = $data->field_type;
 
-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])
-                    $fields_info[$prefix . 'zip'] = $data->field_type;
+				if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])
+					$fields_info[$prefix . 'zip'] = $data->field_type;
 
-            } else {
+			} else {
 
-                $fields_info[$data->htmlvar_name] = $data->field_type;
+				$fields_info[$data->htmlvar_name] = $data->field_type;
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Filter to modify custom fields info using listing post type.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @return array $fields_info Custom fields info.
-     * @param string $listing_type The listing post type.
-     */
-    return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
+	/**
+	 * Filter to modify custom fields info using listing post type.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @return array $fields_info Custom fields info.
+	 * @param string $listing_type The listing post type.
+	 */
+	return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
 }
 
 
@@ -3121,58 +3121,58 @@  discard block
 block discarded – undo
  */
 function geodir_function_post_updated($post_ID, $post_after, $post_before)
 {
-    $post_type = get_post_type($post_ID);
+	$post_type = get_post_type($post_ID);
 
-    if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
-        // send notification to client when post moves from draft to publish
-        if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft' || $post_before->post_status == 'pending')) {
-            $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;
-            $post_author_data = get_userdata($post_author_id);
+	if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
+		// send notification to client when post moves from draft to publish
+		if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft' || $post_before->post_status == 'pending')) {
+			$post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;
+			$post_author_data = get_userdata($post_author_id);
 
-            $to_name = geodir_get_client_name($post_author_id);
+			$to_name = geodir_get_client_name($post_author_id);
 
-            $from_email = geodir_get_site_email_id();
-            $from_name = get_site_emailName();
-            $to_email = $post_author_data->user_email;
+			$from_email = geodir_get_site_email_id();
+			$from_name = get_site_emailName();
+			$to_email = $post_author_data->user_email;
 
-            if (!is_email($to_email) && !empty($post_author_data->user_email)) {
-                $to_email = $post_author_data->user_email;
-            }
+			if (!is_email($to_email) && !empty($post_author_data->user_email)) {
+				$to_email = $post_author_data->user_email;
+			}
 
-            $message_type = 'listing_published';
+			$message_type = 'listing_published';
 
-            if (get_option('geodir_post_published_email_subject') == '') {
-                update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
-            }
+			if (get_option('geodir_post_published_email_subject') == '') {
+				update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
+			}
 
-            if (get_option('geodir_post_published_email_content') == '') {
-                update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));
-            }
+			if (get_option('geodir_post_published_email_content') == '') {
+				update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));
+			}
 
-            /**
-             * Called before sending the email when listing gets published.
-             *
-             * @since 1.0.0
-             * @package GeoDirectory
-             * @param object $post_after The post object after update.
-             * @param object $post_before The post object before update.
-             */
-            do_action('geodir_before_listing_published_email', $post_after, $post_before);
-            if (is_email($to_email)) {
-                geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);
-            }
+			/**
+			 * Called before sending the email when listing gets published.
+			 *
+			 * @since 1.0.0
+			 * @package GeoDirectory
+			 * @param object $post_after The post object after update.
+			 * @param object $post_before The post object before update.
+			 */
+			do_action('geodir_before_listing_published_email', $post_after, $post_before);
+			if (is_email($to_email)) {
+				geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);
+			}
 
-            /**
-             * Called after sending the email when listing gets published.
-             *
-             * @since 1.0.0
-             * @package GeoDirectory
-             * @param object $post_after The post object after update.
-             * @param object $post_before The post object before update.
-             */
-            do_action('geodir_after_listing_published_email', $post_after, $post_before);
-        }
-    }
+			/**
+			 * Called after sending the email when listing gets published.
+			 *
+			 * @since 1.0.0
+			 * @package GeoDirectory
+			 * @param object $post_after The post object after update.
+			 * @param object $post_before The post object before update.
+			 */
+			do_action('geodir_after_listing_published_email', $post_after, $post_before);
+		}
+	}
 }
 
 add_action('wp_head', 'geodir_fb_like_thumbnail');
@@ -3187,46 +3187,46 @@  discard block
 block discarded – undo
  */
 function geodir_fb_like_thumbnail(){
 
-    $facebook_image = '';
-
-    if(is_single()){// single post
-        global $post;
-        if(isset($post->featured_image) && $post->featured_image){
-            $upload_dir = wp_upload_dir();
-            $facebook_image = $upload_dir['baseurl'].$post->featured_image;
-
-        }
-    }elseif(geodir_is_page('location')){// location page
-        if (function_exists('geodir_get_location_seo')) {
-            $seo = geodir_get_location_seo();
-            if (isset($seo->seo_image) && $seo->seo_image) {
-                $image = wp_get_attachment_image_src($seo->seo_image, 'full');
-                $facebook_image = isset($image[0]) ? $image[0] : '';
-            }
-        }
+	$facebook_image = '';
+
+	if(is_single()){// single post
+		global $post;
+		if(isset($post->featured_image) && $post->featured_image){
+			$upload_dir = wp_upload_dir();
+			$facebook_image = $upload_dir['baseurl'].$post->featured_image;
+
+		}
+	}elseif(geodir_is_page('location')){// location page
+		if (function_exists('geodir_get_location_seo')) {
+			$seo = geodir_get_location_seo();
+			if (isset($seo->seo_image) && $seo->seo_image) {
+				$image = wp_get_attachment_image_src($seo->seo_image, 'full');
+				$facebook_image = isset($image[0]) ? $image[0] : '';
+			}
+		}
 
-        if(!$facebook_image){
-            global $post;
+		if(!$facebook_image){
+			global $post;
 
-            if (has_post_thumbnail( $post->ID ) ){
-                $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'full' );
-                $facebook_image = isset($image[0]) ? $image[0] : '';
-            }
-        }
-    }
+			if (has_post_thumbnail( $post->ID ) ){
+				$image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'full' );
+				$facebook_image = isset($image[0]) ? $image[0] : '';
+			}
+		}
+	}
 
 
-    /**
-     * Filter the facebook share image.
-     *
-     * @since 1.6.22
-     * @param string $facebook_image The image URL or blank.
-     */
-    $facebook_image = apply_filters('geodir_fb_share_image',$facebook_image);
+	/**
+	 * Filter the facebook share image.
+	 *
+	 * @since 1.6.22
+	 * @param string $facebook_image The image URL or blank.
+	 */
+	$facebook_image = apply_filters('geodir_fb_share_image',$facebook_image);
 
-    if($facebook_image){
-        echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$facebook_image\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";
-    }
+	if($facebook_image){
+		echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$facebook_image\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";
+	}
 
 
 }
@@ -3240,11 +3240,11 @@  discard block
 block discarded – undo
  * @since 1.6.22
  */
 function geodir_delete_map_cache(){
-    $files = glob(realpath(dirname(__FILE__))."/map-functions/map-cache/*.json"); // get all file names
-    foreach($files as $file){ // iterate files
-        if(is_file($file))
-            unlink($file); // delete file
-    }
+	$files = glob(realpath(dirname(__FILE__))."/map-functions/map-cache/*.json"); // get all file names
+	foreach($files as $file){ // iterate files
+		if(is_file($file))
+			unlink($file); // delete file
+	}
 }
 
 
@@ -3257,23 +3257,23 @@  discard block
 block discarded – undo
  */
 function geodir_clear_map_cache_on_save($post_id, $post) {
 
-    if(!get_option('geodir_enable_map_cache')){
-        return;
-    }
+	if(!get_option('geodir_enable_map_cache')){
+		return;
+	}
 
-    if ( isset( $post->post_type ) && ( $post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post' ) ) {
-        return;
-    }
+	if ( isset( $post->post_type ) && ( $post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post' ) ) {
+		return;
+	}
 
-    $geodir_posttypes = geodir_get_posttypes();
+	$geodir_posttypes = geodir_get_posttypes();
 
-    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-        return;
-    }
+	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+		return;
+	}
 
-    if ( ! wp_is_post_revision( $post_id ) && isset( $post->post_type ) && in_array( $post->post_type, $geodir_posttypes ) ) {
-        geodir_delete_map_cache();
-    }
+	if ( ! wp_is_post_revision( $post_id ) && isset( $post->post_type ) && in_array( $post->post_type, $geodir_posttypes ) ) {
+		geodir_delete_map_cache();
+	}
 
 }
 
@@ -3288,19 +3288,19 @@  discard block
 block discarded – undo
  * @return array Filtered post data.
  */
 function geodir_fix_pending_listing_post_name( $data, $postarr ) {
-    // Dont' update post name for autosaves
-    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-        return $data;
-    }
+	// Dont' update post name for autosaves
+	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+		return $data;
+	}
 
-    if ( !empty( $data['post_name'] ) || empty( $data['post_status'] ) || empty( $data['post_type'] ) || empty( $data['post_title'] ) ) {
-        return $data;
-    }
+	if ( !empty( $data['post_name'] ) || empty( $data['post_status'] ) || empty( $data['post_type'] ) || empty( $data['post_title'] ) ) {
+		return $data;
+	}
 
-    if ( ( 'draft' == $data['post_status'] || 'pending' == $data['post_status'] ) && in_array( $data['post_type'], geodir_get_posttypes() ) ) {
-        $data['post_name'] = wp_unique_post_slug( sanitize_title( $data['post_title'] ), ( !empty( $postarr['ID'] ) ? $postarr['ID'] : 0 ), '', $data['post_type'], $data['post_parent'] );
-    }
+	if ( ( 'draft' == $data['post_status'] || 'pending' == $data['post_status'] ) && in_array( $data['post_type'], geodir_get_posttypes() ) ) {
+		$data['post_name'] = wp_unique_post_slug( sanitize_title( $data['post_title'] ), ( !empty( $postarr['ID'] ) ? $postarr['ID'] : 0 ), '', $data['post_type'], $data['post_parent'] );
+	}
 
-    return $data;
+	return $data;
 }
 add_filter( 'wp_insert_post_data', 'geodir_fix_pending_listing_post_name', 10, 2 );
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +246 added lines, -246 removed lines patch added patch discarded remove patch

@@ -26,11 +26,11 @@  discard block
 block discarded – undo
 
     if (!isset($default_cat) || empty($default_cat)) {
         $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';
-    }else{
-        if(!is_int($default_cat)){
+    } else {
+        if (!is_int($default_cat)) {
             $category = get_term_by('name', $default_cat, $taxonomy);
-            if(isset($category->term_id)){
-                $default_cat =  $category->term_id;
+            if (isset($category->term_id)) {
+                $default_cat = $category->term_id;
             }
         }
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 
     if ($default_pos === false) {
 
-        $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);
+        $change_cat_str = str_replace($default_cat.',y:', $default_cat.',y,d:', $change_cat_str);
 
     }
 
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
             
             $gd_post = $post;
             if (!empty($gd_post) && is_array($gd_post)) {
-                $gd_post = (object)$post;
+                $gd_post = (object) $post;
                 
                 // Fix WPML duplicate.
                 if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
         $send_post_submit_mail = false;
 
         // unhook this function so it doesn't loop infinitely
-        remove_action('save_post', 'geodir_post_information_save',10,2);
+        remove_action('save_post', 'geodir_post_information_save', 10, 2);
 
         if (isset($request_info['pid']) && $request_info['pid'] != '') {
             $post['ID'] = $request_info['pid'];
@@ -263,13 +263,13 @@  discard block
 block discarded – undo
         }
 
         // re-hook this function
-        add_action('save_post', 'geodir_post_information_save',10,2);
+        add_action('save_post', 'geodir_post_information_save', 10, 2);
 
         $post_tags = '';
         if (!isset($request_info['post_tags'])) {
 
             $post_type = $request_info['listing_type'];
-            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
+            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type.'_tags', array('fields' => 'names')));
 
         }
 
@@ -287,13 +287,13 @@  discard block
 block discarded – undo
         $payment_info = array();
         $package_info = array();
 
-        $package_info = (array)geodir_post_package_info($package_info, $post);
+        $package_info = (array) geodir_post_package_info($package_info, $post);
 
         $post_package_id = geodir_get_post_meta($last_post_id, 'package_id');
 
         if (!empty($package_info) && !$post_package_id) {
             if (isset($package_info['days']) && $package_info['days'] != 0) {
-                $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
+                $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['days']." days"));
             } else {
                 $payment_info['expire_date'] = 'Never';
             }
@@ -314,8 +314,8 @@  discard block
 block discarded – undo
             $extrafields = $val['extra_fields'];
 
             if (trim($type) == 'address') {
-                $prefix = $name . '_';
-                $address = $prefix . 'address';
+                $prefix = $name.'_';
+                $address = $prefix.'address';
 
                 if (isset($request_info[$address]) && $request_info[$address] != '') {
                     $gd_post_info[$address] = wp_slash($request_info[$address]);
@@ -325,59 +325,59 @@  discard block
 block discarded – undo
                     $extrafields = unserialize($extrafields);
 
 
-                    if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
+                    if (!isset($request_info[$prefix.'city']) || $request_info[$prefix.'city'] == '') {
 
                         $location_result = geodir_get_default_location();
 
-                        $gd_post_info[$prefix . 'city'] = $location_result->city;
-                        $gd_post_info[$prefix . 'region'] = $location_result->region;
-                        $gd_post_info[$prefix . 'country'] = $location_result->country;
+                        $gd_post_info[$prefix.'city'] = $location_result->city;
+                        $gd_post_info[$prefix.'region'] = $location_result->region;
+                        $gd_post_info[$prefix.'country'] = $location_result->country;
 
-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
+                        $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location
 
                     } else {
 
-                        $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];
-                        $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];
-                        $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];
+                        $gd_post_info[$prefix.'city'] = $request_info[$prefix.'city'];
+                        $gd_post_info[$prefix.'region'] = $request_info[$prefix.'region'];
+                        $gd_post_info[$prefix.'country'] = $request_info[$prefix.'country'];
 
                         //----------set post locations when import dummy data-------
                         $location_result = geodir_get_default_location();
 
-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location
+                        $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location
                         //-----------------------------------------------------------------
 
                     }
 
 
-                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
-                        $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];
+                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix.'zip'])) {
+                        $gd_post_info[$prefix.'zip'] = $request_info[$prefix.'zip'];
                     }
 
 
                     if (isset($extrafields['show_map']) && $extrafields['show_map']) {
 
-                        if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
-                            $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];
+                        if (isset($request_info[$prefix.'latitude']) && $request_info[$prefix.'latitude'] != '') {
+                            $gd_post_info[$prefix.'latitude'] = $request_info[$prefix.'latitude'];
                         }
 
-                        if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
-                            $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];
+                        if (isset($request_info[$prefix.'longitude']) && $request_info[$prefix.'longitude'] != '') {
+                            $gd_post_info[$prefix.'longitude'] = $request_info[$prefix.'longitude'];
                         }
 
-                        if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
-                            $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];
+                        if (isset($request_info[$prefix.'mapview']) && $request_info[$prefix.'mapview'] != '') {
+                            $gd_post_info[$prefix.'mapview'] = $request_info[$prefix.'mapview'];
                         }
 
-                        if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
-                            $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];
+                        if (isset($request_info[$prefix.'mapzoom']) && $request_info[$prefix.'mapzoom'] != '') {
+                            $gd_post_info[$prefix.'mapzoom'] = $request_info[$prefix.'mapzoom'];
                         }
 
                     }
 
                     // show lat lng
-                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
-                        $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];
+                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix.'latlng'])) {
+                        $gd_post_info[$prefix.'latlng'] = $request_info[$prefix.'latlng'];
                     }
                 }
 
@@ -403,16 +403,16 @@  discard block
 block discarded – undo
 
                         // check if we need to change the format or not
                         $date_format_len = strlen(str_replace(' ', '', $date_format));
-                        if($date_format_len>5){// if greater then 5 then it's the old style format.
+                        if ($date_format_len > 5) {// if greater then 5 then it's the old style format.
 
-                            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-                            $replace = array('d','j','l','m','n','F','Y');//PHP date format
+                            $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
+                            $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
 
                             $date_format = str_replace($search, $replace, $date_format);
 
                             $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
 
-                        }else{
+                        } else {
                             $post_htmlvar_value = $request_info[$name];
                         }
 
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
                 if (isset($request_info[$name])) {
                     $gd_post_info[$name] = $request_info[$name];
                 } else {
-                    if (isset($request_info['gd_field_' . $name])) {
+                    if (isset($request_info['gd_field_'.$name])) {
                         $gd_post_info[$name] = ''; /* fix de-select for multiselect */
                     }
                 }
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
         }
 
         if (is_array($post_tags)) {
-            $taxonomy = $request_info['listing_type'] . '_tags';
+            $taxonomy = $request_info['listing_type'].'_tags';
             wp_set_object_terms($last_post_id, $post_tags, $taxonomy);
         }
 
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
                 $tmpimgArr = trim($request_info['post_images'], ",");
                 $tmpimgArr = explode(",", $tmpimgArr);
                 geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);
-            } else{
+            } else {
                 geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);
             }
 
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
     if (!in_array($post_type, $all_postypes))
         return false;
 
-    $table = $plugin_prefix . $post_type . '_detail';
+    $table = $plugin_prefix.$post_type.'_detail';
 
     /**
      * Apply Filter to change Post info
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
      * @since 1.0.0
      * @package GeoDirectory
      */
-    $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
+    $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM ".$wpdb->posts." p,".$table." pd
 			  WHERE p.ID = pd.post_id
 			  AND pd.post_id = %d", $post_id));
 
@@ -652,7 +652,7 @@  discard block
 block discarded – undo
 
         $post_type = get_post_type($post_id);
 
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
 
         /**
          * Filter to change Post info
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
 
             $columns = $wpdb->get_col("show columns from $table");
             foreach ($postmeta as $mkey => $mval) {
-                if(in_array($mkey,$columns)) {
+                if (in_array($mkey, $columns)) {
                     if (is_array($mval)) {
                         $mval = implode(",", $mval);
                     }
@@ -702,12 +702,12 @@  discard block
 block discarded – undo
              */
             do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
 
-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
+            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
 
                 $query_string_array[] = $post_id;
                 $wpdb->query(
                     $wpdb->prepare(
-                        "UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d",
+                        "UPDATE ".$table." SET ".$query_string_escaped." where post_id =%d",
                         $query_string_array
                     )
                 );
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
                 array_unshift($query_string_array, $post_id);
                 $wpdb->query(
                     $wpdb->prepare(
-                        "INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped,
+                        "INSERT INTO ".$table." SET post_id = %d,".$query_string_escaped,
                         $query_string_array
                     )
                 );
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
 
         $post_type = get_post_type($post_id);
 
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
 
         if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
 
@@ -772,11 +772,11 @@  discard block
 block discarded – undo
                 $meta_value = implode(",", $meta_value);
             }
 
-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
+            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
 
                 $wpdb->query(
                     $wpdb->prepare(
-                        "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",
+                        "UPDATE ".$table." SET ".$postmeta." = '".$meta_value."' where post_id =%d",
                         array($post_id)
                     )
                 );
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
 
                 $wpdb->query(
                     $wpdb->prepare(
-                        "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",
+                        "INSERT INTO ".$table." SET post_id = %d, ".$postmeta." = '".$meta_value."'",
                         array($post_id)
                     )
                 );
@@ -818,14 +818,14 @@  discard block
 block discarded – undo
 
         $post_type = get_post_type($post_id);
 
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
 
         if (is_array($postmeta) && !empty($postmeta) && $post_id) {
             $post_meta_set_query = '';
 
             foreach ($postmeta as $mkey) {
                 if ($mval != '')
-                    $post_meta_set_query .= $mkey . " = '', ";
+                    $post_meta_set_query .= $mkey." = '', ";
             }
 
             $post_meta_set_query = trim($post_meta_set_query, ", ");
@@ -834,11 +834,11 @@  discard block
 block discarded – undo
                 return false;
             }
 
-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
+            if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {
 
                 $wpdb->query(
                     $wpdb->prepare(
-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",
+                        "UPDATE ".$table." SET ".$post_meta_set_query." where post_id = %d",
                         array($post_id)
                     )
                 );
@@ -847,11 +847,11 @@  discard block
 block discarded – undo
             }
 
         } elseif ($postmeta != '' && $post_id) {
-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
+            if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {
 
                 $wpdb->query(
                     $wpdb->prepare(
-                        "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",
+                        "UPDATE ".$table." SET ".$postmeta."= '' where post_id = %d",
                         array($post_id)
                     )
                 );
@@ -893,10 +893,10 @@  discard block
 block discarded – undo
         if (!in_array($post_type, $all_postypes))
             return false;
 
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
 
-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
-            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$meta_key."'") != '') {
+            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT ".$meta_key." from ".$table." where post_id = %d", array($post_id)));
             
             if ($meta_value && $meta_value !== '') {
                 $meta_value = maybe_serialize($meta_value);
@@ -915,7 +915,7 @@  discard block
 block discarded – undo
          * @param string $meta_key The meta key to retrieve.
          * @param bool $single Optional. Whether to return a single value. Default false.
          */
-        return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single );
+        return apply_filters('geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single);
     }
 }
 
@@ -941,13 +941,13 @@  discard block
 block discarded – undo
 
         $post_type = get_post_type($post_id);
 
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
 
         $post_images = geodir_get_images($post_id);
 
         $wpdb->query(
             $wpdb->prepare(
-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",
+                "UPDATE ".$table." SET featured_image = '' where post_id =%d",
                 array($post_id)
             )
         );
@@ -977,12 +977,12 @@  discard block
 block discarded – undo
                 $file_path = '';
                 /* --------- start ------- */
 
-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
+                $split_img_path = explode(str_replace(array('http://', 'https://'), '', $uploads['baseurl']), str_replace(array('http://', 'https://'), '', $post_image[$m]));
 
                 $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';
 
 
-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
+                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM ".GEODIR_ATTACHMENT_TABLE." WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
 
                     /* --------- end ------- */
                     $curr_img_url = $post_image[$m];
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
                     // If the uploaded file is the right format
                     if (in_array($uploaded_file_type, $allowed_file_types)) {
                         if (!function_exists('wp_handle_upload')) {
-                            require_once(ABSPATH . 'wp-admin/includes/file.php');
+                            require_once(ABSPATH.'wp-admin/includes/file.php');
                         }
 
                         if (!is_dir($geodir_uploadpath)) {
@@ -1034,41 +1034,41 @@  discard block
 block discarded – undo
                         }
 
                         $external_img = false;
-                        if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
+                        if (strpos(str_replace(array('http://', 'https://'), '', $curr_img_url), str_replace(array('http://', 'https://'), '', $uploads['baseurl'])) !== false) {
                         } else {
                             $external_img = true;
                         }
 
                         if ($dummy || $external_img) {
                             $uploaded_file = array();
-                            $uploaded = (array)fetch_remote_file($curr_img_url);
+                            $uploaded = (array) fetch_remote_file($curr_img_url);
 
                             if (isset($uploaded['error']) && empty($uploaded['error'])) {
                                 $new_name = basename($uploaded['file']);
                                 $uploaded_file = $uploaded;
-                            }else{
-                                print_r($uploaded);exit;
+                            } else {
+                                print_r($uploaded); exit;
                             }
                             $external_img = false;
                         } else {
-                            $new_name = $post_id . '_' . $file_name;
+                            $new_name = $post_id.'_'.$file_name;
 
                             if ($curr_img_dir == $sub_dir) {
-                                $img_path = $geodir_uploadpath . '/' . $filename;
-                                $img_url = $geodir_uploadurl . '/' . $filename;
+                                $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;
+                                $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 = copy($img_path, $geodir_uploadpath.'/'.$new_name);
                                 $file_path = '';
-                            } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
+                            } else if (file_exists($uploads['basedir'].$curr_img_dir.$filename)) {
                                 $uploaded_file = true;
-                                $file_path = $curr_img_dir . '/' . $filename;
+                                $file_path = $curr_img_dir.'/'.$filename;
                             }
 
                             if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))
@@ -1077,14 +1077,14 @@  discard block
 block discarded – undo
 
                         if (!empty($uploaded_file)) {
                             if (!isset($file_path) || !$file_path) {
-                                $file_path = $sub_dir . '/' . $new_name;
+                                $file_path = $sub_dir.'/'.$new_name;
                             }
 
-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
+                            $postcurr_images[] = str_replace(array('http://', 'https://'), '', $uploads['baseurl'].$file_path);
 
                             if ($menu_order == 1) {
 
-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
+                                $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
 
                             }
 
@@ -1102,12 +1102,12 @@  discard block
 block discarded – undo
 
                             foreach ($attachment as $key => $val) {
                                 if ($val != '')
-                                    $attachment_set .= $key . " = '" . $val . "', ";
+                                    $attachment_set .= $key." = '".$val."', ";
                             }
 
                             $attachment_set = trim($attachment_set, ", ");
 
-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
 
                             $valid_file_ids[] = $wpdb->insert_id;
                         }
@@ -1118,17 +1118,17 @@  discard block
 block discarded – undo
                 } else {
                     $valid_file_ids[] = $find_image;
 
-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
+                    $postcurr_images[] = str_replace(array('http://', 'https://'), '', $post_image[$m]);
 
                     $wpdb->query(
                         $wpdb->prepare(
-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",
+                            "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order = %d where file =%s AND post_id =%d",
                             array($menu_order, $split_img_path[1], $post_id)
                         )
                     );
 
                     if ($menu_order == 1)
-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
+                        $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
 
                 }
 
@@ -1152,9 +1152,9 @@  discard block
 block discarded – undo
 
                 foreach ($post_images as $img) {
 
-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
+                    if (!in_array(str_replace(array('http://', 'https://'), '', $img->src), $postcurr_images)) {
 
-                        $invalid_files[] = (object)array('src' => $img->src);
+                        $invalid_files[] = (object) array('src' => $img->src);
 
                     }
 
@@ -1162,12 +1162,12 @@  discard block
 block discarded – undo
 
             }
 
-            $invalid_files = (object)$invalid_files;
+            $invalid_files = (object) $invalid_files;
         }
 
         $remove_files[] = $post_id;
 
-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
+        $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ".$valid_files_condition." post_id = %d", $remove_files));
 
         if (!empty($invalid_files))
             geodir_remove_attachments($invalid_files);
@@ -1207,7 +1207,7 @@  discard block
 block discarded – undo
 			rmdir($dirPath);
 	}	*/
 
-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;
+    $dirname = $uploads_dir.'/temp_'.$current_user->ID;
     geodir_delete_directory($dirname);
 }
 
@@ -1229,10 +1229,10 @@  discard block
 block discarded – undo
         return false;
     while ($file = readdir($dir_handle)) {
         if ($file != "." && $file != "..") {
-            if (!is_dir($dirname . "/" . $file))
-                unlink($dirname . "/" . $file);
+            if (!is_dir($dirname."/".$file))
+                unlink($dirname."/".$file);
             else
-                geodir_delete_directory($dirname . '/' . $file);
+                geodir_delete_directory($dirname.'/'.$file);
         }
     }
     closedir($dir_handle);
@@ -1261,8 +1261,8 @@  discard block
 block discarded – undo
             foreach ($postcurr_images as $postimg) {
                 $image_name_arr = explode('/', $postimg->src);
                 $filename = end($image_name_arr);
-                if (file_exists($uploads_dir . '/' . $filename))
-                    unlink($uploads_dir . '/' . $filename);
+                if (file_exists($uploads_dir.'/'.$filename))
+                    unlink($uploads_dir.'/'.$filename);
             }
 
         } // endif
@@ -1303,28 +1303,28 @@  discard block
 block discarded – undo
         }
 
         if (!in_array($post_type, geodir_get_posttypes())) {
-            return false;// if not a GD CPT return;
+            return false; // if not a GD CPT return;
         }
 
 
-        $list_img_size = get_option('geodir_listing_img_size','default');
+        $list_img_size = get_option('geodir_listing_img_size', 'default');
 
-        if( $size=='list-thumb' && $list_img_size != 'default' ){
-            $fimg = get_the_post_thumbnail_url($post_id,$list_img_size);
-            if($fimg){
+        if ($size == 'list-thumb' && $list_img_size != 'default') {
+            $fimg = get_the_post_thumbnail_url($post_id, $list_img_size);
+            if ($fimg) {
                 $uploads = wp_upload_dir(); 
                 $uploads_baseurl = $uploads['baseurl'];
-                $file = str_replace($uploads_baseurl,'',$fimg);
+                $file = str_replace($uploads_baseurl, '', $fimg);
             }
         }
 
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
 
         if (!$file) {
             if (isset($post->featured_image)) {
                 $file = $post->featured_image;
             } else {
-                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
+                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM ".$table." WHERE post_id = %d", array($post_id)));
             }
         }
 
@@ -1343,9 +1343,9 @@  discard block
 block discarded – undo
 
             $file_name = $file_info['basename'];
 
-            $uploads_url = $uploads_baseurl . $sub_dir;
+            $uploads_url = $uploads_baseurl.$sub_dir;
 
-            $img_src = $uploads_url . '/' . $file_name;
+            $img_src = $uploads_url.'/'.$file_name;
 
             // jetpack CDN check
             if (strpos($file, '.wp.com/') !== false) {
@@ -1361,8 +1361,8 @@  discard block
 block discarded – undo
              * @param string $uploads_url The server upload directory url.
              * @param string $uploads_baseurl The uploads dir base url.
              */
-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$img_src,$file_name,$uploads_url,$uploads_baseurl);
-            $img_arr['path'] = $uploads_path . '/' . $file_name;
+            $img_arr['src'] = apply_filters('geodir_get_featured_image_src', $img_src, $file_name, $uploads_url, $uploads_baseurl);
+            $img_arr['path'] = $uploads_path.'/'.$file_name;
             $width = 0;
             $height = 0;
             if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
@@ -1405,7 +1405,7 @@  discard block
 block discarded – undo
                 $file_name = $file_info['basename'];
 
                 $img_arr['src'] = $default_img;
-                $img_arr['path'] = $uploads_path . '/' . $file_name;
+                $img_arr['path'] = $uploads_path.'/'.$file_name;
 
                 $width = 0;
                 $height = 0;
@@ -1422,7 +1422,7 @@  discard block
 block discarded – undo
         }
 
         if (!empty($img_arr))
-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );
+            return (object) $img_arr; //return (object)array( 'src' => $file_url, 'path' => $file_path );
         else
             return false;
     }
@@ -1485,7 +1485,7 @@  discard block
 block discarded – undo
 
         $arrImages = $wpdb->get_results(
             $wpdb->prepare(
-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",
+                "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d".$not_featured." ORDER BY menu_order ASC, ID DESC $limit_q ",
                 array('%image%', $post_id)
             )
         );
@@ -1511,7 +1511,7 @@  discard block
 block discarded – undo
 
                 $file_name = $file_info['basename'];
 
-                $uploads_url = $uploads_baseurl . $sub_dir;
+                $uploads_url = $uploads_baseurl.$sub_dir;
                 /*
                 * Allows the filter of image src for such things as CDN change.
                 *
@@ -1521,8 +1521,8 @@  discard block
 block discarded – undo
                 * @param string $uploads_url The server upload directory url.
                 * @param string $uploads_baseurl The uploads dir base url.
                 */
-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
-                $img_arr['path'] = $uploads_path . '/' . $file_name;
+                $img_arr['src'] = apply_filters('geodir_get_images_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);
+                $img_arr['path'] = $uploads_path.'/'.$file_name;
                 $width = 0;
                 $height = 0;
                 if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
@@ -1539,7 +1539,7 @@  discard block
 block discarded – undo
                 $img_arr['content'] = $attechment->content; // add the description to the array
                 $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.
 
-                $return_arr[] = (object)$img_arr;
+                $return_arr[] = (object) $img_arr;
 
                 $counter++;
             }
@@ -1550,7 +1550,7 @@  discard block
 block discarded – undo
              * @since 1.6.20
              * @param array $return_arr The array of image objects.
              */
-            return apply_filters('geodir_get_images_arr',$return_arr);
+            return apply_filters('geodir_get_images_arr', $return_arr);
         } else if ($no_images) {
             $default_img = '';
             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);
@@ -1589,7 +1589,7 @@  discard block
 block discarded – undo
                 $img_arr['title'] = $file_info['filename']; // add the title to the array
                 $img_arr['content'] = $file_info['filename']; // add the description to the array
 
-                $return_arr[] = (object)$img_arr;
+                $return_arr[] = (object) $img_arr;
 
                 /**
                  * Filter the images array so things can be changed.
@@ -1597,7 +1597,7 @@  discard block
 block discarded – undo
                  * @since 1.6.20
                  * @param array $return_arr The array of image objects.
                  */
-                return apply_filters('geodir_get_images_arr',$return_arr);
+                return apply_filters('geodir_get_images_arr', $return_arr);
             } else
                 return false;
         }
@@ -1622,8 +1622,8 @@  discard block
 block discarded – undo
 
         $html = '';
         if (!empty($request)) {
-            if (!is_object($request)){
-                $request = (object)$request;
+            if (!is_object($request)) {
+                $request = (object) $request;
             }
 
             if (isset($request->src) && !isset($request->path)) {
@@ -1637,7 +1637,7 @@  discard block
 block discarded – undo
             $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
             $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
             if (strpos($img_no_http, $upload_no_http) !== false) {
-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);
+                $request->path = str_replace($img_no_http, $upload_dir['basedir'], $request->path);
             }
             
             $width = 0;
@@ -1654,7 +1654,7 @@  discard block
 block discarded – undo
             $image->height = $height;
             $image->title = isset($request->title) ? $request->title : '';
 
-            $max_size = (object)geodir_get_imagesize($size);
+            $max_size = (object) geodir_get_imagesize($size);
 
             if (!is_wp_error($max_size)) {
                 if ($image->width) {
@@ -1666,13 +1666,13 @@  discard block
 block discarded – undo
                         $width_per = 100;
                 }
 
-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
-                    $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';
+                if (is_admin() && !isset($_REQUEST['geodir_ajax'])) {
+                    $html = '<div class="geodir_thumbnail"><img style="max-height:'.$max_size->h.'px;" alt="place image" src="'.$image->src.'"  /></div>';
                 } else {
-                    if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
-                        $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>';
-                    }else{
-                        $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
+                    if ($size == 'widget-thumb' || !get_option('geodir_lazy_load', 1)) {
+                        $html = '<div class="geodir_thumbnail" style="background-image:url(\''.$image->src.'\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>';
+                    } else {
+                        $html = '<div data-src="'.str_replace(' ', '%20', $image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
                     }
 
                 }
@@ -1707,15 +1707,15 @@  discard block
 block discarded – undo
 
         $post_type = get_post_type($post_id);
 
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
 
         if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
 
-            if ($taxonomy == $post_type . '_tags') {
+            if ($taxonomy == $post_type.'_tags') {
                 if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
                     geodir_save_post_meta($post_id, 'post_tags', $terms);
                 }
-            } elseif ($taxonomy == $post_type . 'category') {
+            } elseif ($taxonomy == $post_type.'category') {
                 $srcharr = array('"', '\\');
                 $replarr = array("&quot;", '');
 
@@ -1737,7 +1737,7 @@  discard block
 block discarded – undo
 
                     $wpdb->get_var(
                         $wpdb->prepare(
-                            "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",
+                            "DELETE from ".GEODIR_ICON_TABLE." WHERE cat_id NOT IN ($format) AND post_id = %d ",
                             $cat_ids_array_del
                         )
                     );
@@ -1745,7 +1745,7 @@  discard block
 block discarded – undo
 
                     $post_term = $wpdb->get_col(
                         $wpdb->prepare(
-                            "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",
+                            "SELECT term_id FROM ".$wpdb->term_taxonomy." WHERE term_taxonomy_id IN($format) GROUP BY term_id",
                             $cat_ids_array
                         )
                     );
@@ -1767,16 +1767,16 @@  discard block
 block discarded – undo
                         $lat = geodir_get_post_meta($post_id, 'post_latitude', true);
                         $lng = geodir_get_post_meta($post_id, 'post_longitude', true);
 
-                        $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
-                        $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);
+                        $timing = ' - '.date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
+                        $timing .= ' - '.geodir_get_post_meta($post_id, 'st_time', true);
 
                         $json = '{';
-                        $json .= '"id":"' . $post_id . '",';
-                        $json .= '"lat_pos": "' . $lat . '",';
-                        $json .= '"long_pos": "' . $lng . '",';
-                        $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';
-                        $json .= '"icon":"' . $term_icon . '",';
-                        $json .= '"group":"catgroup' . $cat_id . '"';
+                        $json .= '"id":"'.$post_id.'",';
+                        $json .= '"lat_pos": "'.$lat.'",';
+                        $json .= '"long_pos": "'.$lng.'",';
+                        $json .= '"marker_id":"'.$post_id.'_'.$cat_id.'",';
+                        $json .= '"icon":"'.$term_icon.'",';
+                        $json .= '"group":"catgroup'.$cat_id.'"';
                         $json .= '}';
 
 
@@ -1784,9 +1784,9 @@  discard block
 block discarded – undo
                             $post_marker_json = $json;
 
 
-                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
+                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".GEODIR_ICON_TABLE." WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
 
-                            $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
+                            $json_query = $wpdb->prepare("UPDATE ".GEODIR_ICON_TABLE." SET
 										post_title = %s,
 										json = %s
 										WHERE post_id = %d AND cat_id = %d ",
@@ -1794,7 +1794,7 @@  discard block
 block discarded – undo
 
                         } else {
 
-                            $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
+                            $json_query = $wpdb->prepare("INSERT INTO ".GEODIR_ICON_TABLE." SET
 										post_id = %d,
 										post_title = %s,
 										cat_id = %d,
@@ -1812,17 +1812,17 @@  discard block
 block discarded – undo
                 if (!empty($post_term) && is_array($post_term)) {
                     $categories = implode(',', $post_term);
 
-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';
+                    if ($categories != '' && $categories != 0) $categories = ','.$categories.',';
 
                     if (empty($post_marker_json))
                         $post_marker_json = isset($json) ? $json : '';
 
-                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
+                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
 
                         $wpdb->query(
                             $wpdb->prepare(
-                                "UPDATE " . $table . " SET
-								" . $taxonomy . " = %s,
+                                "UPDATE ".$table." SET
+								" . $taxonomy." = %s,
 								marker_json = %s
 								where post_id = %d",
                                 array($categories, $post_marker_json, $post_id)
@@ -1843,7 +1843,7 @@  discard block
 block discarded – undo
 
                                     $wpdb->query(
                                         $wpdb->prepare(
-                                            "UPDATE " . $table . " SET
+                                            "UPDATE ".$table." SET
 											default_category = %s
 											where post_id = %d",
                                             array($categories[0], $post_id)
@@ -1868,9 +1868,9 @@  discard block
 block discarded – undo
 
                         $wpdb->query(
                             $wpdb->prepare(
-                                "INSERT INTO " . $table . " SET
+                                "INSERT INTO ".$table." SET
 								post_id = %d,
-								" . $taxonomy . " = %s,
+								" . $taxonomy." = %s,
 								marker_json = %s ",
 
                                 array($post_id, $categories, $post_marker_json)
@@ -2002,7 +2002,7 @@  discard block
 block discarded – undo
                                     } ?>"><img alt="bubble image" style="max-height:50px;"
                                                src="<?php echo $post_images[0]; ?>"/></a></div>
                             <?php
-                            }else{
+                            } else {
                                 echo '<div class="geodir-bubble_image"></div>';
                             }
                         } else {
@@ -2010,7 +2010,7 @@  discard block
 block discarded – undo
                                 ?>
                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>
                             <?php
-                            }else{
+                            } else {
                                 echo '<div class="geodir-bubble_image"></div>';
                             }
                         }
@@ -2040,7 +2040,7 @@  discard block
 block discarded – undo
                              * @param object $postinfo_obj The posts info as an object.
                              * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *
                              */
-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
+                            do_action('geodir_infowindow_meta_after', $postinfo_obj, $post_preview);
                             ?>
                         </div>
                         <?php
@@ -2050,9 +2050,9 @@  discard block
 block discarded – undo
                             <div class="geodir-bubble-meta-fade"></div>
                             <div class="geodir-bubble-meta-bottom">
                                 <?php if ($rating_star != '') { ?>
-                                <span class="geodir-bubble-rating"><?php echo $rating_star;?></span>
+                                <span class="geodir-bubble-rating"><?php echo $rating_star; ?></span>
                                 <?php } ?>
-                                <span class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID);?></span>
+                                <span class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID); ?></span>
                                 <span class="geodir-bubble-reviews">
                                     <a href="<?php echo get_comments_link($ID); ?>" class="geodir-pcomments"><i class="fas fa-comments"></i> <?php echo get_comments_number($ID); ?></a>
                                 </span>
@@ -2091,9 +2091,9 @@  discard block
 block discarded – undo
 function geodir_new_post_default_status()
 {
 
-    $status = get_option( 'geodir_new_post_default_status' );
+    $status = get_option('geodir_new_post_default_status');
 
-    if ( empty( $status ) ) {
+    if (empty($status)) {
         $status = 'publish';
     }
 
@@ -2102,7 +2102,7 @@  discard block
 block discarded – undo
      *
      * @since 1.6.23
      */
-    return apply_filters( 'geodir_new_post_default_status', $status );
+    return apply_filters('geodir_new_post_default_status', $status);
 
 }
 
@@ -2121,11 +2121,11 @@  discard block
 block discarded – undo
 
         $post_type = get_post_type($post_id);
 
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
 
         $wpdb->query(
             $wpdb->prepare(
-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",
+                "UPDATE ".$table." SET post_status=%s WHERE post_id=%d",
                 array($status, $post_id)
             )
         );
@@ -2197,18 +2197,18 @@  discard block
 block discarded – undo
 
         $post_type = get_post_type($post_id);
 
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
 
         $wpdb->query(
             $wpdb->prepare(
-                "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",
+                "UPDATE ".$table." SET `post_id` = %d WHERE `post_id` = %d",
                 array($updatingpost, $temppost)
             )
         );
 
         $wpdb->query(
             $wpdb->prepare(
-                "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
+                "UPDATE ".GEODIR_ICON_TABLE." SET `post_id` = %d WHERE `post_id` = %d",
                 array($updatingpost, $temppost)
             )
         );
@@ -2217,7 +2217,7 @@  discard block
 block discarded – undo
 
         $wpdb->query(
             $wpdb->prepare(
-                "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",
+                "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET `post_id` = %d WHERE `post_id` = %d",
                 array($updatingpost, $temppost)
             )
         );
@@ -2255,12 +2255,12 @@  discard block
 block discarded – undo
         if (!in_array($post_type, $all_postypes))
             return false;
 
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
 
         /* Delete custom post meta*/
         $wpdb->query(
             $wpdb->prepare(
-                "DELETE FROM " . $table . " WHERE `post_id` = %d",
+                "DELETE FROM ".$table." WHERE `post_id` = %d",
                 array($deleted_postid)
             )
         );
@@ -2268,22 +2268,22 @@  discard block
 block discarded – undo
         /* Delete post map icons*/
         $wpdb->query(
             $wpdb->prepare(
-                "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",
+                "DELETE FROM ".GEODIR_ICON_TABLE." WHERE `post_id` = %d",
                 array($deleted_postid)
             )
         );
 
         /* Delete Attachments*/
-        $feat_id = get_post_thumbnail_id( $deleted_postid );// make sure to remove the smaller images
-        if($feat_id){
-            wp_delete_attachment( $feat_id, true);
+        $feat_id = get_post_thumbnail_id($deleted_postid); // make sure to remove the smaller images
+        if ($feat_id) {
+            wp_delete_attachment($feat_id, true);
         }
 
         $postcurr_images = geodir_get_images($deleted_postid);
 
         $wpdb->query(
             $wpdb->prepare(
-                "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",
+                "DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE `post_id` = %d",
                 array($deleted_postid)
             )
         );
@@ -2338,9 +2338,9 @@  discard block
 block discarded – undo
         $favourite_icon = apply_filters('geodir_favourite_icon', 'fas fa-heart');
 
         $site_id = '';
-        if ( is_multisite() ) {
+        if (is_multisite()) {
             $blog_id = get_current_blog_id();
-            if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+            if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
         }
 
         $user_meta_data = geodir_get_user_favourites($current_user->data->ID);
@@ -2361,7 +2361,7 @@  discard block
 block discarded – undo
          */
         do_action('geodir_before_add_from_favorite', $post_id);
 
-        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';
+        echo '<a href="javascript:void(0);" title="'.$remove_favourite_text.'" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'remove\');"><i class="'.$favourite_icon.'"></i> '.$unfavourite_text.'</a>';
 
         /**
          * Called after adding the post from favourites.
@@ -2419,9 +2419,9 @@  discard block
 block discarded – undo
         $favourite_icon = apply_filters('geodir_favourite_icon', 'fas fa-heart');
 
         $site_id = '';
-        if ( is_multisite() ) {
+        if (is_multisite()) {
             $blog_id = get_current_blog_id();
-            if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+            if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
         }
 
         $user_meta_data = array();
@@ -2446,7 +2446,7 @@  discard block
 block discarded – undo
          */
         do_action('geodir_before_remove_from_favorite', $post_id);
 
-        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';
+        echo '<a href="javascript:void(0);"  title="'.$add_favourite_text.'" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'add\');"><i class="'.$favourite_icon.'"></i> '.$favourite_text.'</a>';
 
         /**
          * Called after removing the post from favourites.
@@ -2538,9 +2538,9 @@  discard block
 block discarded – undo
 
 
         $site_id = '';
-        if ( is_multisite() ) {
+        if (is_multisite()) {
             $blog_id = get_current_blog_id();
-            if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+            if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
         }
 
         $user_meta_data = '';
@@ -2548,24 +2548,24 @@  discard block
 block discarded – undo
             $user_meta_data = geodir_get_user_favourites($current_user->data->ID);
 
         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a
+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"  ><a
                 class="geodir-removetofav-icon" href="javascript:void(0);"
-                onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"
-                title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>
+                onclick="javascript:addToFavourite(<?php echo $post_id; ?>,'remove');"
+                title="<?php echo $remove_favourite_text; ?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text; ?>
             </a>   </span><?php
 
         } else {
 
             if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
-                $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';
+                $script_text = 'javascript:window.location.href=\''.geodir_login_url().'\'';
             } else
-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
+                $script_text = 'javascript:addToFavourite('.$post_id.',\'add\')';
 
-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"
+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"><a class="geodir-addtofav-icon"
                                                                                         href="javascript:void(0);"
-                                                                                        onclick="<?php echo $script_text;?>"
-                                                                                        title="<?php echo $add_favourite_text;?>"><i
-                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>
+                                                                                        onclick="<?php echo $script_text; ?>"
+                                                                                        title="<?php echo $add_favourite_text; ?>"><i
+                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text; ?></a></span>
         <?php }
     }
 }
@@ -2595,7 +2595,7 @@  discard block
 block discarded – undo
 
             $post_type = $taxonomy_obj->object_type[0];
 
-            $table = $plugin_prefix . $post_type . '_detail';
+            $table = $plugin_prefix.$post_type.'_detail';
 
             /**
              * Filter to modify the 'join' query
@@ -2618,8 +2618,8 @@  discard block
 block discarded – undo
             $where = apply_filters('geodir_cat_post_count_where', $where, $term);
 
             $count_query = "SELECT count(post_id) FROM
-							" . $table . " as pd " . $join . "
-							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
+							" . $table." as pd ".$join."
+							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id."',".$term->taxonomy.") ".$where;
 
             $cat_post_count = $wpdb->get_var($count_query);
             if (empty($cat_post_count) || is_wp_error($cat_post_count))
@@ -2702,13 +2702,13 @@  discard block
 block discarded – undo
     global $post;
     $all_postypes = geodir_get_posttypes();
     if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
-        $out = ' <a class="excerpt-read-more" href="' .  get_permalink($post->ID) . '" title="' . get_the_title($post->ID) . '">';
+        $out = ' <a class="excerpt-read-more" href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">';
         /**
          * Filter excerpt read more text.
          *
          * @since 1.0.0
          */
-        $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );
+        $out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));
         $out .= '</a>';
         return $out;
     }
@@ -2737,14 +2737,14 @@  discard block
 block discarded – undo
     if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
 
         $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
+        $table = $plugin_prefix.$geodir_post_type.'_detail';
 
         $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);
-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';
+        $term_icon = $path_parts['dirname'].'/cat_icon_'.$term_id.'.png';
 
         $posts = $wpdb->get_results(
             $wpdb->prepare(
-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",
+                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM ".$table." WHERE FIND_IN_SET(%s,%1\$s ) ",
                 array($term_id, $taxonomy)
             )
         );
@@ -2756,19 +2756,19 @@  discard block
 block discarded – undo
                 $lng = $post_obj->post_longitude;
 
                 $json = '{';
-                $json .= '"id":"' . $post_obj->post_id . '",';
-                $json .= '"lat_pos": "' . $lat . '",';
-                $json .= '"long_pos": "' . $lng . '",';
-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';
-                $json .= '"icon":"' . $term_icon . '",';
-                $json .= '"group":"catgroup' . $term_id . '"';
+                $json .= '"id":"'.$post_obj->post_id.'",';
+                $json .= '"lat_pos": "'.$lat.'",';
+                $json .= '"long_pos": "'.$lng.'",';
+                $json .= '"marker_id":"'.$post_obj->post_id.'_'.$term_id.'",';
+                $json .= '"icon":"'.$term_icon.'",';
+                $json .= '"group":"catgroup'.$term_id.'"';
                 $json .= '}';
 
                 if ($post_obj->default_category == $term_id) {
 
                     $wpdb->query(
                         $wpdb->prepare(
-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",
+                            "UPDATE ".$table." SET marker_json = %s where post_id = %d",
                             array($json, $post_obj->post_id)
                         )
                     );
@@ -2776,7 +2776,7 @@  discard block
 block discarded – undo
 
                 $wpdb->query(
                     $wpdb->prepare(
-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",
+                        "UPDATE ".GEODIR_ICON_TABLE." SET json = %s WHERE post_id = %d AND cat_id = %d",
                         array($json, $post_obj->post_id, $term_id)
                     )
                 );
@@ -2864,7 +2864,7 @@  discard block
 block discarded – undo
      * @param bool $exclude_admin Do you want to exclude admin from the check?. Default true.
      * return bool
      */
-    return apply_filters('geodir_listing_belong_to_current_user',$result,$listing_id,$current_user->ID,$exclude_admin);
+    return apply_filters('geodir_listing_belong_to_current_user', $result, $listing_id, $current_user->ID, $exclude_admin);
 }
 
 
@@ -2912,7 +2912,7 @@  discard block
 block discarded – undo
 //	print_r($uploads ) ;
     $post_first_image = $wpdb->get_results(
         $wpdb->prepare(
-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)
+            "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d and menu_order = 1  ", array($post_id)
         )
     );
 
@@ -2933,9 +2933,9 @@  discard block
 block discarded – undo
 
         $post_type = get_post_type($post_id);
 
-        $table_name = $plugin_prefix . $post_type . '_detail';
+        $table_name = $plugin_prefix.$post_type.'_detail';
 
-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
+        $wpdb->query("UPDATE ".$table_name." SET featured_image='".$post_first_image[0]->file."' WHERE post_id =".$post_id);
 
         $new_attachment_name = basename($post_first_image[0]->file);
 
@@ -2948,11 +2948,11 @@  discard block
 block discarded – undo
                 wp_delete_attachment($post_thumbnail_id);
 
             }
-            $filename = $uploads['basedir'] . $post_first_image[0]->file;
+            $filename = $uploads['basedir'].$post_first_image[0]->file;
 
             $attachment = array(
                 'post_mime_type' => $post_first_image[0]->mime_type,
-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,
+                'guid' => $uploads['baseurl'].$post_first_image[0]->file,
                 'post_parent' => $post_id,
                 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
                 'post_content' => ''
@@ -2965,7 +2965,7 @@  discard block
 block discarded – undo
 
                 set_post_thumbnail($post_id, $id);
 
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
+                require_once(ABSPATH.'wp-admin/includes/image.php');
                 wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
 
             }
@@ -2998,35 +2998,35 @@  discard block
 block discarded – undo
         $post_id = absint($_POST['post_id']);
         $upload_dir = wp_upload_dir();
         $post_type = get_post_type($_POST['post_id']);
-        $table = $plugin_prefix . $post_type . '_detail';
+        $table = $plugin_prefix.$post_type.'_detail';
 
         $post_arr = $wpdb->get_results($wpdb->prepare(
-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
+            "SELECT * FROM $wpdb->posts p JOIN ".$table." gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",
             array($post_id)
         )
             , ARRAY_A);
 
         $arrImages = $wpdb->get_results(
             $wpdb->prepare(
-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
+                "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",
                 array('%image%', $post_id)
             )
         );
         if ($arrImages) {
             $image_arr = array();
             foreach ($arrImages as $img) {
-                $image_arr[] = $upload_dir['baseurl'] . $img->file;
+                $image_arr[] = $upload_dir['baseurl'].$img->file;
             }
             $comma_separated = implode(",", $image_arr);
             $post_arr[0]['post_images'] = $comma_separated;
         }
 
 
-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];
+        $cats = $post_arr[0][$post_arr[0]['post_type'].'category'];
         $cat_arr = array_filter(explode(",", $cats));
         $trans_cat = array();
         foreach ($cat_arr as $cat) {
-            $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false);
+            $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'].'category', false);
         }
 
 
@@ -3068,7 +3068,7 @@  discard block
 block discarded – undo
 
     $get_data = $wpdb->get_results(
         $wpdb->prepare(
-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",
+            "SELECT htmlvar_name, field_type, extra_fields FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1'",
             array($listing_type)
         )
     );
@@ -3081,12 +3081,12 @@  discard block
 block discarded – undo
 
                 $extra_fields = unserialize($data->extra_fields);
 
-                $prefix = $data->htmlvar_name . '_';
+                $prefix = $data->htmlvar_name.'_';
 
-                $fields_info[$prefix . 'address'] = $data->field_type;
+                $fields_info[$prefix.'address'] = $data->field_type;
 
                 if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])
-                    $fields_info[$prefix . 'zip'] = $data->field_type;
+                    $fields_info[$prefix.'zip'] = $data->field_type;
 
             } else {
 
@@ -3185,18 +3185,18 @@  discard block
 block discarded – undo
  * @since 1.6.22 Added image from location page.
  * @package GeoDirectory
  */
-function geodir_fb_like_thumbnail(){
+function geodir_fb_like_thumbnail() {
 
     $facebook_image = '';
 
-    if(is_single()){// single post
+    if (is_single()) {// single post
         global $post;
-        if(isset($post->featured_image) && $post->featured_image){
+        if (isset($post->featured_image) && $post->featured_image) {
             $upload_dir = wp_upload_dir();
             $facebook_image = $upload_dir['baseurl'].$post->featured_image;
 
         }
-    }elseif(geodir_is_page('location')){// location page
+    }elseif (geodir_is_page('location')) {// location page
         if (function_exists('geodir_get_location_seo')) {
             $seo = geodir_get_location_seo();
             if (isset($seo->seo_image) && $seo->seo_image) {
@@ -3205,11 +3205,11 @@  discard block
 block discarded – undo
             }
         }
 
-        if(!$facebook_image){
+        if (!$facebook_image) {
             global $post;
 
-            if (has_post_thumbnail( $post->ID ) ){
-                $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'full' );
+            if (has_post_thumbnail($post->ID)) {
+                $image = wp_get_attachment_image_src(get_post_thumbnail_id($post->ID), 'full');
                 $facebook_image = isset($image[0]) ? $image[0] : '';
             }
         }
@@ -3222,16 +3222,16 @@  discard block
 block discarded – undo
      * @since 1.6.22
      * @param string $facebook_image The image URL or blank.
      */
-    $facebook_image = apply_filters('geodir_fb_share_image',$facebook_image);
+    $facebook_image = apply_filters('geodir_fb_share_image', $facebook_image);
 
-    if($facebook_image){
+    if ($facebook_image) {
         echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$facebook_image\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";
     }
 
 
 }
 
-add_action( 'save_post', 'geodir_clear_map_cache_on_save', 10,2 );
+add_action('save_post', 'geodir_clear_map_cache_on_save', 10, 2);
 
 
 /**
@@ -3239,10 +3239,10 @@  discard block
 block discarded – undo
  *
  * @since 1.6.22
  */
-function geodir_delete_map_cache(){
+function geodir_delete_map_cache() {
     $files = glob(realpath(dirname(__FILE__))."/map-functions/map-cache/*.json"); // get all file names
-    foreach($files as $file){ // iterate files
-        if(is_file($file))
+    foreach ($files as $file) { // iterate files
+        if (is_file($file))
             unlink($file); // delete file
     }
 }
@@ -3257,21 +3257,21 @@  discard block
 block discarded – undo
  */
 function geodir_clear_map_cache_on_save($post_id, $post) {
 
-    if(!get_option('geodir_enable_map_cache')){
+    if (!get_option('geodir_enable_map_cache')) {
         return;
     }
 
-    if ( isset( $post->post_type ) && ( $post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post' ) ) {
+    if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {
         return;
     }
 
     $geodir_posttypes = geodir_get_posttypes();
 
-    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
         return;
     }
 
-    if ( ! wp_is_post_revision( $post_id ) && isset( $post->post_type ) && in_array( $post->post_type, $geodir_posttypes ) ) {
+    if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
         geodir_delete_map_cache();
     }
 
@@ -3287,20 +3287,20 @@  discard block
 block discarded – undo
  * @param array $postarr An array of sanitized, but otherwise unmodified post data.
  * @return array Filtered post data.
  */
-function geodir_fix_pending_listing_post_name( $data, $postarr ) {
+function geodir_fix_pending_listing_post_name($data, $postarr) {
     // Dont' update post name for autosaves
-    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
         return $data;
     }
 
-    if ( !empty( $data['post_name'] ) || empty( $data['post_status'] ) || empty( $data['post_type'] ) || empty( $data['post_title'] ) ) {
+    if (!empty($data['post_name']) || empty($data['post_status']) || empty($data['post_type']) || empty($data['post_title'])) {
         return $data;
     }
 
-    if ( ( 'draft' == $data['post_status'] || 'pending' == $data['post_status'] ) && in_array( $data['post_type'], geodir_get_posttypes() ) ) {
-        $data['post_name'] = wp_unique_post_slug( sanitize_title( $data['post_title'] ), ( !empty( $postarr['ID'] ) ? $postarr['ID'] : 0 ), '', $data['post_type'], $data['post_parent'] );
+    if (('draft' == $data['post_status'] || 'pending' == $data['post_status']) && in_array($data['post_type'], geodir_get_posttypes())) {
+        $data['post_name'] = wp_unique_post_slug(sanitize_title($data['post_title']), (!empty($postarr['ID']) ? $postarr['ID'] : 0), '', $data['post_type'], $data['post_parent']);
     }
 
     return $data;
 }
-add_filter( 'wp_insert_post_data', 'geodir_fix_pending_listing_post_name', 10, 2 );
\ No newline at end of file
+add_filter('wp_insert_post_data', 'geodir_fix_pending_listing_post_name', 10, 2);
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	?>
76	76
77	77	<li class="clearfix <?php if ($grid_view_class) {
78		- echo 'geodir-gridview ' . $grid_view_class;
	78	+ echo 'geodir-gridview '.$grid_view_class;
79	79	} else {
80	80	echo ' geodir-listview ';
81	81	} ?> <?php if ($post_view_class) {
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	echo geodir_show_badges_on_image('featured', $post, get_permalink());
117	117	}
118	118
119		- $geodir_days_new = (int)get_option('geodir_listing_new_days');
	119	+ $geodir_days_new = (int) get_option('geodir_listing_new_days');
120	120
121	121	if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {
122	122	echo geodir_show_badges_on_image('new', $post, get_permalink());
		@@ -173,8 +173,8 @@ discard block
		block discarded – undo
173	173	do_action('geodir_after_listing_post_title', 'listview', $post); ?>
174	174
175	175	<?php /// Print Distance
176		- if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) \|\| ( $related_nearest && $related_parent_lat ) ) {
177		- if ( $related_nearest && $related_parent_lat ) {
	176	+ if ((isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') \|\| ($related_nearest && $related_parent_lat)) {
	177	+ if ($related_nearest && $related_parent_lat) {
178	178	$startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);
179	179	} else {
180	180	$startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
		@@ -197,14 +197,14 @@ discard block
		block discarded – undo
197	197	} else {
198	198	$uom = __('meters', 'geodirectory');
199	199	}
200		- echo round($distance) . ' ' . $uom . '<br />';
	200	+ echo round($distance).' '.$uom.'<br />';
201	201	} else {
202	202	if ($uom == 'miles') {
203	203	$uom = __('miles', 'geodirectory');
204	204	} else {
205	205	$uom = __('km', 'geodirectory');
206	206	}
207		- echo round($distance, 2) . ' ' . $uom . '<br />';
	207	+ echo round($distance, 2).' '.$uom.'<br />';
208	208	}
209	209	?>
210	210	</h3>
		@@ -234,13 +234,13 @@ discard block
		block discarded – undo
234	234	*/
235	235	$show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'listview', $post);
236	236	if ($show_listing_excerpt) {
237		- if ( isset( $character_count ) && ( $character_count \|\| $character_count == '0' ) ) {
238		- $content_out = geodir_max_excerpt( $character_count );
	237	+ if (isset($character_count) && ($character_count \|\| $character_count == '0')) {
	238	+ $content_out = geodir_max_excerpt($character_count);
239	239	} else {
240	240	$content_out = get_the_excerpt();
241	241	}
242		- if ( ! empty( $content_out ) ) {
243		- echo "<p>" . $content_out . "</p>";
	242	+ if (!empty($content_out)) {
	243	+ echo "<p>".$content_out."</p>";
244	244	}
245	245	}
246	246	?></div>
		@@ -264,7 +264,7 @@ discard block
		block discarded – undo
264	264	* @param object $post The post object.
265	265	* @param string $view The view type, default 'listing'.
266	266	*/
267		- do_action( 'geodir_after_listing_content', $post, 'listing' ); ?>
	267	+ do_action('geodir_after_listing_content', $post, 'listing'); ?>
268	268	<footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'listing'); ?>">
269	269	<div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'listing'); ?>">
270	270
		@@ -276,7 +276,7 @@ discard block
		block discarded – undo
276	276	* @param object $post The post object.
277	277	* @param string $view The view type, default 'listing'.
278	278	*/
279		- do_action( 'geodir_before_review_html', $post, 'listing' );
	279	+ do_action('geodir_before_review_html', $post, 'listing');
280	280
281	281	$review_show = geodir_is_reviews_show('listview');
282	282
		@@ -319,7 +319,7 @@ discard block
		block discarded – undo
319	319	*
320	320	* @since 1.0.0
321	321	*/
322		- do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );
	322	+ do_action('geodir_after_favorite_html', $post->ID, 'listing');
323	323
324	324
325	325	/**
		@@ -330,7 +330,7 @@ discard block
		block discarded – undo
330	330	* @param int $post->ID The post id.
331	331	* @param object $post The post object.
332	332	*/
333		- do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);
	333	+ do_action('geodir_listing_after_pinpoint', $post->ID, $post);
334	334
335	335	if ($post->post_author == get_current_user_id()) { ?>
336	336	<?php
		@@ -359,7 +359,7 @@ discard block
		block discarded – undo
359	359	title="<?php _e('Edit Listing', 'geodirectory'); ?>">
360	360	<?php
361	361	$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');
362		- echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
	362	+ echo '<i class="'.$geodir_listing_edit_icon.'"></i>';
363	363	?>
364	364	<?php _e('Edit', 'geodirectory'); ?>
365	365	</a>
		@@ -367,7 +367,7 @@ discard block
		block discarded – undo
367	367	title="<?php _e('Delete Listing', 'geodirectory'); ?>">
368	368	<?php
369	369	$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');
370		- echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
	370	+ echo '<i class="'.$geodir_listing_delete_icon.'"></i>';
371	371	?>
372	372	<?php _e('Delete', 'geodirectory'); ?>
373	373	</a>

		@@ -20,72 +20,72 @@ discard block
		block discarded – undo
20	20	/** This action is documented in geodirectory-templates/listing-listview.php */
21	21	$grid_view_class = apply_filters('geodir_grid_view_widget_columns', $gridview_columns_widget);
22	22	if ($gd_session->get('gd_listing_view') && !isset($before_widget)) {
23		- $grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));
	23	+ $grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));
24	24	}
25	25	?>
26	26	<ul class="geodir_category_list_view clearfix <?php echo apply_filters('geodir_listing_listview_ul_extra_class', '', 'widget'); ?>">
27	27	<?php
28		- if (!empty($widget_listings)) {
29		- /** This action is documented in geodirectory-templates/listing-listview.php */
30		- do_action('geodir_before_listing_post_listview');
31		- $all_postypes = geodir_get_posttypes();
32		- $geodir_days_new = (int)get_option('geodir_listing_new_days');
33		- foreach ($widget_listings as $widget_listing) {
34		- global $gd_widget_listing_type;
35		- $post = $widget_listing;
	28	+ if (!empty($widget_listings)) {
	29	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	30	+ do_action('geodir_before_listing_post_listview');
	31	+ $all_postypes = geodir_get_posttypes();
	32	+ $geodir_days_new = (int)get_option('geodir_listing_new_days');
	33	+ foreach ($widget_listings as $widget_listing) {
	34	+ global $gd_widget_listing_type;
	35	+ $post = $widget_listing;
36	36
37		- $GLOBALS['post'] = $post;
38		- setup_postdata($post);
	37	+ $GLOBALS['post'] = $post;
	38	+ setup_postdata($post);
39	39
40		- $gd_widget_listing_type = $post->post_type;
	40	+ $gd_widget_listing_type = $post->post_type;
41	41
42		- /** This action is documented in geodirectory-templates/listing-listview.php */
43		- $post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);
	42	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	43	+ $post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);
44	44
45		- /** This action is documented in geodirectory-templates/listing-listview.php */
46		- $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
47		- ?>
	45	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	46	+ $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
	47	+ ?>
48	48	<li class="clearfix <?php if ($grid_view_class) {
49		- echo 'geodir-gridview ' . $grid_view_class;
50		- } else {
51		- echo ' geodir-listview ';
52		- } ?> <?php if ($post_view_class) {
53		- echo $post_view_class;
54		- } ?>" <?php if (isset($listing_width) && $listing_width) {
55		- echo "style='width:{$listing_width}%;'";
56		- }
	49	+ echo 'geodir-gridview ' . $grid_view_class;
	50	+ } else {
	51	+ echo ' geodir-listview ';
	52	+ } ?> <?php if ($post_view_class) {
	53	+ echo $post_view_class;
	54	+ } ?>" <?php if (isset($listing_width) && $listing_width) {
	55	+ echo "style='width:{$listing_width}%;'";
	56	+ }
57	57
58		- echo " data-post-id='$post->ID' ";
59		- /** This action is documented in geodirectory-templates/listing-listview.php */
60		- do_action('geodir_listview_inside_li', $post, 'widget');
61		- ?>>
	58	+ echo " data-post-id='$post->ID' ";
	59	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	60	+ do_action('geodir_listview_inside_li', $post, 'widget');
	61	+ ?>>
62	62	<article class="geodir-category-listing <?php if ($post_view_article_class) {
63		- echo $post_view_article_class;
64		- } ?>">
	63	+ echo $post_view_article_class;
	64	+ } ?>">
65	65	<div class="geodir-post-img <?php echo apply_filters('geodir_listing_listview_thumb_extra_class', '', 'widget'); ?>">
66	66	<?php if ($fimage = geodir_show_featured_image($post->ID, 'list-thumb', true, false, $post->featured_image)) { ?>
67	67	<a href="<?php the_permalink(); ?>"><?php echo $fimage; ?></a>
68	68	<?php
69		- /** This action is documented in geodirectory-templates/listing-listview.php */
70		- do_action('geodir_before_badge_on_image', $post);
71		- if ($post->is_featured) {
72		- echo geodir_show_badges_on_image('featured', $post, get_permalink());
73		- }
	69	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	70	+ do_action('geodir_before_badge_on_image', $post);
	71	+ if ($post->is_featured) {
	72	+ echo geodir_show_badges_on_image('featured', $post, get_permalink());
	73	+ }
74	74
75	75
76		- if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {
77		- echo geodir_show_badges_on_image('new', $post, get_permalink());
78		- }
	76	+ if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {
	77	+ echo geodir_show_badges_on_image('new', $post, get_permalink());
	78	+ }
79	79
80		- /** This action is documented in geodirectory-templates/listing-listview.php */
81		- do_action('geodir_after_badge_on_image', $post);
82		- }
83		- ?>
	80	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	81	+ do_action('geodir_after_badge_on_image', $post);
	82	+ }
	83	+ ?>
84	84	</div>
85	85	<div class="geodir-content <?php echo apply_filters('geodir_listing_listview_content_extra_class', '', 'widget'); ?>">
86	86	<?php
87		- /** This action is documented in geodirectory-templates/listing-listview.php */
88		- do_action('geodir_before_listing_post_title', 'listview', $post); ?>
	87	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	88	+ do_action('geodir_before_listing_post_title', 'listview', $post); ?>
89	89	<header class="geodir-entry-header">
90	90	<?php $title_tag = !empty($title_tag) ? $title_tag : 'h3'; ?>
91	91	<<?php echo esc_attr($title_tag); ?> class="geodir-entry-title">
		@@ -95,162 +95,162 @@ discard block
		block discarded – undo
95	95	</header>
96	96	<!-- .entry-header -->
97	97	<?php
98		- /** This action is documented in geodirectory-templates/listing-listview.php */
99		- do_action('geodir_after_listing_post_title', 'listview', $post); ?>
	98	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	99	+ do_action('geodir_after_listing_post_title', 'listview', $post); ?>
100	100	<?php /// Print Distance
101		- if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) \|\| ( $related_nearest && $related_parent_lat ) ) {
102		- if ( $related_nearest && $related_parent_lat ) {
103		- $startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);
104		- } else {
105		- $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
106		- }
	101	+ if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) \|\| ( $related_nearest && $related_parent_lat ) ) {
	102	+ if ( $related_nearest && $related_parent_lat ) {
	103	+ $startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);
	104	+ } else {
	105	+ $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
	106	+ }
107	107
108		- $endLat = $post->post_latitude;
109		- $endLon = $post->post_longitude;
110		- $endPoint = array('latitude' => $endLat, 'longitude' => $endLon);
111		- $uom = get_option('geodir_search_dist_1');
112		- $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
113		- ?>
	108	+ $endLat = $post->post_latitude;
	109	+ $endLon = $post->post_longitude;
	110	+ $endPoint = array('latitude' => $endLat, 'longitude' => $endLon);
	111	+ $uom = get_option('geodir_search_dist_1');
	112	+ $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
	113	+ ?>
114	114	<h3>
115	115	<?php
116		- if (round($distance, 2) == 0) {
117		- $uom = get_option('geodir_search_dist_2');
118		- $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
119		- if ($uom == 'feet') {
120		- $uom = __('feet', 'geodirectory');
121		- } else {
122		- $uom = __('meters', 'geodirectory');
123		- }
124		- echo round($distance) . ' ' . __($uom, 'geodirectory') . '
	116	+ if (round($distance, 2) == 0) {
	117	+ $uom = get_option('geodir_search_dist_2');
	118	+ $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);
	119	+ if ($uom == 'feet') {
	120	+ $uom = __('feet', 'geodirectory');
	121	+ } else {
	122	+ $uom = __('meters', 'geodirectory');
	123	+ }
	124	+ echo round($distance) . ' ' . __($uom, 'geodirectory') . '
125	125	<br />
126	126	';
127		- } else {
128		- if ($uom == 'miles') {
129		- $uom = __('miles', 'geodirectory');
130		- } else {
131		- $uom = __('km', 'geodirectory');
132		- }
133		- echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
	127	+ } else {
	128	+ if ($uom == 'miles') {
	129	+ $uom = __('miles', 'geodirectory');
	130	+ } else {
	131	+ $uom = __('km', 'geodirectory');
	132	+ }
	133	+ echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
134	134	<br />
135	135	';
136		- }
137		- ?>
	136	+ }
	137	+ ?>
138	138	</h3>
139	139	<?php } ?>
140	140	<?php
141		- /** This action is documented in geodirectory-templates/listing-listview.php */
142		- do_action('geodir_before_listing_post_excerpt', $post); ?>
	141	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	142	+ do_action('geodir_before_listing_post_excerpt', $post); ?>
143	143	<?php echo geodir_show_listing_info('listing'); ?>
144	144	<?php if (isset($character_count) && $character_count == '0') {
145		- } else { ?>
	145	+ } else { ?>
146	146	<div class="geodir-entry-content">
147	147	<?php
148		- /**
149		- * Filter to hide the listing excerpt
150		- *
151		- * @since 1.5.3
152		- * @param bool $display Display the excerpt or not. Default true.
153		- * @param object $post The post object.
154		- */
155		- $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);
156		- if ($show_listing_excerpt) {
157		- if ( isset( $character_count ) && ( $character_count \|\| $character_count == '0' ) ) {
158		- $content_out = geodir_max_excerpt( $character_count );
159		- } else {
160		- $content_out = get_the_excerpt();
161		- }
162		- if ( ! empty( $content_out ) ) {
163		- echo "<p>" . $content_out . "</p>";
164		- }
165		- }
166		- ?>
	148	+ /**
	149	+ * Filter to hide the listing excerpt
	150	+ *
	151	+ * @since 1.5.3
	152	+ * @param bool $display Display the excerpt or not. Default true.
	153	+ * @param object $post The post object.
	154	+ */
	155	+ $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);
	156	+ if ($show_listing_excerpt) {
	157	+ if ( isset( $character_count ) && ( $character_count \|\| $character_count == '0' ) ) {
	158	+ $content_out = geodir_max_excerpt( $character_count );
	159	+ } else {
	160	+ $content_out = get_the_excerpt();
	161	+ }
	162	+ if ( ! empty( $content_out ) ) {
	163	+ echo "<p>" . $content_out . "</p>";
	164	+ }
	165	+ }
	166	+ ?>
167	167	</div>
168	168	<?php } ?>
169	169	<?php
170		- /** This action is documented in geodirectory-templates/listing-listview.php */
171		- do_action('geodir_after_listing_post_excerpt', $post); ?>
	170	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	171	+ do_action('geodir_after_listing_post_excerpt', $post); ?>
172	172	</div>
173	173	<!-- gd-content ends here-->
174	174	<?php
175		- /**
176		- * Called after printing listing content.
177		- *
178		- * @since 1.5.3
179		- * @param object $post The post object.
180		- * @param string $view The view type, default 'widget'.
181		- */
182		- do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
	175	+ /**
	176	+ * Called after printing listing content.
	177	+ *
	178	+ * @since 1.5.3
	179	+ * @param object $post The post object.
	180	+ * @param string $view The view type, default 'widget'.
	181	+ */
	182	+ do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
183	183	<footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">
184	184	<div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">
185	185	<?php
186		- /**
187		- * Called before printing review stars html.
188		- *
189		- * @since 1.5.3
190		- * @param object $post The post object.
191		- * @param string $view The view type, default 'widget'.
192		- */
193		- do_action( 'geodir_before_review_html', $post, 'widget' );
194		- $review_show = geodir_is_reviews_show('listview');
195		- if ($review_show) {
	186	+ /**
	187	+ * Called before printing review stars html.
	188	+ *
	189	+ * @since 1.5.3
	190	+ * @param object $post The post object.
	191	+ * @param string $view The view type, default 'widget'.
	192	+ */
	193	+ do_action( 'geodir_before_review_html', $post, 'widget' );
	194	+ $review_show = geodir_is_reviews_show('listview');
	195	+ if ($review_show) {
196	196
197		- $post_avgratings = geodir_get_post_rating($post->ID);
	197	+ $post_avgratings = geodir_get_post_rating($post->ID);
198	198
199		- /** This action is documented in geodirectory-templates/listing-listview.php */
200		- do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);
	199	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	200	+ do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);
201	201
202		- echo geodir_get_rating_stars($post_avgratings, $post->ID);
	202	+ echo geodir_get_rating_stars($post_avgratings, $post->ID);
203	203
204		- /** This action is documented in geodirectory-templates/listing-listview.php */
205		- do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);
206		- ?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i
	204	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	205	+ do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);
	206	+ ?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i
207	207	class="fas fa-comments"></i> <?php geodir_comments_number($post->rating_count); ?>
208	208	</a>
209	209	<?php
210		- }
	210	+ }
211	211
212	212
213		- /**
214		- * Called after printing favorite html.
215		- *
216		- * @since 1.0.0
217		- */
218		- do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );
	213	+ /**
	214	+ * Called after printing favorite html.
	215	+ *
	216	+ * @since 1.0.0
	217	+ */
	218	+ do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );
219	219
220		- if ($post->post_author == get_current_user_id()) {
221		- $addplacelink = get_permalink(geodir_add_listing_page_id());
222		- $editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);
223		- $upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);
	220	+ if ($post->post_author == get_current_user_id()) {
	221	+ $addplacelink = get_permalink(geodir_add_listing_page_id());
	222	+ $editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);
	223	+ $upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);
224	224
225		- $ajaxlink = geodir_get_ajax_url();
226		- $deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);
227		- ?>
	225	+ $ajaxlink = geodir_get_ajax_url();
	226	+ $deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);
	227	+ ?>
228	228	<span class="geodir-authorlink clearfix">
229	229	<?php
230		- if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {
231		- /** This action is documented in geodirectory-templates/listing-listview.php */
232		- do_action('geodir_before_edit_post_link_on_listing');
233		- ?>
	230	+ if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {
	231	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	232	+ do_action('geodir_before_edit_post_link_on_listing');
	233	+ ?>
234	234	<a href="<?php echo esc_url($editlink); ?>" class="geodir-edit"
235	235	title="<?php _e('Edit Listing', 'geodirectory'); ?>">
236	236	<?php
237		- $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');
238		- echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
239		- ?>
	237	+ $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');
	238	+ echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
	239	+ ?>
240	240	<?php _e('Edit', 'geodirectory'); ?>
241	241	</a>
242	242	<a href="<?php echo esc_url($deletelink); ?>" class="geodir-delete"
243	243	title="<?php _e('Delete Listing', 'geodirectory'); ?>">
244	244	<?php
245		- $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');
246		- echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
247		- ?>
	245	+ $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');
	246	+ echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
	247	+ ?>
248	248	<?php _e('Delete', 'geodirectory'); ?>
249	249	</a>
250	250	<?php
251		- /** This action is documented in geodirectory-templates/listing-listview.php */
252		- do_action('geodir_after_edit_post_link_on_listing');
253		- } ?>
	251	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	252	+ do_action('geodir_after_edit_post_link_on_listing');
	253	+ } ?>
254	254	</span>
255	255	<?php } ?>
256	256	</div>
		@@ -260,17 +260,17 @@ discard block
		block discarded – undo
260	260	</article>
261	261	</li>
262	262	<?php
263		- unset($gd_widget_listing_type);
264		- }
265		- /** This action is documented in geodirectory-templates/listing-listview.php */
266		- do_action('geodir_after_listing_post_listview');
267		- } else {
	263	+ unset($gd_widget_listing_type);
	264	+ }
	265	+ /** This action is documented in geodirectory-templates/listing-listview.php */
	266	+ do_action('geodir_after_listing_post_listview');
	267	+ } else {
268	268	$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;
269	269
270	270	/** This action is documented in geodirectory-templates/listing-listview.php */
271		- do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);
272		- }
273		- ?>
	271	+ do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);
	272	+ }
	273	+ ?>
274	274	</ul> <!-- geodir_category_list_view ends here-->
275	275	<div class="clear"></div>
276	276	<?php

		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29	/** This action is documented in geodirectory-templates/listing-listview.php */
30	30	do_action('geodir_before_listing_post_listview');
31	31	$all_postypes = geodir_get_posttypes();
32		- $geodir_days_new = (int)get_option('geodir_listing_new_days');
	32	+ $geodir_days_new = (int) get_option('geodir_listing_new_days');
33	33	foreach ($widget_listings as $widget_listing) {
34	34	global $gd_widget_listing_type;
35	35	$post = $widget_listing;
		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	$post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');
47	47	?>
48	48	<li class="clearfix <?php if ($grid_view_class) {
49		- echo 'geodir-gridview ' . $grid_view_class;
	49	+ echo 'geodir-gridview '.$grid_view_class;
50	50	} else {
51	51	echo ' geodir-listview ';
52	52	} ?> <?php if ($post_view_class) {
		@@ -98,8 +98,8 @@ discard block
		block discarded – undo
98	98	/** This action is documented in geodirectory-templates/listing-listview.php */
99	99	do_action('geodir_after_listing_post_title', 'listview', $post); ?>
100	100	<?php /// Print Distance
101		- if ( ( isset( $_REQUEST['sgeo_lat'] ) && $_REQUEST['sgeo_lat'] != '' ) \|\| ( $related_nearest && $related_parent_lat ) ) {
102		- if ( $related_nearest && $related_parent_lat ) {
	101	+ if ((isset($_REQUEST['sgeo_lat']) && $_REQUEST['sgeo_lat'] != '') \|\| ($related_nearest && $related_parent_lat)) {
	102	+ if ($related_nearest && $related_parent_lat) {
103	103	$startPoint = array('latitude' => $related_parent_lat, 'longitude' => $related_parent_lon);
104	104	} else {
105	105	$startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);
		@@ -121,7 +121,7 @@ discard block
		block discarded – undo
121	121	} else {
122	122	$uom = __('meters', 'geodirectory');
123	123	}
124		- echo round($distance) . ' ' . __($uom, 'geodirectory') . '
	124	+ echo round($distance).' '.__($uom, 'geodirectory').'
125	125	<br />
126	126	';
127	127	} else {
		@@ -130,7 +130,7 @@ discard block
		block discarded – undo
130	130	} else {
131	131	$uom = __('km', 'geodirectory');
132	132	}
133		- echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '
	133	+ echo round($distance, 2).' '.__($uom, 'geodirectory').'
134	134	<br />
135	135	';
136	136	}
		@@ -154,13 +154,13 @@ discard block
		block discarded – undo
154	154	*/
155	155	$show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);
156	156	if ($show_listing_excerpt) {
157		- if ( isset( $character_count ) && ( $character_count \|\| $character_count == '0' ) ) {
158		- $content_out = geodir_max_excerpt( $character_count );
	157	+ if (isset($character_count) && ($character_count \|\| $character_count == '0')) {
	158	+ $content_out = geodir_max_excerpt($character_count);
159	159	} else {
160	160	$content_out = get_the_excerpt();
161	161	}
162		- if ( ! empty( $content_out ) ) {
163		- echo "<p>" . $content_out . "</p>";
	162	+ if (!empty($content_out)) {
	163	+ echo "<p>".$content_out."</p>";
164	164	}
165	165	}
166	166	?>
		@@ -179,7 +179,7 @@ discard block
		block discarded – undo
179	179	* @param object $post The post object.
180	180	* @param string $view The view type, default 'widget'.
181	181	*/
182		- do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>
	182	+ do_action('geodir_after_listing_content', $post, 'widget'); ?>
183	183	<footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">
184	184	<div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">
185	185	<?php
		@@ -190,7 +190,7 @@ discard block
		block discarded – undo
190	190	* @param object $post The post object.
191	191	* @param string $view The view type, default 'widget'.
192	192	*/
193		- do_action( 'geodir_before_review_html', $post, 'widget' );
	193	+ do_action('geodir_before_review_html', $post, 'widget');
194	194	$review_show = geodir_is_reviews_show('listview');
195	195	if ($review_show) {
196	196
		@@ -215,7 +215,7 @@ discard block
		block discarded – undo
215	215	*
216	216	* @since 1.0.0
217	217	*/
218		- do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );
	218	+ do_action('geodir_after_favorite_html', $post->ID, 'widget');
219	219
220	220	if ($post->post_author == get_current_user_id()) {
221	221	$addplacelink = get_permalink(geodir_add_listing_page_id());
		@@ -235,7 +235,7 @@ discard block
		block discarded – undo
235	235	title="<?php _e('Edit Listing', 'geodirectory'); ?>">
236	236	<?php
237	237	$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fas fa-edit');
238		- echo '<i class="'. $geodir_listing_edit_icon .'"></i>';
	238	+ echo '<i class="'.$geodir_listing_edit_icon.'"></i>';
239	239	?>
240	240	<?php _e('Edit', 'geodirectory'); ?>
241	241	</a>
		@@ -243,7 +243,7 @@ discard block
		block discarded – undo
243	243	title="<?php _e('Delete Listing', 'geodirectory'); ?>">
244	244	<?php
245	245	$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fas fa-times');
246		- echo '<i class="'. $geodir_listing_delete_icon .'"></i>';
	246	+ echo '<i class="'.$geodir_listing_delete_icon.'"></i>';
247	247	?>
248	248	<?php _e('Delete', 'geodirectory'); ?>
249	249	</a>

		@@ -15,7 +15,7 @@ discard block
		block discarded – undo
15	15	* @package GeoDirectory
16	16	* @see `geodir_custom_field_save` for array details.
17	17	*/
18		-function geodir_custom_fields_predefined($post_type=''){
	18	+function geodir_custom_fields_predefined($post_type = '') {
19	19
20	20	$custom_fields = array();
21	21
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	'default_value' => '',
76	76	'show_in' => '[detail],[listing]',
77	77	'is_required' => true,
78		- 'option_values' => __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
	78	+ 'option_values' => __('Select Status/,For Sale,For Rent,Sold,Let', 'geodirectory'),
79	79	'validation_pattern' => '',
80	80	'validation_msg' => '',
81	81	'required_msg' => '',
		@@ -104,7 +104,7 @@ discard block
		block discarded – undo
104	104	'default_value' => '',
105	105	'show_in' => '[detail],[listing]',
106	106	'is_required' => true,
107		- 'option_values' => __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
	107	+ 'option_values' => __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional', 'geodirectory'),
108	108	'validation_pattern' => '',
109	109	'validation_msg' => '',
110	110	'required_msg' => '',
		@@ -133,7 +133,7 @@ discard block
		block discarded – undo
133	133	'default_value' => '',
134	134	'show_in' => '[detail],[listing]',
135	135	'is_required' => true,
136		- 'option_values' => __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
	136	+ 'option_values' => __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage', 'geodirectory'),
137	137	'validation_pattern' => '',
138	138	'validation_msg' => '',
139	139	'required_msg' => '',
		@@ -162,7 +162,7 @@ discard block
		block discarded – undo
162	162	'default_value' => '',
163	163	'show_in' => '[detail],[listing]',
164	164	'is_required' => true,
165		- 'option_values' => __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
	165	+ 'option_values' => __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
166	166	'validation_pattern' => '',
167	167	'validation_msg' => '',
168	168	'required_msg' => '',
		@@ -191,7 +191,7 @@ discard block
		block discarded – undo
191	191	'default_value' => '',
192	192	'show_in' => '[detail],[listing]',
193	193	'is_required' => true,
194		- 'option_values' => __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
	194	+ 'option_values' => __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
195	195	'validation_pattern' => '',
196	196	'validation_msg' => '',
197	197	'required_msg' => '',
		@@ -248,7 +248,7 @@ discard block
		block discarded – undo
248	248	'default_value' => '',
249	249	'show_in' => '[detail],[listing]',
250	250	'is_required' => true,
251		- 'option_values' => __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
	251	+ 'option_values' => __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace', 'geodirectory'),
252	252	'validation_pattern' => '',
253	253	'validation_msg' => '',
254	254	'required_msg' => '',
		@@ -328,15 +328,15 @@ discard block
		block discarded – undo
328	328	'defaults' => array(
329	329	'data_type' => 'VARCHAR',
330	330	'admin_title' => __('Job Type', 'geodirectory'),
331		- 'site_title' => __('Job Type','geodirectory'),
332		- 'admin_desc' => __('Select the type of job.','geodirectory'),
	331	+ 'site_title' => __('Job Type', 'geodirectory'),
	332	+ 'admin_desc' => __('Select the type of job.', 'geodirectory'),
333	333	'htmlvar_name' => 'job_type',
334	334	'is_active' => true,
335	335	'for_admin_use' => false,
336	336	'default_value' => '',
337	337	'show_in' => '[detail],[listing]',
338	338	'is_required' => true,
339		- 'option_values' => __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
	339	+ 'option_values' => __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other', 'geodirectory'),
340	340	'validation_pattern' => '',
341	341	'validation_msg' => '',
342	342	'required_msg' => '',
		@@ -356,16 +356,16 @@ discard block
		block discarded – undo
356	356	'description' => __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
357	357	'defaults' => array(
358	358	'data_type' => 'VARCHAR',
359		- 'admin_title' => __('Job Sector','geodirectory'),
360		- 'site_title' => __('Job Sector','geodirectory'),
361		- 'admin_desc' => __('Select the job sector.','geodirectory'),
	359	+ 'admin_title' => __('Job Sector', 'geodirectory'),
	360	+ 'site_title' => __('Job Sector', 'geodirectory'),
	361	+ 'admin_desc' => __('Select the job sector.', 'geodirectory'),
362	362	'htmlvar_name' => 'job_sector',
363	363	'is_active' => true,
364	364	'for_admin_use' => false,
365	365	'default_value' => '',
366	366	'show_in' => '[detail]',
367	367	'is_required' => true,
368		- 'option_values' => __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
	368	+ 'option_values' => __('Select Sector/,Private Sector,Public Sector,Agencies', 'geodirectory'),
369	369	'validation_pattern' => '',
370	370	'validation_msg' => '',
371	371	'required_msg' => '',
		@@ -380,7 +380,7 @@ discard block
		block discarded – undo
380	380	/**
381	381	* @see `geodir_custom_fields`
382	382	*/
383		- return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
	383	+ return apply_filters('geodir_custom_fields_predefined', $custom_fields, $post_type);
384	384	}
385	385
386	386
		@@ -394,11 +394,11 @@ discard block
		block discarded – undo
394	394	* @since 1.6.9
395	395	* @return string The html to output.
396	396	*/
397		-function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
	397	+function geodir_predefined_custom_field_output_twitter_feed($html, $location, $cf) {
398	398	global $post;
399	399
400	400
401		- if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
	401	+ if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
402	402
403	403	$class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
404	404
		@@ -413,7 +413,7 @@ discard block
		block discarded – undo
413	413	}
414	414
415	415
416		- $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
	416	+ $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
417	417
418	418	$html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
419	419	$html .= '</div>';
		@@ -422,7 +422,7 @@ discard block
		block discarded – undo
422	422
423	423	return $html;
424	424	}
425		-add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
	425	+add_filter('geodir_custom_field_output_text_key_twitter_feed', 'geodir_predefined_custom_field_output_twitter_feed', 10, 3);
426	426
427	427	/**
428	428	* Filter the get_directions custom field output to show a link.
		@@ -434,38 +434,38 @@ discard block
		block discarded – undo
434	434	* @since 1.6.9
435	435	* @return string The html to output.
436	436	*/
437		-function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
	437	+function geodir_predefined_custom_field_output_get_directions($html, $location, $cf) {
438	438	global $post;
439	439
440	440
441		- if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
	441	+ if (isset($post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset($post->post_latitude) && $post->post_latitude) {
442	442
443		- $field_icon = geodir_field_icon_proccess( $cf );
444		- if ( strpos( $field_icon, 'http' ) !== false ) {
	443	+ $field_icon = geodir_field_icon_proccess($cf);
	444	+ if (strpos($field_icon, 'http') !== false) {
445	445	$field_icon_af = '';
446		- } elseif ( $field_icon == '' ) {
	446	+ } elseif ($field_icon == '') {
447	447	$field_icon_af = '<i class="fas fa-location-arrow"></i>';
448	448	} else {
449	449	$field_icon_af = $field_icon;
450	450	$field_icon = '';
451	451	}
452	452
453		- $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
	453	+ $link_text = isset($post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __('Get Directions', 'geodirectory');
454	454
455		- $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
	455	+ $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
456	456
457		- if(isset( $cf['field_icon'] ) && $cf['field_icon']){
	457	+ if (isset($cf['field_icon']) && $cf['field_icon']) {
458	458	$html .= $field_icon_af;
459	459	}
460	460
461	461	// We use maps.apple.com here because it will handle redirects nicely in most cases
462		- $html .= '<a href="https://maps.apple.com/?daddr=' . $post->post_latitude . ',' . $post->post_longitude . '" target="_blank" >' . $link_text . '</a>';
	462	+ $html .= '<a href="https://maps.apple.com/?daddr='.$post->post_latitude.','.$post->post_longitude.'" target="_blank" >'.$link_text.'</a>';
463	463	$html .= '</div>';
464	464
465		- }else{
466		- $html ='';
	465	+ } else {
	466	+ $html = '';
467	467	}
468	468
469	469	return $html;
470	470	}
471		-add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);
	471	+add_filter('geodir_custom_field_output_text_key_get_directions', 'geodir_predefined_custom_field_output_get_directions', 10, 3);

		@@ -54,12 +54,12 @@ discard block
		block discarded – undo
54	54
55	55	if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() \|\| $add_post_in_marker_array)) {
56	56
57		- if(isset($map_jason[$post->ID])){return null;}
	57	+ if (isset($map_jason[$post->ID])) {return null; }
58	58
59	59	$srcharr = array("'", "/", "-", '"', '\\');
60	60	$replarr = array("′", "&frasl;", "–", "“", '');
61	61
62		- $default_category = isset($post->default_category) ? $post->default_category : geodir_get_post_meta($post->ID,'default_category');
	62	+ $default_category = isset($post->default_category) ? $post->default_category : geodir_get_post_meta($post->ID, 'default_category');
63	63
64	64	$geodir_cat_icons = geodir_get_term_icon();
65	65	$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_category]) ? $geodir_cat_icons[$default_category] : '';
		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	$title = str_replace($srcharr, $replarr, $post_title);
69	69
70	70	if (is_ssl()) {
71		- $icon = str_replace("http:","https:",$icon );
	71	+ $icon = str_replace("http:", "https:", $icon);
72	72	}
73	73
74	74	if ($icon != '') {
		@@ -84,18 +84,18 @@ discard block
		block discarded – undo
84	84	$icon_size = array('w' => 36, 'h' => 45);
85	85	}
86	86
87		- $post_latitude = isset($post->post_latitude) ? $post->post_latitude : geodir_get_post_meta($post->ID,'post_latitude');
88		- $post_longitude = isset($post->post_longitude) ? $post->post_longitude : geodir_get_post_meta($post->ID,'post_longitude');
	87	+ $post_latitude = isset($post->post_latitude) ? $post->post_latitude : geodir_get_post_meta($post->ID, 'post_latitude');
	88	+ $post_longitude = isset($post->post_longitude) ? $post->post_longitude : geodir_get_post_meta($post->ID, 'post_longitude');
89	89
90	90
91		- $post_json = '{"id":"' . $post->ID
92		- . '","t": "' . $title
93		- . '","lt": "' . $post_latitude
94		- . '","ln": "' . $post_longitude
95		- . '","mk_id":"' . $post->ID . '_' . $default_category
96		- . '","i":"' . $icon
97		- . '","w":"' . $icon_size['w']
98		- . '","h":"' . $icon_size['h'] . '"}';
	91	+ $post_json = '{"id":"'.$post->ID
	92	+ . '","t": "'.$title
	93	+ . '","lt": "'.$post_latitude
	94	+ . '","ln": "'.$post_longitude
	95	+ . '","mk_id":"'.$post->ID.'_'.$default_category
	96	+ . '","i":"'.$icon
	97	+ . '","w":"'.$icon_size['w']
	98	+ . '","h":"'.$icon_size['h'].'"}';
99	99
100	100	/**
101	101	* Filter the json data when creating output for post json marker..
		@@ -104,10 +104,10 @@ discard block
		block discarded – undo
104	104	* @param string $post_json JSON representation of the post marker info.
105	105	* @param object $post The post object.
106	106	*/
107		- $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
	107	+ $post_map_json = apply_filters('geodir_create_marker_jason_of_posts', $post_json, $post);
108	108
109	109	// only assign it if it has a value
110		- if($post_map_json){
	110	+ if ($post_map_json) {
111	111	$map_jason[$post->ID] = $post_map_json;
112	112	}
113	113
		@@ -131,13 +131,13 @@ discard block
		block discarded – undo
131	131	if (is_array($map_jason) && !empty($map_jason)) {
132	132
133	133	// on details page only show the main marker on the map
134		- if(geodir_is_page('detail')){
	134	+ if (geodir_is_page('detail')) {
135	135	global $post;
136		- if(isset($map_jason[$post->ID])){
	136	+ if (isset($map_jason[$post->ID])) {
137	137	$map_jason = array($map_jason[$post->ID]);
138	138	}
139	139	}
140		- $canvas_jason = $canvas . "_jason";
	140	+ $canvas_jason = $canvas."_jason";
141	141	$map_canvas_arr[$canvas] = array_unique($map_jason);
142	142	unset($cat_content_info);
143	143	$cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
		@@ -146,11 +146,11 @@ discard block
		block discarded – undo
146	146	$json_content = substr(implode(',', $cat_content_info), 1);
147	147	$json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
148	148	$json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08
149		- $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
	149	+ $canvas_jason = '[{"totalcount":"'.$totalcount.'",'.$json_content.']';
150	150	} else {
151	151	$canvas_jason = '[{"totalcount":"0"}]';
152	152	}
153		- $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
	153	+ $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason);
154	154
155	155	/**
156	156	* Filter the send_marker_jason_to_js() function map canvas json args.
		@@ -162,12 +162,12 @@ discard block
		block discarded – undo
162	162	* @param string $canvas Map canvas array key.
163	163	* @param array $map_canvas_jason_args Map canvas args.
164	164	*/
165		- $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
	165	+ $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
166	166
167		- wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
	167	+ wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
168	168	} else {
169	169	$canvas_jason = '[{"totalcount":"0"}]';
170		- $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);
	170	+ $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason);
171	171
172	172	/**
173	173	* Filter the send_marker_jason_to_js() function map canvas json args.
		@@ -179,8 +179,8 @@ discard block
		block discarded – undo
179	179	* @param string $canvas Map canvas array key.
180	180	* @param array $map_canvas_jason_args Map canvas args.
181	181	*/
182		- $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
183		- wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
	182	+ $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
	183	+ wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
184	184	}
185	185	}
186	186
		@@ -245,11 +245,11 @@ discard block
		block discarded – undo
245	245	$display = !$child_collapse ? '' : 'display:none';
246	246	}
247	247
248		- $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">';
	248	+ $out = '<ul class="treeview '.$list_class.'" style="margin-left:'.$p.'px;'.$display.';">';
249	249
250	250	$geodir_cat_icons = geodir_get_term_icon();
251	251
252		- $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
	252	+ $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
253	253	if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
254	254	$geodir_default_map_search_pt = $homemap_catlist_ptype;
255	255	}
		@@ -264,23 +264,23 @@ discard block
		block discarded – undo
264	264
265	265	// Untick the category by default on home map
266	266	if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
267		- if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML
	267	+ if (geodir_wpml_is_taxonomy_translated($post_type.'category')) { // if WPML
268	268	global $sitepress;
269	269	$default_lang = $sitepress->get_default_language();
270	270	$term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang);
271		- }else{
	271	+ } else {
272	272	$term_id = $cat_term->term_id;
273	273	}
274		- if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
	274	+ if (!empty($geodir_home_map_untick) && in_array($post_type.'_'.$term_id, $geodir_home_map_untick)) {
275	275	$checked = '';
276	276	}
277	277	}
278	278
279		- $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';
280		- $term_check .= ' name="' . $map_canvas_name . '_cat[]" ';
281		- $term_check .= ' title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';
282		- $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>';
283		- $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fas fa-long-arrow-alt-down"></i>';
	279	+ $term_check = '<input type="checkbox" '.$checked.' id="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'" class="group_selector '.$main_list_class.'"';
	280	+ $term_check .= ' name="'.$map_canvas_name.'_cat[]" ';
	281	+ $term_check .= ' title="'.esc_attr(geodir_utf8_ucfirst($cat_term->name)).'" value="'.$cat_term->term_id.'" onclick="javascript:build_map_ajax_search_param(\''.$map_canvas_name.'\',false, this)">';
	282	+ $term_img = '<img height="15" width="15" alt="'.$cat_term->taxonomy.'" src="'.$icon.'" title="'.geodir_utf8_ucfirst($cat_term->name).'"/>';
	283	+ $out .= '<li>'.$term_check.'<label for="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'">'.$term_img.geodir_utf8_ucfirst($cat_term->name).'</label><i class="fas fa-long-arrow-alt-down"></i>';
284	284
285	285	endif;
286	286
		@@ -392,19 +392,19 @@ discard block
		block discarded – undo
392	392	* @package GeoDirectory
393	393	*/
394	394	function geodir_map_load_script() {
395		- if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'google-maps-api', 'done')) {
	395	+ if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is('google-maps-api', 'done')) {
396	396	$plugin_url = geodir_plugin_url();
397	397	?>
398	398	<script type="text/javascript">
399	399	if (!(window.google && typeof google.maps !== 'undefined')) {
400		- var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
	400	+ var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
401	401	document.getElementsByTagName("head")[0].appendChild(css);
402		- var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
	402	+ var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
403	403	document.getElementsByTagName("head")[0].appendChild(css);
404		- document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
405		- document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/osm.geocode.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
406		- document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
407		- document.write('<' + 'script id="geodirectory-o-overlappingmarker-script" src="<?php echo $plugin_url;?>/geodirectory-assets/jawj/oms-leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
	404	+ document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
	405	+ document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/osm.geocode.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
	406	+ document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
	407	+ document.write('<' + 'script id="geodirectory-o-overlappingmarker-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/jawj/oms-leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
408	408	}
409	409	</script>
410	410	<?php

		@@ -67,80 +67,80 @@ discard block
		block discarded – undo
67	67	*/
68	68	function geodir_draw_map($map_args = array())
69	69	{
70		- global $map_canvas_arr;
71		- $map_canvas_name = (!empty($map_args) && $map_args['map_canvas_name'] != '') ? $map_args['map_canvas_name'] : 'home_map_canvas';
72		- $map_class_name = (!empty($map_args) && isset($map_args['map_class_name'])) ? $map_args['map_class_name'] : '';
73		-
74		- $default_location = geodir_get_default_location();
75		-
76		- $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
77		- $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
78		- $map_default_zoom = 12;
79		- // map options default values
80		- $width = 950;
81		- $height = 450;
82		- $child_collapse = '0';
83		- $sticky = '';
84		- $enable_cat_filters = false;
85		- $enable_text_search = false;
86		- $enable_post_type_filters = false;
87		- $enable_location_filters = false;
88		- $enable_jason_on_load = false;
89		- $enable_map_direction = false;
90		- $enable_marker_cluster = false;
91		- $enable_map_resize_button = false;
92		- $maptype = 'ROADMAP';
93		-
94		- $geodir_map_options = array(
95		- 'width' => $width,
96		- 'height' => $height,
97		- 'child_collapse' => $child_collapse,
98		- 'sticky' => $sticky,
99		- 'enable_map_resize_button' => $enable_map_resize_button,
100		- 'enable_cat_filters' => $enable_cat_filters,
101		- 'enable_text_search' => $enable_text_search,
102		- 'enable_post_type_filters' => $enable_post_type_filters,
103		- 'enable_location_filters' => $enable_location_filters,
104		- 'enable_jason_on_load' => $enable_jason_on_load,
105		- 'enable_map_direction' => $enable_map_direction,
106		- 'enable_marker_cluster' => $enable_marker_cluster,
107		- 'ajax_url' => geodir_get_ajax_url(),
108		- 'map_canvas_name' => $map_canvas_name,
109		- 'inputText' => __('Title or Keyword', 'geodirectory'),
110		- 'latitude' => $map_default_lat,
111		- 'longitude' => $map_default_lng,
112		- 'zoom' => $map_default_zoom,
113		- 'scrollwheel' => true,
114		- 'streetViewControl' => true,
115		- 'fullscreenControl' => false,
116		- 'maptype' => $maptype,
117		- 'showPreview' => '0',
118		- 'maxZoom' => 21,
119		- 'autozoom' => true,
120		- 'bubble_size' => 'small',
121		- 'token' => '68f48005e256696074e1da9bf9f67f06',
122		- 'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')
123		- );
124		-
125		-
126		-
127		- if (!empty($map_args)) {
128		- foreach ($map_args as $map_option_key => $map_option_value) {
129		- $geodir_map_options[$map_option_key] = $map_option_value;
130		- }
131		- }
132		-
133		- if (strpos($geodir_map_options['height'], '%') !== false \|\| strpos($geodir_map_options['height'], 'px') !== false \|\| strpos($geodir_map_options['height'], 'vh') !== false) {
134		- } else {
135		- $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';
136		- }
137		-
138		- if (strpos($geodir_map_options['width'], '%') !== false \|\| strpos($geodir_map_options['width'], 'px') !== false) {
139		- } else {
140		- $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';
141		- }
142		-
143		- /**
	70	+ global $map_canvas_arr;
	71	+ $map_canvas_name = (!empty($map_args) && $map_args['map_canvas_name'] != '') ? $map_args['map_canvas_name'] : 'home_map_canvas';
	72	+ $map_class_name = (!empty($map_args) && isset($map_args['map_class_name'])) ? $map_args['map_class_name'] : '';
	73	+
	74	+ $default_location = geodir_get_default_location();
	75	+
	76	+ $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
	77	+ $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
	78	+ $map_default_zoom = 12;
	79	+ // map options default values
	80	+ $width = 950;
	81	+ $height = 450;
	82	+ $child_collapse = '0';
	83	+ $sticky = '';
	84	+ $enable_cat_filters = false;
	85	+ $enable_text_search = false;
	86	+ $enable_post_type_filters = false;
	87	+ $enable_location_filters = false;
	88	+ $enable_jason_on_load = false;
	89	+ $enable_map_direction = false;
	90	+ $enable_marker_cluster = false;
	91	+ $enable_map_resize_button = false;
	92	+ $maptype = 'ROADMAP';
	93	+
	94	+ $geodir_map_options = array(
	95	+ 'width' => $width,
	96	+ 'height' => $height,
	97	+ 'child_collapse' => $child_collapse,
	98	+ 'sticky' => $sticky,
	99	+ 'enable_map_resize_button' => $enable_map_resize_button,
	100	+ 'enable_cat_filters' => $enable_cat_filters,
	101	+ 'enable_text_search' => $enable_text_search,
	102	+ 'enable_post_type_filters' => $enable_post_type_filters,
	103	+ 'enable_location_filters' => $enable_location_filters,
	104	+ 'enable_jason_on_load' => $enable_jason_on_load,
	105	+ 'enable_map_direction' => $enable_map_direction,
	106	+ 'enable_marker_cluster' => $enable_marker_cluster,
	107	+ 'ajax_url' => geodir_get_ajax_url(),
	108	+ 'map_canvas_name' => $map_canvas_name,
	109	+ 'inputText' => __('Title or Keyword', 'geodirectory'),
	110	+ 'latitude' => $map_default_lat,
	111	+ 'longitude' => $map_default_lng,
	112	+ 'zoom' => $map_default_zoom,
	113	+ 'scrollwheel' => true,
	114	+ 'streetViewControl' => true,
	115	+ 'fullscreenControl' => false,
	116	+ 'maptype' => $maptype,
	117	+ 'showPreview' => '0',
	118	+ 'maxZoom' => 21,
	119	+ 'autozoom' => true,
	120	+ 'bubble_size' => 'small',
	121	+ 'token' => '68f48005e256696074e1da9bf9f67f06',
	122	+ 'navigationControlOptions' => array('position' => 'TOP_LEFT', 'style' => 'ZOOM_PAN')
	123	+ );
	124	+
	125	+
	126	+
	127	+ if (!empty($map_args)) {
	128	+ foreach ($map_args as $map_option_key => $map_option_value) {
	129	+ $geodir_map_options[$map_option_key] = $map_option_value;
	130	+ }
	131	+ }
	132	+
	133	+ if (strpos($geodir_map_options['height'], '%') !== false \|\| strpos($geodir_map_options['height'], 'px') !== false \|\| strpos($geodir_map_options['height'], 'vh') !== false) {
	134	+ } else {
	135	+ $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';
	136	+ }
	137	+
	138	+ if (strpos($geodir_map_options['width'], '%') !== false \|\| strpos($geodir_map_options['width'], 'px') !== false) {
	139	+ } else {
	140	+ $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';
	141	+ }
	142	+
	143	+ /**
144	144	* Filter the options to use in google map.
145	145	*
146	146	* @since 1.0.0
		@@ -149,9 +149,9 @@ discard block
		block discarded – undo
149	149	*/
150	150	$geodir_map_options = apply_filters("geodir_map_options_{$map_canvas_name}", $geodir_map_options);
151	151
152		- $map_canvas_arr[$map_canvas_name] = array();
	152	+ $map_canvas_arr[$map_canvas_name] = array();
153	153
154		- /**
	154	+ /**
155	155	* Filter the post types to display data on map.
156	156	*
157	157	* @since 1.0.0
		@@ -169,20 +169,20 @@ discard block
		block discarded – undo
169	169	*/
170	170	$exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));
171	171
172		- if (count((array)$post_types) != count($exclude_post_types) \|\| ($enable_jason_on_load)):
173		- // Set default map options
	172	+ if (count((array)$post_types) != count($exclude_post_types) \|\| ($enable_jason_on_load)):
	173	+ // Set default map options
174	174
175		- wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);
	175	+ wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);
176	176
177		- wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);
	177	+ wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);
178	178
179		- if ($map_canvas_name == 'detail_page_map_canvas' \|\| $map_canvas_name == 'preview_map_canvas') {
180		- $map_width = '100%';
181		- } else {
182		- $map_width = $geodir_map_options['width'];
183		- }
	179	+ if ($map_canvas_name == 'detail_page_map_canvas' \|\| $map_canvas_name == 'preview_map_canvas') {
	180	+ $map_width = '100%';
	181	+ } else {
	182	+ $map_width = $geodir_map_options['width'];
	183	+ }
184	184
185		- /**
	185	+ /**
186	186	* Filter the width of map.
187	187	*
188	188	* @since 1.0.0
		@@ -190,7 +190,7 @@ discard block
		block discarded – undo
190	190	* @param int $map_width Width of map box, eg: gd_place.
191	191	*/
192	192	$map_width = apply_filters('geodir_change_map_width', $map_width);
193		- ?>
	193	+ ?>
194	194	<div id="catcher_<?php echo $map_canvas_name;?>"></div>
195	195	<div class="stick_trigger_container">
196	196	<div class="trigger_sticky triggeroff_sticky"></div>
		@@ -224,15 +224,15 @@ discard block
		block discarded – undo
224	224	<?php if ($geodir_map_options['enable_jason_on_load']) { ?>
225	225	<input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/>
226	226	<?php } else {
227		- ?>
	227	+ ?>
228	228	<input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>
229	229	<?php }
230	230
231		- if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])
232		- $show_entire_cat_panel = "none";
233		- else
234		- $show_entire_cat_panel = "''";
235		- ?>
	231	+ if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])
	232	+ $show_entire_cat_panel = "none";
	233	+ else
	234	+ $show_entire_cat_panel = "''";
	235	+ ?>
236	236
237	237	<?php if ($geodir_map_options['enable_map_direction']) { ?>
238	238	<div class="gd-input-group gd-get-directions">
		@@ -295,8 +295,8 @@ discard block
		block discarded – undo
295	295	<select id="travel-units" onchange="calcRoute('<?php echo $map_canvas_name; ?>')">
296	296	<option value="miles"><?php _e('Miles', 'geodirectory'); ?></option>
297	297	<option <?php if (get_option('geodir_search_dist_1') == 'km') {
298		- echo 'selected="selected"';
299		- } ?> value="kilometers"><?php _e('Kilometers', 'geodirectory'); ?></option>
	298	+ echo 'selected="selected"';
	299	+ } ?> value="kilometers"><?php _e('Kilometers', 'geodirectory'); ?></option>
300	300	</select>
301	301	</div>
302	302
		@@ -308,12 +308,12 @@ discard block
		block discarded – undo
308	308	if (empty($geodir_default_map_search_pt))
309	309	$geodir_default_map_search_pt = 'gd_place';
310	310
311		- global $gd_session;
312		- $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');
	311	+ global $gd_session;
	312	+ $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype');
313	313
314		- if ($homemap_catlist_ptype) {
315		- $geodir_default_map_search_pt = $homemap_catlist_ptype;
316		- }
	314	+ if ($homemap_catlist_ptype) {
	315	+ $geodir_default_map_search_pt = $homemap_catlist_ptype;
	316	+ }
317	317
318	318	/**
319	319	* Filter the post type to retrieve data for map
		@@ -326,13 +326,13 @@ discard block
		block discarded – undo
326	326	?>
327	327	<div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>">
328	328	<?php
329		- $exclude_post_types = get_option('geodir_exclude_post_type_on_map');
330		- $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);
	329	+ $exclude_post_types = get_option('geodir_exclude_post_type_on_map');
	330	+ $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);
331	331	$map_cat_class = '';
332	332	if ($geodir_map_options['enable_post_type_filters']) {
333	333	$map_cat_class = $geodir_available_pt_on_map > 1 ? ' map-cat-ptypes' : ' map-cat-floor';
334	334	}
335		- ?>
	335	+ ?>
336	336	<div
337	337	class="map-category-listing<?php echo $map_cat_class;?>">
338	338	<div class="gd-trigger gd-triggeroff"><i class="fas fa-compress"></i><i class="fas fa-expand"></i></div>
		@@ -350,7 +350,7 @@ discard block
		block discarded – undo
350	350	<?php if ($geodir_map_options['child_collapse']) { $child_collapse = "1"; ?>
351	351	<input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/>
352	352	<?php } else {$child_collapse = "0";
353		- ?>
	353	+ ?>
354	354	<input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/>
355	355	<?php } ?>
356	356	<input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>
		@@ -372,18 +372,18 @@ discard block
		block discarded – undo
372	372	<!-- map-category-listings-->
373	373
374	374	<?php
375		- if ($geodir_map_options['enable_location_filters']) {
376		- $country = get_query_var('gd_country');
	375	+ if ($geodir_map_options['enable_location_filters']) {
	376	+ $country = get_query_var('gd_country');
377	377	$region = get_query_var('gd_region');
378	378	$city = get_query_var('gd_city');
379		- $gd_neighbourhood = get_query_var('gd_neighbourhood');
	379	+ $gd_neighbourhood = get_query_var('gd_neighbourhood');
380	380
381		- //fix for location/me page
382		- $country = $country != 'me' ? $country : '';
	381	+ //fix for location/me page
	382	+ $country = $country != 'me' ? $country : '';
383	383	$region = $region != 'me' ? $region : '';
384	384	$city = $country != 'me' ? $city : '';
385		- $gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';
386		- ?>
	385	+ $gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';
	386	+ ?>
387	387	<input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>
388	388	<input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country"
389	389	value="<?php echo $country;?>"/>
		@@ -394,7 +394,7 @@ discard block
		block discarded – undo
394	394	<input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood"
395	395	value="<?php echo $gd_neighbourhood;?>"/>
396	396	<?php } else { //end of location filter
397		- ?>
	397	+ ?>
398	398	<input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/>
399	399	<?php }?>
400	400
		@@ -405,16 +405,16 @@ discard block
		block discarded – undo
405	405
406	406
407	407	<?php if ($geodir_map_options['enable_post_type_filters']) {
408		- $post_types = geodir_get_posttypes('object');
409		- $all_post_types = geodir_get_posttypes('names');
410		- $exclude_post_types = get_option('geodir_exclude_post_type_on_map');
411		- if (is_array($exclude_post_types)) {
412		- $map_post_types = array_diff($all_post_types, $exclude_post_types);
413		- } else {
414		- $map_post_types = $all_post_types;
415		- }
416		- if (count($map_post_types) > 1) {
417		- ?>
	408	+ $post_types = geodir_get_posttypes('object');
	409	+ $all_post_types = geodir_get_posttypes('names');
	410	+ $exclude_post_types = get_option('geodir_exclude_post_type_on_map');
	411	+ if (is_array($exclude_post_types)) {
	412	+ $map_post_types = array_diff($all_post_types, $exclude_post_types);
	413	+ } else {
	414	+ $map_post_types = $all_post_types;
	415	+ }
	416	+ if (count($map_post_types) > 1) {
	417	+ ?>
418	418	<div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu"
419	419	style="max-width:<?php echo $map_width;?>!important;">
420	420
		@@ -424,13 +424,13 @@ discard block
		block discarded – undo
424	424	<?php
425	425
426	426
427		- foreach ($post_types as $post_type => $args) {
428		- if (!in_array($post_type, $exclude_post_types)) {
429		- $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';
	427	+ foreach ($post_types as $post_type => $args) {
	428	+ if (!in_array($post_type, $exclude_post_types)) {
	429	+ $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';
430	430	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)">' . __($args->labels->name, 'geodirectory') . '</a></li>';
431		- }
432		- }
433		- ?>
	431	+ }
	432	+ }
	433	+ ?>
434	434	</ul>
435	435	<?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>
436	436	</div><?php } ?>
		@@ -444,8 +444,8 @@ discard block
		block discarded – undo
444	444
445	445	</div> <!-- map-places-listings-->
446	446	<?php }
447		- } // end of post type filter if
448		- ?>
	447	+ } // end of post type filter if
	448	+ ?>
449	449
450	450	</div>
451	451	</div> <!--end of stick trigger container-->
		@@ -459,8 +459,8 @@ discard block
		block discarded – undo
459	459	</script>
460	460	<?php
461	461
462		- if (strpos($geodir_map_options['height'], 'vh')) {
463		- ?>
	462	+ if (strpos($geodir_map_options['height'], 'vh')) {
	463	+ ?>
464	464	<script>
465	465	(function () {
466	466	var screenH = jQuery(window).height();
		@@ -482,8 +482,8 @@ discard block
		block discarded – undo
482	482
483	483	<?php
484	484
485		- } elseif (strpos($geodir_map_options['height'], 'px')) {
486		- ?>
	485	+ } elseif (strpos($geodir_map_options['height'], 'px')) {
	486	+ ?>
487	487	<script>
488	488	(function () {
489	489	var screenH = jQuery(window).height();
		@@ -498,20 +498,20 @@ discard block
		block discarded – undo
498	498	}());
499	499	</script>
500	500	<?php
501		- }
	501	+ }
502	502
503		- /**
504		- * Action that runs after all the map code has been output;
505		- *
506		- * @since 1.5.3
507		- *
508		- * @param array $geodir_map_options Array of map settings.
509		- * @param string $map_canvas_name The canvas name and ID for the map.
510		- */
511		- do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);
	503	+ /**
	504	+ * Action that runs after all the map code has been output;
	505	+ *
	506	+ * @since 1.5.3
	507	+ *
	508	+ * @param array $geodir_map_options Array of map settings.
	509	+ * @param string $map_canvas_name The canvas name and ID for the map.
	510	+ */
	511	+ do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);
512	512
513	513
514		- endif; // Exclude posttypes if end
	514	+ endif; // Exclude posttypes if end
515	515	}
516	516
517	517	/**

		@@ -132,12 +132,12 @@ discard block
		block discarded – undo
132	132
133	133	if (strpos($geodir_map_options['height'], '%') !== false \|\| strpos($geodir_map_options['height'], 'px') !== false \|\| strpos($geodir_map_options['height'], 'vh') !== false) {
134	134	} else {
135		- $geodir_map_options['height'] = $geodir_map_options['height'] . 'px';
	135	+ $geodir_map_options['height'] = $geodir_map_options['height'].'px';
136	136	}
137	137
138	138	if (strpos($geodir_map_options['width'], '%') !== false \|\| strpos($geodir_map_options['width'], 'px') !== false) {
139	139	} else {
140		- $geodir_map_options['width'] = $geodir_map_options['width'] . 'px';
	140	+ $geodir_map_options['width'] = $geodir_map_options['width'].'px';
141	141	}
142	142
143	143	/**
		@@ -169,10 +169,10 @@ discard block
		block discarded – undo
169	169	*/
170	170	$exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));
171	171
172		- if (count((array)$post_types) != count($exclude_post_types) \|\| ($enable_jason_on_load)):
	172	+ if (count((array) $post_types) != count($exclude_post_types) \|\| ($enable_jason_on_load)):
173	173	// Set default map options
174	174
175		- wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);
	175	+ wp_enqueue_script('geodir-map-widget', geodir_plugin_url().'/geodirectory-functions/map-functions/js/map.min.js', array(), false, true);
176	176
177	177	wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);
178	178
		@@ -191,41 +191,41 @@ discard block
		block discarded – undo
191	191	*/
192	192	$map_width = apply_filters('geodir_change_map_width', $map_width);
193	193	?>
194		- <div id="catcher_<?php echo $map_canvas_name;?>"></div>
	194	+ <div id="catcher_<?php echo $map_canvas_name; ?>"></div>
195	195	<div class="stick_trigger_container">
196	196	<div class="trigger_sticky triggeroff_sticky"></div>
197		- <div class="top_banner_section geodir_map_container <?php echo $map_class_name;?>"
198		- id="sticky_map_<?php echo $map_canvas_name;?>"
199		- style="min-height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">
	197	+ <div class="top_banner_section geodir_map_container <?php echo $map_class_name; ?>"
	198	+ id="sticky_map_<?php echo $map_canvas_name; ?>"
	199	+ style="min-height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">
200	200
201	201	<div class="map_background">
202	202	<div class="top_banner_section_in clearfix">
203		- <div class="<?php echo $map_canvas_name;?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name;?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fas fa-expand-arrows-alt"></i></span></div>
204		- <div class="<?php echo $map_canvas_name;?>_TopRight TopRight"></div>
205		- <div id="<?php echo $map_canvas_name;?>_wrapper" class="main_map_wrapper"
206		- style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;">
	203	+ <div class="<?php echo $map_canvas_name; ?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name; ?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fas fa-expand-arrows-alt"></i></span></div>
	204	+ <div class="<?php echo $map_canvas_name; ?>_TopRight TopRight"></div>
	205	+ <div id="<?php echo $map_canvas_name; ?>_wrapper" class="main_map_wrapper"
	206	+ style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;">
207	207	<!-- new map start -->
208	208	<div class="iprelative">
209		- <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name;?>"
210		- style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>
211		- <div id="<?php echo $map_canvas_name;?>_loading_div" class="loading_div"
212		- style=" height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div>
	209	+ <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name; ?>"
	210	+ style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>
	211	+ <div id="<?php echo $map_canvas_name; ?>_loading_div" class="loading_div"
	212	+ style=" height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div>
213	213	<!--<div id="home_map_counter"></div> -->
214		- <div id="<?php echo $map_canvas_name;?>_map_nofound"
	214	+ <div id="<?php echo $map_canvas_name; ?>_map_nofound"
215	215	class="advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div>
216		- <div id="<?php echo $map_canvas_name;?>_map_notloaded"
	216	+ <div id="<?php echo $map_canvas_name; ?>_map_notloaded"
217	217	class="advmap_notloaded"><?php _e('<h3>Google Map Not Loaded</h3><p>Sorry, unable to load Google Maps API.', 'geodirectory'); ?></div>
218	218	</div>
219	219	<!-- new map end -->
220	220	</div>
221		- <div class="<?php echo $map_canvas_name;?>_BottomLeft BottomLeft"></div>
	221	+ <div class="<?php echo $map_canvas_name; ?>_BottomLeft BottomLeft"></div>
222	222	</div>
223	223	</div>
224	224	<?php if ($geodir_map_options['enable_jason_on_load']) { ?>
225		- <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/>
	225	+ <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="1"/>
226	226	<?php } else {
227	227	?>
228		- <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/>
	228	+ <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="0"/>
229	229	<?php }
230	230
231	231	if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters'])
		@@ -245,7 +245,7 @@ discard block
		block discarded – undo
245	245	<div class="gd-input-group-addon gd-directions-right gd-mylocation-go"><input type="button" value="<?php _e('Get Directions', 'geodirectory'); ?>" class="<?php echo $map_canvas_name; ?>_getdirection" id="directions" onclick="calcRoute('<?php echo $map_canvas_name; ?>')" /></div>
246	246	</div>
247	247	<script>
248		- <?php if(geodir_is_page('detail')){?>
	248	+ <?php if (geodir_is_page('detail')) {?>
249	249	jQuery(function () {
250	250	gd_initialize_ac();
251	251	});
		@@ -256,7 +256,7 @@ discard block
		block discarded – undo
256	256	// Create the autocomplete object, restricting the search
257	257	// to geographical location types.
258	258	autocomplete = new google.maps.places.Autocomplete(
259		- /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name;?>_fromAddress')),
	259	+ /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name; ?>_fromAddress')),
260	260	{types: ['geocode']});
261	261	// When the user selects an address from the dropdown,
262	262	// populate the address fields in the form.
		@@ -270,7 +270,7 @@ discard block
		block discarded – undo
270	270
271	271	if (window.gdMaps == 'osm') {
272	272	window.setTimeout(function() {
273		- calcRoute('<?php echo $map_canvas_name;?>');
	273	+ calcRoute('<?php echo $map_canvas_name; ?>');
274	274	}, 1000);
275	275	}
276	276	}
		@@ -324,7 +324,7 @@ discard block
		block discarded – undo
324	324	*/
325	325	$map_search_pt = apply_filters('geodir_default_map_search_pt', $geodir_default_map_search_pt);
326	326	?>
327		- <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>">
	327	+ <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel; ?>">
328	328	<?php
329	329	$exclude_post_types = get_option('geodir_exclude_post_type_on_map');
330	330	$geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);
		@@ -334,12 +334,12 @@ discard block
		block discarded – undo
334	334	}
335	335	?>
336	336	<div
337		- class="map-category-listing<?php echo $map_cat_class;?>">
	337	+ class="map-category-listing<?php echo $map_cat_class; ?>">
338	338	<div class="gd-trigger gd-triggeroff"><i class="fas fa-compress"></i><i class="fas fa-expand"></i></div>
339		- <div id="<?php echo $map_canvas_name;?>_cat"
340		- class="<?php echo $map_canvas_name;?>_map_category map_category"
341		- <?php if ($child_collapse){ ?>checked="checked" <?php }?>
342		- style="max-height:<?php echo $geodir_map_options['height'];?>;">
	339	+ <div id="<?php echo $map_canvas_name; ?>_cat"
	340	+ class="<?php echo $map_canvas_name; ?>_map_category map_category"
	341	+ <?php if ($child_collapse) { ?>checked="checked" <?php }?>
	342	+ style="max-height:<?php echo $geodir_map_options['height']; ?>;">
343	343	<input
344	344	onkeydown="if(event.keyCode == 13){build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false)}"
345	345	type="text"
		@@ -351,11 +351,11 @@ discard block
		block discarded – undo
351	351	<input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/>
352	352	<?php } else {$child_collapse = "0";
353	353	?>
354		- <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/>
	354	+ <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="0"/>
355	355	<?php } ?>
356	356	<input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/>
357	357	<div class="geodir_toggle">
358		- <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'),0,true,0,$map_canvas_name,$child_collapse,true); ?>
	358	+ <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'), 0, true, 0, $map_canvas_name, $child_collapse, true); ?>
359	359	<script>jQuery( document ).ready(function() {
360	360	geodir_show_sub_cat_collapse_button();
361	361	});</script>
		@@ -384,21 +384,21 @@ discard block
		block discarded – undo
384	384	$city = $country != 'me' ? $city : '';
385	385	$gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : '';
386	386	?>
387		- <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/>
388		- <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country"
389		- value="<?php echo $country;?>"/>
390		- <input type="hidden" id="<?php echo $map_canvas_name;?>_region" name="gd_region"
391		- value="<?php echo $region;?>"/>
392		- <input type="hidden" id="<?php echo $map_canvas_name;?>_city" name="gd_city"
393		- value="<?php echo $city;?>"/>
394		- <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood"
395		- value="<?php echo $gd_neighbourhood;?>"/>
	387	+ <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="1"/>
	388	+ <input type="hidden" id="<?php echo $map_canvas_name; ?>_country" name="gd_country"
	389	+ value="<?php echo $country; ?>"/>
	390	+ <input type="hidden" id="<?php echo $map_canvas_name; ?>_region" name="gd_region"
	391	+ value="<?php echo $region; ?>"/>
	392	+ <input type="hidden" id="<?php echo $map_canvas_name; ?>_city" name="gd_city"
	393	+ value="<?php echo $city; ?>"/>
	394	+ <input type="hidden" id="<?php echo $map_canvas_name; ?>_neighbourhood" name="gd_neighbourhood"
	395	+ value="<?php echo $gd_neighbourhood; ?>"/>
396	396	<?php } else { //end of location filter
397	397	?>
398		- <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/>
	398	+ <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="0"/>
399	399	<?php }?>
400	400
401		- <input type="hidden" id="<?php echo $map_canvas_name;?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt;?>"/>
	401	+ <input type="hidden" id="<?php echo $map_canvas_name; ?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt; ?>"/>
402	402
403	403	<input type="hidden" name="limitstart" value=""/>
404	404
		@@ -415,8 +415,8 @@ discard block
		block discarded – undo
415	415	}
416	416	if (count($map_post_types) > 1) {
417	417	?>
418		- <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu"
419		- style="max-width:<?php echo $map_width;?>!important;">
	418	+ <div class="map-places-listing" id="<?php echo $map_canvas_name; ?>_posttype_menu"
	419	+ style="max-width:<?php echo $map_width; ?>!important;">
420	420
421	421	<?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>
422	422	<div class="geodir-map-posttype-list"><?php } ?>
		@@ -427,7 +427,7 @@ discard block
		block discarded – undo
427	427	foreach ($post_types as $post_type => $args) {
428	428	if (!in_array($post_type, $exclude_post_types)) {
429	429	$class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : '';
430		- 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)">' . __($args->labels->name, 'geodirectory') . '</a></li>';
	430	+ 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)">'.__($args->labels->name, 'geodirectory').'</a></li>';
431	431	}
432	432	}
433	433	?>
		@@ -452,8 +452,8 @@ discard block
		block discarded – undo
452	452	<script type="text/javascript">
453	453
454	454	jQuery(document).ready(function () {
455		- build_map_ajax_search_param('<?php echo $map_canvas_name;?>', false);
456		- map_sticky('<?php echo $map_canvas_name;?>');
	455	+ build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false);
	456	+ map_sticky('<?php echo $map_canvas_name; ?>');
457	457	});
458	458
459	459	</script>
		@@ -464,18 +464,18 @@ discard block
		block discarded – undo
464	464	<script>
465	465	(function () {
466	466	var screenH = jQuery(window).height();
467		- var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']);?>";
	467	+ var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']); ?>";
468	468
469	469	var ptypeH = '';
470		- if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {
471		- ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();
	470	+ if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {
	471	+ ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();
472	472	}
473	473
474		- jQuery("#sticky_map_<?php echo $map_canvas_name;?>").css("min-height", screenH * (heightVH / 100) + 'px');
475		- jQuery("#<?php echo $map_canvas_name;?>_wrapper").height(screenH * (heightVH / 100) + 'px');
476		- jQuery("#<?php echo $map_canvas_name;?>").height(screenH * (heightVH / 100) + 'px');
477		- jQuery("#<?php echo $map_canvas_name;?>_loading_div").height(screenH * (heightVH / 100) + 'px');
478		- jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');
	474	+ jQuery("#sticky_map_<?php echo $map_canvas_name; ?>").css("min-height", screenH * (heightVH / 100) + 'px');
	475	+ jQuery("#<?php echo $map_canvas_name; ?>_wrapper").height(screenH * (heightVH / 100) + 'px');
	476	+ jQuery("#<?php echo $map_canvas_name; ?>").height(screenH * (heightVH / 100) + 'px');
	477	+ jQuery("#<?php echo $map_canvas_name; ?>_loading_div").height(screenH * (heightVH / 100) + 'px');
	478	+ jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');
479	479
480	480	}());
481	481	</script>
		@@ -487,13 +487,13 @@ discard block
		block discarded – undo
487	487	<script>
488	488	(function () {
489	489	var screenH = jQuery(window).height();
490		- var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']);?>";
	490	+ var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']); ?>";
491	491	var ptypeH = '';
492		- if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {
493		- ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();
	492	+ if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {
	493	+ ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();
494	494	}
495	495
496		- jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", heightVH - ptypeH + 'px');
	496	+ jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", heightVH - ptypeH + 'px');
497	497
498	498	}());
499	499	</script>
		@@ -508,7 +508,7 @@ discard block
		block discarded – undo
508	508	* @param array $geodir_map_options Array of map settings.
509	509	* @param string $map_canvas_name The canvas name and ID for the map.
510	510	*/
511		- do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);
	511	+ do_action('geodir_map_after_render', $geodir_map_options, $map_canvas_name);
512	512
513	513
514	514	endif; // Exclude posttypes if end

		@@ -29,10 +29,10 @@ discard block
		block discarded – undo
29	29	$value = 100;
30	30	}
31	31	// Re-add the percent symbol
32		- $value = $value . '%';
	32	+ $value = $value.'%';
33	33	} elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
34	34	// Get the absint & re-add the 'px'
35		- $value = preg_replace('/\D/', '', $value) . 'px';
	35	+ $value = preg_replace('/\D/', '', $value).'px';
36	36	} else {
37	37	$value = preg_replace('/\D/', '', $value);
38	38	}
		@@ -211,7 +211,7 @@ discard block
		block discarded – undo
211	211	}
212	212	if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
213	213
214		- $table = $plugin_prefix . $geodir_post_type . '_detail';
	214	+ $table = $plugin_prefix.$geodir_post_type.'_detail';
215	215
216	216	add_filter('posts_fields', 'geodir_posts_fields', 1);
217	217	add_filter('posts_join', 'geodir_posts_join', 1);
		@@ -255,7 +255,7 @@ discard block
		block discarded – undo
255	255
256	256	$taxonomies = geodir_get_taxonomies($post_type);
257	257
258		- $categories = get_terms(array('taxonomy' => $taxonomies[0],'hide_empty' => false));
	258	+ $categories = get_terms(array('taxonomy' => $taxonomies[0], 'hide_empty' => false));
259	259
260	260	$cat_id = 0;
261	261
		@@ -488,7 +488,7 @@ discard block
		block discarded – undo
488	488	}
489	489
490	490	if (!empty($post_type)) {
491		- $table = $plugin_prefix . $post_type . '_detail';
	491	+ $table = $plugin_prefix.$post_type.'_detail';
492	492
493	493	if (!geodir_prepare_custom_sorting($sort_choice, $table)) {
494	494	$sort_choice = '';
		@@ -581,10 +581,10 @@ discard block
		block discarded – undo
581	581	$add_location_filter = !empty($args['add_location_filter']) ? true : false;
582	582	$list_sort = !empty($args['list_sort']) ? $args['list_sort'] : 'latest';
583	583	$character_count = isset($args['character_count']) ? $args['character_count'] : '';
584		- $layout = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
	584	+ $layout = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
585	585	$listing_width = !empty($args['listing_width']) ? $args['listing_width'] : '';
586		- $with_pagination = !empty($args['with_pagination']) ? true : false;
587		- $event_type = !empty($args['event_type']) ? $args['event_type'] : '';
	586	+ $with_pagination = !empty($args['with_pagination']) ? true : false;
	587	+ $event_type = !empty($args['event_type']) ? $args['event_type'] : '';
588	588	$shortcode_content = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
589	589	$tags = !empty($args['tags']) ? $args['tags'] : array();
590	590	/**
		@@ -598,13 +598,13 @@ discard block
		block discarded – undo
598	598	$shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
599	599
600	600	$top_pagination = $with_pagination && !empty($args['top_pagination']) ? true : false;
601		- $bottom_pagination = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
	601	+ $bottom_pagination = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
602	602
603	603	$shortcode_atts = !empty($args['shortcode_atts']) ? $args['shortcode_atts'] : array();
604	604
605	605	// ajax mode
606		- $geodir_ajax = !empty($args['geodir_ajax']) ? true : false;
607		- $pageno = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
	606	+ $geodir_ajax = !empty($args['geodir_ajax']) ? true : false;
	607	+ $pageno = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
608	608
609	609	$query_args = array(
610	610	'posts_per_page' => $post_number,
		@@ -668,7 +668,7 @@ discard block
		block discarded – undo
668	668	// Clean tags
669	669	if (!is_array($tags)) {
670	670	$comma = _x(',', 'tag delimiter');
671		- if ( ',' !== $comma ) {
	671	+ if (',' !== $comma) {
672	672	$tags = str_replace($comma, ',', $tags);
673	673	}
674	674	$tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
		@@ -677,7 +677,7 @@ discard block
		block discarded – undo
677	677
678	678	if (!empty($tags)) {
679	679	$tag_query = array(
680		- 'taxonomy' => $post_type . '_tags',
	680	+ 'taxonomy' => $post_type.'_tags',
681	681	'field' => 'name',
682	682	'terms' => $tags
683	683	);
		@@ -707,7 +707,7 @@ discard block
		block discarded – undo
707	707	$widget_listings = $total_posts > 0 ? geodir_get_widget_listings($query_args) : array();
708	708	}
709	709	$current_gridview_columns_widget = $gridview_columns_widget;
710		- $identifier = ' gd-wgt-pagi-' . mt_rand();
	710	+ $identifier = ' gd-wgt-pagi-'.mt_rand();
711	711	ob_start();
712	712	if (!empty($widget_listings) \|\| $with_no_results) {
713	713	if (!$geodir_ajax) {
		@@ -718,7 +718,7 @@ discard block
		block discarded – undo
718	718	*/
719	719	do_action('geodir_before_sc_gd_listings');
720	720	?>
721		- <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier;?>">
	721	+ <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier; ?>">
722	722	<?php if ($title != '') { ?>
723	723	<div class="geodir_list_heading clearfix">
724	724	<?php echo $title; ?>
		@@ -788,8 +788,8 @@ discard block
		block discarded – undo
788	788	</div><p class="geodir-sclisting-loading" style="display:none;"><i class="fas fa-cog fa-spin"></i></p></div>
789	789	<script type="text/javascript">
790	790	/* <![CDATA[ */
791		-jQuery(document).on('click', '.<?php echo trim($identifier);?> .gd-wgt-page', function(e) {
792		- var container = jQuery( '.<?php echo trim($identifier);?>');
	791	+jQuery(document).on('click', '.<?php echo trim($identifier); ?> .gd-wgt-page', function(e) {
	792	+ var container = jQuery( '.<?php echo trim($identifier); ?>');
793	793	var obj = this;
794	794	var pid = parseInt(jQuery(this).data('page'));
795	795	var items = jQuery(obj).closest('.gd-sc-content');
		@@ -799,7 +799,7 @@ discard block
		block discarded – undo
799	799	return false;
800	800	}
801	801
802		- var scatts = "<?php echo addslashes(json_encode($shortcode_atts));?>";
	802	+ var scatts = "<?php echo addslashes(json_encode($shortcode_atts)); ?>";
803	803
804	804	var data = {
805	805	'action': 'geodir_sclistings',
		@@ -889,16 +889,16 @@ discard block
		block discarded – undo
889	889	if ($max_page > 1 \|\| $always_show) {
890	890	// Extra pagination info
891	891	$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
892		- $start_no = ( $pageno - 1 ) * $posts_per_page + 1;
	892	+ $start_no = ($pageno - 1) * $posts_per_page + 1;
893	893	$end_no = min($pageno * $posts_per_page, $numposts);
894	894
895	895	if ($geodir_pagination_more_info != '') {
896		- $pagination_info = '<div class="gd-pagination-details gd-pagination-details-' . $geodir_pagination_more_info . '">' . wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts) . '</div>';
	896	+ $pagination_info = '<div class="gd-pagination-details gd-pagination-details-'.$geodir_pagination_more_info.'">'.wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts).'</div>';
897	897
898	898	if ($geodir_pagination_more_info == 'before') {
899		- $before = $before . $pagination_info;
	899	+ $before = $before.$pagination_info;
900	900	} else if ($geodir_pagination_more_info == 'after') {
901		- $after = $pagination_info . $after;
	901	+ $after = $pagination_info.$after;
902	902	}
903	903	}
904	904
		@@ -908,7 +908,7 @@ discard block
		block discarded – undo
908	908	}
909	909
910	910	if (($pageno - 1) > 0) {
911		- echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a> ';
	911	+ echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="'.(int) ($pageno - 1).'" href="javascript:void(0);">'.$prelabel.'</a> ';
912	912	}
913	913
914	914	for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
		@@ -916,17 +916,17 @@ discard block
		block discarded – undo
916	916	if ($i == $pageno) {
917	917	echo "<strong class='on' class='gd-page-sc-act'>$i</strong>";
918	918	} else {
919		- echo ' <a class="gd-page-sc-no gd-wgt-page" data-page="' . (int)$i . '" href="javascript:void(0);">' . $i . '</a> ';
	919	+ echo ' <a class="gd-page-sc-no gd-wgt-page" data-page="'.(int) $i.'" href="javascript:void(0);">'.$i.'</a> ';
920	920	}
921	921	}
922	922	}
923	923
924	924	if (($pageno + 1) <= $max_page) {
925		- echo ' <a class="gd-page-sc-nxt gd-wgt-page" data-page="' . (int)($pageno + 1) . '" href="javascript:void(0);">' . $nxtlabel . '</a>';
	925	+ echo ' <a class="gd-page-sc-nxt gd-wgt-page" data-page="'.(int) ($pageno + 1).'" href="javascript:void(0);">'.$nxtlabel.'</a>';
926	926	}
927	927
928	928	if ($pageno < $max_page) {
929		- echo ' <a class="gd-page-sc-lst gd-wgt-page" data-page="' . (int)$max_page . '" href="javascript:void(0);">»</a>';
	929	+ echo ' <a class="gd-page-sc-lst gd-wgt-page" data-page="'.(int) $max_page.'" href="javascript:void(0);">»</a>';
930	930	}
931	931	echo "</div> $after </div>";
932	932	}
		@@ -949,7 +949,7 @@ discard block
		block discarded – undo
949	949	$scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
950	950	$pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
951	951
952		- $shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
	952	+ $shortcode_atts = !empty($scatts) ? (array) json_decode(stripslashes_deep($scatts)) : NULL;
953	953
954	954	if (!empty($shortcode_atts) && is_array($shortcode_atts)) {
955	955	$shortcode_atts['pageno'] = $pageno;

GeoDirectory / geodirectory

Push — master ( 7a266a...e0908c )

Status

Category

Indentation +275 added lines, -275 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Indentation +161 added lines, -161 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +519 added lines, -519 removed lines patch added patch discarded remove patch

Indentation +404 added lines, -404 removed lines patch added patch discarded remove patch

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

Indentation +243 added lines, -243 removed lines patch added patch discarded remove patch

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

Indentation +145 added lines, -145 removed lines patch added patch discarded remove patch

Spacing +61 added lines, -61 removed lines patch added patch discarded remove patch

Indentation +427 added lines, -427 removed lines patch added patch discarded remove patch

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

Spacing +233 added lines, -233 removed lines patch added patch discarded remove patch

Indentation +2375 added lines, -2375 removed lines patch added patch discarded remove patch

Spacing +246 added lines, -246 removed lines patch added patch discarded remove patch