GeoDirectory / geodirectory

geodirectory-functions/compatibility/Jupiter.php

Indentation +141 added lines, -141 removed lines

@@ -16,28 +16,28 @@ 
  */
 function jupiter_action_calls()
 {
-    // REMOVE BREADCRUMB
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
-
-    // REMOVE PAGE TITLES
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    remove_action('geodir_add_listing_page_title', 'geodir_action_add_listing_page_title', 10);
-    remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
-
-
-    // CAHNGE PAGE TITLES
-    remove_action('page_title', 'mk_page_title');
-    add_action('page_title', 'gd_mk_page_title');
-    // CHANGE BREADCRUMS FOR GD PAGES
-    remove_action('theme_breadcrumbs', 'mk_theme_breadcrumbs');
-    add_action('theme_breadcrumbs', 'gd_mk_theme_breadcrumbs');
+	// REMOVE BREADCRUMB
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+
+	// REMOVE PAGE TITLES
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	remove_action('geodir_add_listing_page_title', 'geodir_action_add_listing_page_title', 10);
+	remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+
+
+	// CAHNGE PAGE TITLES
+	remove_action('page_title', 'mk_page_title');
+	add_action('page_title', 'gd_mk_page_title');
+	// CHANGE BREADCRUMS FOR GD PAGES
+	remove_action('theme_breadcrumbs', 'mk_theme_breadcrumbs');
+	add_action('theme_breadcrumbs', 'gd_mk_theme_breadcrumbs');
 
 
 }
@@ -52,19 +52,19 @@ 
 function gd_mk_theme_breadcrumbs()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('listing')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('detail')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('search')) {
-        jupiter_geodir_breadcrumb();
-    } elseif (geodir_is_page('author')) {
-        jupiter_geodir_breadcrumb();
-    } else {
-        mk_theme_breadcrumbs();
-    }
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('listing')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('detail')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('search')) {
+		jupiter_geodir_breadcrumb();
+	} elseif (geodir_is_page('author')) {
+		jupiter_geodir_breadcrumb();
+	} else {
+		mk_theme_breadcrumbs();
+	}
 }
 
 /**
@@ -76,35 +76,35 @@ 
  */
 function gd_mk_page_title()
 {
-    global $wp;
-
-
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        jupiter_geodir_page_title();
-    } elseif (geodir_is_page('listing')) {
-        ob_start(); // Start buffering;
-        geodir_action_listings_title();
-        $gd_title = ob_get_clean();
-        $title_p = explode('">', $gd_title);
-        $title = str_replace('</h1></header>', "", $title_p[2]);
-        jupiter_geodir_page_title($title);
-    } elseif (geodir_is_page('search')) {
-        ob_start(); // Start buffering;
-        geodir_action_listings_title();
-        $gd_title = ob_get_clean();
-        $title_p = explode('">', $gd_title);
-        $title = str_replace('</h1></header>', "", $title_p[2]);
-        jupiter_geodir_page_title($title);
-    } elseif (geodir_is_page('author')) {
-        ob_start(); // Start buffering;
-        geodir_action_author_page_title();
-        $gd_title = ob_get_clean();
-        $gd_title = str_replace('<h1>', "", $gd_title);
-        $gd_title = str_replace('</h1>', "", $gd_title);
-        jupiter_geodir_page_title($gd_title);
-    } else {
-        mk_page_title();
-    }
+	global $wp;
+
+
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		jupiter_geodir_page_title();
+	} elseif (geodir_is_page('listing')) {
+		ob_start(); // Start buffering;
+		geodir_action_listings_title();
+		$gd_title = ob_get_clean();
+		$title_p = explode('">', $gd_title);
+		$title = str_replace('</h1></header>', "", $title_p[2]);
+		jupiter_geodir_page_title($title);
+	} elseif (geodir_is_page('search')) {
+		ob_start(); // Start buffering;
+		geodir_action_listings_title();
+		$gd_title = ob_get_clean();
+		$title_p = explode('">', $gd_title);
+		$title = str_replace('</h1></header>', "", $title_p[2]);
+		jupiter_geodir_page_title($title);
+	} elseif (geodir_is_page('author')) {
+		ob_start(); // Start buffering;
+		geodir_action_author_page_title();
+		$gd_title = ob_get_clean();
+		$gd_title = str_replace('<h1>', "", $gd_title);
+		$gd_title = str_replace('</h1>', "", $gd_title);
+		jupiter_geodir_page_title($gd_title);
+	} else {
+		mk_page_title();
+	}
 
 
 }
@@ -119,48 +119,48 @@ 
  */
 function jupiter_geodir_breadcrumb()
 {
-    $item = '';
-    ob_start(); // Start buffering;
-    geodir_breadcrumb();
-    $gd_crums = ob_get_clean();
-    if ($gd_crums) {
-        $gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums);
-        $gd_crums = str_replace('</li></ul></div>', "", $gd_crums);
-        $gd_crums = str_replace('&nbsp;>&nbsp;', " > ", $gd_crums);
-        $gd_crums = str_replace('</li><li>', "", $gd_crums);
-        $gd_crums = explode(" > ", $gd_crums);
-        $trail_end = array_pop($gd_crums);
-        $gd_crums['trail_end'] = $trail_end;
-        //print_r($gd_crums);exit;
-        //print_r($trail);
-        $item = $gd_crums;
-
-    }
-    if (!$item) {
-        return;
-    }
-    global $mk_options, $post;
-    $post_id = global_get_post_id();
-
-    if ($post_id) {
-        $local_skining = get_post_meta($post_id, '_enable_local_backgrounds', true);
-        $breadcrumb_skin = get_post_meta($post_id, '_breadcrumb_skin', true);
-        if ($local_skining == 'true' && !empty($breadcrumb_skin)) {
-            $breadcrumb_skin_class = $breadcrumb_skin;
-        } else {
-            $breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
-        }
-    } else {
-        $breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
-    }
-
-
-    $delimiter = ' &#47; ';
-
-    echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner ' . $breadcrumb_skin_class . '-skin">';
-
-    echo implode($delimiter, $item);
-    echo "</div></div>";
+	$item = '';
+	ob_start(); // Start buffering;
+	geodir_breadcrumb();
+	$gd_crums = ob_get_clean();
+	if ($gd_crums) {
+		$gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums);
+		$gd_crums = str_replace('</li></ul></div>', "", $gd_crums);
+		$gd_crums = str_replace('&nbsp;>&nbsp;', " > ", $gd_crums);
+		$gd_crums = str_replace('</li><li>', "", $gd_crums);
+		$gd_crums = explode(" > ", $gd_crums);
+		$trail_end = array_pop($gd_crums);
+		$gd_crums['trail_end'] = $trail_end;
+		//print_r($gd_crums);exit;
+		//print_r($trail);
+		$item = $gd_crums;
+
+	}
+	if (!$item) {
+		return;
+	}
+	global $mk_options, $post;
+	$post_id = global_get_post_id();
+
+	if ($post_id) {
+		$local_skining = get_post_meta($post_id, '_enable_local_backgrounds', true);
+		$breadcrumb_skin = get_post_meta($post_id, '_breadcrumb_skin', true);
+		if ($local_skining == 'true' && !empty($breadcrumb_skin)) {
+			$breadcrumb_skin_class = $breadcrumb_skin;
+		} else {
+			$breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
+		}
+	} else {
+		$breadcrumb_skin_class = $mk_options['breadcrumb_skin'];
+	}
+
+
+	$delimiter = ' &#47; ';
+
+	echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner ' . $breadcrumb_skin_class . '-skin">';
+
+	echo implode($delimiter, $item);
+	echo "</div></div>";
 
 }
 
@@ -174,41 +174,41 @@ 
  */
 function jupiter_geodir_page_title($title = '', $subtitle = '')
 {
-    global $mk_options;
-
-    $post_id = global_get_post_id();
-    $shadow_css = '';
-    if ($mk_options['page_title_shadow'] == 'true') {
-        $shadow_css = 'mk-drop-shadow';
-    }
-
-    $align = !empty($align) ? $align : 'left';
-
-    //$title = 'xxxx';
-    echo '<section id="mk-page-introduce" class="intro-' . $align . '">';
-    echo '<div class="mk-grid">';
-    if (!empty($title)) {
-        echo '<h1 class="page-introduce-title ' . $shadow_css . '">' . $title . '</h1>';
-
-    }
-
-    if (!empty($subtitle)) {
-        echo '<div class="page-introduce-subtitle">';
-        echo $subtitle;
-        echo '</div>';
-    }
-    if ($mk_options['disable_breadcrumb'] == 'true') {
-        if (get_post_meta($post_id, '_disable_breadcrumb', true) != 'false') {
-            /**
-             * Calls the theme breadcrumbs for Jupiter theme.
-             *
-             * @since 1.4.0
-             */
-            do_action('theme_breadcrumbs', $post_id);
-        }
-    }
-
-    echo '<div class="clearboth"></div></div></section>';
+	global $mk_options;
+
+	$post_id = global_get_post_id();
+	$shadow_css = '';
+	if ($mk_options['page_title_shadow'] == 'true') {
+		$shadow_css = 'mk-drop-shadow';
+	}
+
+	$align = !empty($align) ? $align : 'left';
+
+	//$title = 'xxxx';
+	echo '<section id="mk-page-introduce" class="intro-' . $align . '">';
+	echo '<div class="mk-grid">';
+	if (!empty($title)) {
+		echo '<h1 class="page-introduce-title ' . $shadow_css . '">' . $title . '</h1>';
+
+	}
+
+	if (!empty($subtitle)) {
+		echo '<div class="page-introduce-subtitle">';
+		echo $subtitle;
+		echo '</div>';
+	}
+	if ($mk_options['disable_breadcrumb'] == 'true') {
+		if (get_post_meta($post_id, '_disable_breadcrumb', true) != 'false') {
+			/**
+			 * Calls the theme breadcrumbs for Jupiter theme.
+			 *
+			 * @since 1.4.0
+			 */
+			do_action('theme_breadcrumbs', $post_id);
+		}
+	}
+
+	echo '<div class="clearboth"></div></div></section>';
 
 
 }

Spacing +3 added lines, -3 removed lines

@@ -157,7 +157,7 @@ 
 
     $delimiter = ' / ';
 
-    echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner ' . $breadcrumb_skin_class . '-skin">';
+    echo '<div id="mk-breadcrumbs"><div class="mk-breadcrumbs-inner '.$breadcrumb_skin_class.'-skin">';
 
     echo implode($delimiter, $item);
     echo "</div></div>";
@@ -185,10 +185,10 @@ 
     $align = !empty($align) ? $align : 'left';
 
     //$title = 'xxxx';
-    echo '<section id="mk-page-introduce" class="intro-' . $align . '">';
+    echo '<section id="mk-page-introduce" class="intro-'.$align.'">';
     echo '<div class="mk-grid">';
     if (!empty($title)) {
-        echo '<h1 class="page-introduce-title ' . $shadow_css . '">' . $title . '</h1>';
+        echo '<h1 class="page-introduce-title '.$shadow_css.'">'.$title.'</h1>';
 
     }
 

geodirectory-templates/popup-forms.php

Indentation +76 added lines, -76 removed lines

@@ -29,23 +29,23 @@ 
             <input type="hidden" id="send_to_Frnd_pid" name="pid" value="<?php echo $post_info->ID;?>"/>
 
             <h3><?php
-                /**
-                 * Filter the title for the send to friend popup form.
-                 *
-                 * @since 1.0.0
-                 * @param string $title The title for the form, defaults to global `SEND_TO_FRIEND` text.
-                 */
-                echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND);?></h3>
+				/**
+				 * Filter the title for the send to friend popup form.
+				 *
+				 * @since 1.0.0
+				 * @param string $title The title for the form, defaults to global `SEND_TO_FRIEND` text.
+				 */
+				echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND);?></h3>
 
             <p id="reply_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
-            /**
-             * Called before each field in the send to friend popup template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called before.
-             */
-            do_action('geodir_before_stf_form_field', 'to_name');?>
+			/**
+			 * Called before each field in the send to friend popup template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called before.
+			 */
+			do_action('geodir_before_stf_form_field', 'to_name');?>
             <div class="row clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Friend Name', 'geodirectory');?> : <span>*</span></label></div>
@@ -54,16 +54,16 @@ 
                     <span class="message_error2" id="to_nameInfo"></span></div>
             </div>
             <?php
-            /**
-             * Called after each field in the send to friend popup template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called after.
-             */
-            do_action('geodir_after_stf_form_field', 'to_name');?>
+			/**
+			 * Called after each field in the send to friend popup template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called after.
+			 */
+			do_action('geodir_after_stf_form_field', 'to_name');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'to_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'to_email');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label> <?php _e('Email', 'geodirectory');?> : <span>*</span></label></div>
@@ -72,11 +72,11 @@ 
                     <span class="message_error2" id="to_emailInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'to_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'to_email');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'yourname');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'yourname');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Your Name', 'geodirectory');?> : <span>*</span></label></div>
@@ -85,11 +85,11 @@ 
                     <span class="message_error2" id="yournameInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'yourname');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'yourname');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'youremail');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'youremail');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label> <?php _e('Email', 'geodirectory');?> : <span>*</span></label></div>
@@ -98,11 +98,11 @@ 
                     <span class="message_error2" id="youremailInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'youremail');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'youremail');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_subject');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'frnd_subject');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Subject', 'geodirectory');?> : <span>*</span></label></div>
@@ -113,11 +113,11 @@ 
                     <span class="message_error2" id="frnd_subjectInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_subject');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'frnd_subject');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_comments');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_stf_form_field', 'frnd_comments');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Comments', 'geodirectory');?> : <span>*</span></label></div>
@@ -127,11 +127,11 @@ 
                     <span class="message_error2" id="frnd_commentsInfo"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_comments');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_stf_form_field', 'frnd_comments');?>
             <?php if (function_exists('geodir_get_captch')) {
-                geodir_get_captch('-1');
-            }?>
+				geodir_get_captch('-1');
+			}?>
             <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory')?> " class="button "/>
         </form>
     </div> <?php
@@ -145,23 +145,23 @@ 
             <input type="hidden" name="pid" value="<?php echo $post_info->ID;?>"/>
 
             <h3><?php
-                /**
-                 * Filter the title for the send inquiry popup form.
-                 *
-                 * @since 1.0.0
-                 * @param string $title The title for the form, defaults to global `SEND_INQUIRY` text.
-                 */
-                echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY);?> </h3>
+				/**
+				 * Filter the title for the send inquiry popup form.
+				 *
+				 * @since 1.0.0
+				 * @param string $title The title for the form, defaults to global `SEND_INQUIRY` text.
+				 */
+				echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY);?> </h3>
 
             <p id="inquiry_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
-            /**
-             * Called before each field in the send to friend inquiry template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called before.
-             */
-            do_action('geodir_before_inquiry_form_field', 'inq_name');?>
+			/**
+			 * Called before each field in the send to friend inquiry template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called before.
+			 */
+			do_action('geodir_before_inquiry_form_field', 'inq_name');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading"><label><?php _e('Your Name', 'geodirectory');?> :
                         <span>*</span></label></div>
@@ -170,16 +170,16 @@ 
                     <span class="message_error2" id="span_agt_mail_name"></span></div>
             </div>
             <?php
-            /**
-             * Called after each field in the send to friend inquiry template.
-             *
-             * @since 1.0.0
-             * @param string $field The field name the actions is called after.
-             */
-            do_action('geodir_after_inquiry_form_field', 'inq_name');?>
+			/**
+			 * Called after each field in the send to friend inquiry template.
+			 *
+			 * @since 1.0.0
+			 * @param string $field The field name the actions is called after.
+			 */
+			do_action('geodir_after_inquiry_form_field', 'inq_name');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_inquiry_form_field', 'inq_email');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Email', 'geodirectory');?> : <span>*</span></label></div>
@@ -189,11 +189,11 @@ 
                 </div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_email');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_inquiry_form_field', 'inq_email');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_phone');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_inquiry_form_field', 'inq_phone');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Contact Info', 'geodirectory');?> :</label></div>
@@ -202,11 +202,11 @@ 
                 </div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_phone');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_inquiry_form_field', 'inq_phone');?>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_msg');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_before_inquiry_form_field', 'inq_msg');?>
             <div class="row  clearfix">
                 <div class="geodir_popup_heading">
                     <label><?php _e('Comments', 'geodirectory');?> : <span>*</span></label></div>
@@ -216,8 +216,8 @@ 
                     <span class="message_error2" id="span_agt_mail_msg"></span></div>
             </div>
             <?php
-            /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_msg');?>
+			/** This action is documented in geodirectory-templates/popup-forms.php */
+			do_action('geodir_after_inquiry_form_field', 'inq_msg');?>
             <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory');?>"
                    class="button clearfix"/>
         </form>

Spacing +37 added lines, -37 removed lines

@@ -19,14 +19,14 @@ 
  * @param int $post_id The post id requested by the popup.
  * @param object $post_info The post object requested by the popup.
  */
-do_action('geodir_popup_forms_template_start',$post_id,$post_info);
+do_action('geodir_popup_forms_template_start', $post_id, $post_info);
 
 if ($_REQUEST['popuptype'] == 'b_sendtofriend') { ?>
 
     <div id="basic-modal-content" class="clearfix">
         <form name="send_to_frnd" id="send_to_frnd" action="<?php echo get_permalink($post_info->ID); ?>" method="post">
             <input type="hidden" name="sendact" value="email_frnd"/>
-            <input type="hidden" id="send_to_Frnd_pid" name="pid" value="<?php echo $post_info->ID;?>"/>
+            <input type="hidden" id="send_to_Frnd_pid" name="pid" value="<?php echo $post_info->ID; ?>"/>
 
             <h3><?php
                 /**
@@ -35,7 +35,7 @@ 
                  * @since 1.0.0
                  * @param string $title The title for the form, defaults to global `SEND_TO_FRIEND` text.
                  */
-                echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND);?></h3>
+                echo apply_filters('geodir_send_to_friend_page_title', SEND_TO_FRIEND); ?></h3>
 
             <p id="reply_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
@@ -45,9 +45,9 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called before.
              */
-            do_action('geodir_before_stf_form_field', 'to_name');?>
+            do_action('geodir_before_stf_form_field', 'to_name'); ?>
             <div class="row clearfix">
-                    <input required field_type="text" name="to_name" id="to_name" type="text" value="" placeholder="<?php _e('Friend Name', 'geodirectory');?>"/>
+                    <input required field_type="text" name="to_name" id="to_name" type="text" value="" placeholder="<?php _e('Friend Name', 'geodirectory'); ?>"/>
             </div>
             <?php
             /**
@@ -56,55 +56,55 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called after.
              */
-            do_action('geodir_after_stf_form_field', 'to_name');?>
+            do_action('geodir_after_stf_form_field', 'to_name'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'to_email');?>
+            do_action('geodir_before_stf_form_field', 'to_email'); ?>
             <div class="row  clearfix">
-                    <input required field_type="email" name="to_email" id="to_email" type="email" value="" placeholder="<?php _e('Friend Email', 'geodirectory');?>"/>
+                    <input required field_type="email" name="to_email" id="to_email" type="email" value="" placeholder="<?php _e('Friend Email', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'to_email');?>
+            do_action('geodir_after_stf_form_field', 'to_email'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'yourname');?>
+            do_action('geodir_before_stf_form_field', 'yourname'); ?>
             <div class="row  clearfix">
-                    <input required field_type="text" name="yourname" id="yourname" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory');?>"/>
+                    <input required field_type="text" name="yourname" id="yourname" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'yourname');?>
+            do_action('geodir_after_stf_form_field', 'yourname'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'youremail');?>
+            do_action('geodir_before_stf_form_field', 'youremail'); ?>
             <div class="row  clearfix">
-                    <input required field_type="email" name="youremail" id="youremail" type="email" value="" placeholder="<?php _e('Your Email', 'geodirectory');?>"/>
+                    <input required field_type="email" name="youremail" id="youremail" type="email" value="" placeholder="<?php _e('Your Email', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'youremail');?>
+            do_action('geodir_after_stf_form_field', 'youremail'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_subject');?>
+            do_action('geodir_before_stf_form_field', 'frnd_subject'); ?>
             <div class="row  clearfix">
                     <input required field_type="text" name="frnd_subject"
-                           value="<?php echo __('About', 'geodirectory') . ' ' . $post_info->post_title;?>"
-                           id="frnd_subject" type="text"  placeholder="<?php _e('Subject', 'geodirectory');?>"/>
+                           value="<?php echo __('About', 'geodirectory').' '.$post_info->post_title; ?>"
+                           id="frnd_subject" type="text"  placeholder="<?php _e('Subject', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_subject');?>
+            do_action('geodir_after_stf_form_field', 'frnd_subject'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_stf_form_field', 'frnd_comments');?>
+            do_action('geodir_before_stf_form_field', 'frnd_comments'); ?>
             <div class="row  clearfix">
                     <textarea required field_type="textarea" name="frnd_comments" id="frnd_comments" cols=""
-                              rows="" placeholder="<?php echo SEND_TO_FRIEND_SAMPLE_CONTENT;?>"><?php echo SEND_TO_FRIEND_SAMPLE_CONTENT;?></textarea>
+                              rows="" placeholder="<?php echo SEND_TO_FRIEND_SAMPLE_CONTENT; ?>"><?php echo SEND_TO_FRIEND_SAMPLE_CONTENT; ?></textarea>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_stf_form_field', 'frnd_comments');?>
+            do_action('geodir_after_stf_form_field', 'frnd_comments'); ?>
             <?php if (function_exists('geodir_get_captch')) {
                 geodir_get_captch('-1');
             }?>
@@ -118,7 +118,7 @@ 
         <form method="post" name="agt_mail_agent" id="agt_mail_agent"
               action="<?php echo get_permalink($post_info->ID); ?>">
             <input type="hidden" name="sendact" value="send_inqury"/>
-            <input type="hidden" name="pid" value="<?php echo $post_info->ID;?>"/>
+            <input type="hidden" name="pid" value="<?php echo $post_info->ID; ?>"/>
 
             <h3><?php
                 /**
@@ -127,7 +127,7 @@ 
                  * @since 1.0.0
                  * @param string $title The title for the form, defaults to global `SEND_INQUIRY` text.
                  */
-                echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY);?> </h3>
+                echo apply_filters('geodir_send_inquiry_page_title', SEND_INQUIRY); ?> </h3>
 
             <p id="inquiry_send_success" class="sucess_msg" style="display:none;"></p>
             <?php
@@ -137,9 +137,9 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called before.
              */
-            do_action('geodir_before_inquiry_form_field', 'inq_name');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_name'); ?>
             <div class="row  clearfix">
-                    <input required field_type="text" name="inq_name" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory');?>"/>
+                    <input required field_type="text" name="inq_name" type="text" value="" placeholder="<?php _e('Your Name', 'geodirectory'); ?>"/>
             </div>
             <?php
             /**
@@ -148,36 +148,36 @@ 
              * @since 1.0.0
              * @param string $field The field name the actions is called after.
              */
-            do_action('geodir_after_inquiry_form_field', 'inq_name');?>
+            do_action('geodir_after_inquiry_form_field', 'inq_name'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_email');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_email'); ?>
             <div class="row  clearfix">
-                    <input required field_type="email" name="inq_email" type="email" value="" placeholder="<?php _e('Email', 'geodirectory');?>"/>
+                    <input required field_type="email" name="inq_email" type="email" value="" placeholder="<?php _e('Email', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_email');?>
+            do_action('geodir_after_inquiry_form_field', 'inq_email'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_phone');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_phone'); ?>
             <div class="row  clearfix">
-                    <input name="inq_phone" id="agt_mail_phone" type="text" value="" placeholder="<?php _e('Phone number', 'geodirectory');?>"/>
+                    <input name="inq_phone" id="agt_mail_phone" type="text" value="" placeholder="<?php _e('Phone number', 'geodirectory'); ?>"/>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_phone');?>
+            do_action('geodir_after_inquiry_form_field', 'inq_phone'); ?>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_before_inquiry_form_field', 'inq_msg');?>
+            do_action('geodir_before_inquiry_form_field', 'inq_msg'); ?>
             <div class="row  clearfix">
                     <textarea required field_type="textarea" name="inq_msg" cols=""
-                              rows="" placeholder="<?php echo SEND_INQUIRY_SAMPLE_CONTENT;?>"></textarea>
+                              rows="" placeholder="<?php echo SEND_INQUIRY_SAMPLE_CONTENT; ?>"></textarea>
             </div>
             <?php
             /** This action is documented in geodirectory-templates/popup-forms.php */
-            do_action('geodir_after_inquiry_form_field', 'inq_msg');?>
-            <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory');?>"
+            do_action('geodir_after_inquiry_form_field', 'inq_msg'); ?>
+            <input name="Send" type="submit" value="<?php _e('Send', 'geodirectory'); ?>"
                    class="button clearfix"/>
         </form>
     </div> <?php

geodirectory-templates/add-listing.php

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 global $gd_session;
 
 if (!isset($_REQUEST['backandedit'])) {
-    $gd_session->un_set('listing');
+	$gd_session->un_set('listing');
 }
 // call header
 get_header();

geodirectory-templates/reg_frm.php

Indentation +39 added lines, -39 removed lines

@@ -9,13 +9,13 @@ 
  * @package GeoDirectory

  */

 if (isset($_GET['redirect_to']) && $_GET['redirect_to'] != '') {

-    $redirect_to = $_GET['redirect_to'];

+	$redirect_to = $_GET['redirect_to'];

 } else {

-    //echo $_SERVER['HTTP_HOST'] ;

-    $redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

-    if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

-        $redirect_to = home_url();

-    }

+	//echo $_SERVER['HTTP_HOST'] ;

+	$redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';

+	if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {

+		$redirect_to = home_url();

+	}

 }

 ?>

 <div id="sign_up">

@@ -26,28 +26,28 @@ 
         <h4>

             <?php

 

-            /**

-             * Filter the `REGISTRATION_NOW_TEXT` title text on the register form template.

-             *

-             * @since 1.0.0

-             */

-            echo apply_filters('geodir_registration_page_title', REGISTRATION_NOW_TEXT);

+			/**

+			 * Filter the `REGISTRATION_NOW_TEXT` title text on the register form template.

+			 *

+			 * @since 1.0.0

+			 */

+			echo apply_filters('geodir_registration_page_title', REGISTRATION_NOW_TEXT);

 

-            ?>

+			?>

         </h4>

         <?php

-        global $geodir_signup_error;

-        if ($geodir_signup_error != '') {

-            echo '<p class="error_msg">' . $geodir_signup_error . '</p>';

-            unset($geodir_signup_error);

-        } else {

-            if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 1) {

-                echo '<p class="error_msg">' . EMAIL_USERNAME_EXIST_MSG . '</p>';

-            } else if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'regnewusr') {

-                echo '<p class="error_msg">' . REGISTRATION_DESABLED_MSG . '</p>';

-            }

-        }

-        ?>

+		global $geodir_signup_error;

+		if ($geodir_signup_error != '') {

+			echo '<p class="error_msg">' . $geodir_signup_error . '</p>';

+			unset($geodir_signup_error);

+		} else {

+			if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 1) {

+				echo '<p class="error_msg">' . EMAIL_USERNAME_EXIST_MSG . '</p>';

+			} else if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'regnewusr') {

+				echo '<p class="error_msg">' . REGISTRATION_DESABLED_MSG . '</p>';

+			}

+		}

+		?>

 

         <form name="cus_registerform" id="cus_registerform"

               action="<?php echo htmlspecialchars(geodir_curPageURL()); ?>" method="post">

@@ -57,10 +57,10 @@ 
             <div class="form_row clearfix">

                 <input placeholder='<?php echo EMAIL_TEXT; ?>' type="text" name="user_email" id="user_email"

                        class="textfield" value="<?php global $user_email;

-                if (!isset($user_email)) {

-                    $user_email = '';

-                }

-                echo esc_attr(stripslashes($user_email)); ?>" size="25"/>

+				if (!isset($user_email)) {

+					$user_email = '';

+				}

+				echo esc_attr(stripslashes($user_email)); ?>" size="25"/>

 

                 <?php if (!get_option('geodir_allow_cpass')) { ?>

 				<div id="reg_passmail">

@@ -74,8 +74,8 @@ 
                 <div class="form_row clearfix">

                     <input placeholder='<?php echo FIRST_NAME_TEXT; ?>' type="text" name="user_fname" id="user_fname"

                            class="textfield" value="<?php if (isset($user_fname)) {

-                        echo esc_attr(stripslashes($user_fname));

-                    } ?>" size="25"/>

+						echo esc_attr(stripslashes($user_fname));

+					} ?>" size="25"/>

                     <span id="user_fnameInfo"></span>

                 </div>

             </div>

@@ -101,14 +101,14 @@ 
             <?php } ?>

 

             <?php

-            /**

-             * Called just before the register new user button on the register form template.

-             *

-             * Also used by other plugins to add social connect buttons.

-             *

-             * @since 1.0.0

-             */

-            do_action('social_connect_form'); ?>

+			/**

+			 * Called just before the register new user button on the register form template.

+			 *

+			 * Also used by other plugins to add social connect buttons.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('social_connect_form'); ?>

             <input type="submit" name="registernow" value="<?php echo REGISTER_NOW_TEXT; ?>" class="geodir_button"/>

         </form>

     </div>

Spacing +3 added lines, -3 removed lines

@@ -38,13 +38,13 @@
         <?php

         global $geodir_signup_error;

         if ($geodir_signup_error != '') {

-            echo '<p class="error_msg">' . $geodir_signup_error . '</p>';

+            echo '<p class="error_msg">'.$geodir_signup_error.'</p>';

             unset($geodir_signup_error);

         } else {

             if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 1) {

-                echo '<p class="error_msg">' . EMAIL_USERNAME_EXIST_MSG . '</p>';

+                echo '<p class="error_msg">'.EMAIL_USERNAME_EXIST_MSG.'</p>';

             } else if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'regnewusr') {

-                echo '<p class="error_msg">' . REGISTRATION_DESABLED_MSG . '</p>';

+                echo '<p class="error_msg">'.REGISTRATION_DESABLED_MSG.'</p>';

             }

         }

         ?>

geodirectory.php

Braces +27 added lines, -9 removed lines

@@ -76,29 +76,45 @@ 
 /**

  * Do not store any revisions (except the one autosave per post).

  */

-if (!defined('WP_POST_REVISIONS')) define('WP_POST_REVISIONS', 0);

+if (!defined('WP_POST_REVISIONS')) {
+	define('WP_POST_REVISIONS', 0);
+}
 

 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if(!defined('GEODIRECTORY_PLUGIN_DIR')) {
+	define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
+}
 

 /*

  * Declare database table names. All since version 1.0.0

  */

 

 /** Define the database name for the countries table. */

-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');

+if (!defined('GEODIR_COUNTRIES_TABLE')) {
+	define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
+}
 /** Define the database name for the custom fields table. */

-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');

+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) {
+	define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
+}
 /** Define the database name for the icons table. */

-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');

+if (!defined('GEODIR_ICON_TABLE')) {
+	define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
+}
 /** Define the database name for the attachments table. */

-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');

+if (!defined('GEODIR_ATTACHMENT_TABLE')) {
+	define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
+}
 /** Define the database name for the review table. */

-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');

+if (!defined('GEODIR_REVIEW_TABLE')) {
+	define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
+}
 /** Define the database name for the custom sort fields table. */

-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');

+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) {
+	define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
+}
 

 

 if ($_SERVER['REQUEST_URI'] == '' || $_SERVER['REQUEST_URI'] == '/') {

@@ -113,7 +129,9 @@ 
 /*

  * Localisation items.

  */

-if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

+if (!defined('GEODIRECTORY_TEXTDOMAIN')) {
+	define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
+}
 

 // Load geodirectory plugin textdomain.

 add_action( 'plugins_loaded', 'geodir_load_textdomain' );

Indentation +79 added lines, -79 removed lines

@@ -31,30 +31,30 @@ 
  * CHECK FOR OLD COMPATIBILITY PACKS AND DISABLE IF THEY ARE ACTIVE

  */

 if (is_admin()) {

-    /**

-     * Include WordPress core file so we can use core functions to check for active plugins.

-     */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+	/**

+	 * Include WordPress core file so we can use core functions to check for active plugins.

+	 */

+	include_once(ABSPATH . 'wp-admin/includes/plugin.php');

 

-    if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

-        deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

+		deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

-        deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

+		deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

-        deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

+		deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

-        deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

-    }

+	if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

+		deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

-        deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

-    }

+	if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

+		deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

+	}

 

 }

 

@@ -122,19 +122,19 @@ 
  * @package GeoDirectory

  */

 function geodir_error_log($log){

-    /*

+	/*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

-        } else {

-            error_log( $log );

-        }

-    }

+	$should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

+	if ( true === $should_log ) {

+		if ( is_array( $log ) || is_object( $log ) ) {

+			error_log( print_r( $log, true ) );

+		} else {

+			error_log( $log );

+		}

+	}

 }

 /**

  * Include all plugin functions.

@@ -173,61 +173,61 @@ 
  */

 if (is_admin() || defined( 'GD_TESTING_MODE' )) {

 

-    /**

-     * Include functions used in admin area only.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_functions.php');

-    /**

-     * Most actions/hooks used in admin area only are called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_hooks_actions.php');

-    /**

-     * Most admin JS and CSS is called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_template_tags.php');

-    /**

-     * Include any functions needed for upgrades.

-     *

-     * @since 1.0.0

-     */

-    require_once(geodir_plugin_path() . '/upgrade.php');

-    if (get_option('geodir_installed') != 1) {

-        /**

-         * Define language constants, here as they are not loaded yet.

-         *

-         * @since 1.0.0

-         */

-        require_once(geodir_plugin_path() . '/language.php');

-        /**

-         * Include the plugin install file that sets up the databases and any options on first run.

-         *

-         * @since 1.0.0

-         */

-        require_once('geodirectory-admin/admin_install.php');

-        register_activation_hook(__FILE__, 'geodir_activation');

-    }

-    register_deactivation_hook(__FILE__, 'geodir_deactivation');

-    register_uninstall_hook(__FILE__, 'geodir_uninstall');

-

-    /*

+	/**

+	 * Include functions used in admin area only.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_functions.php');

+	/**

+	 * Most actions/hooks used in admin area only are called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_hooks_actions.php');

+	/**

+	 * Most admin JS and CSS is called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_template_tags.php');

+	/**

+	 * Include any functions needed for upgrades.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once(geodir_plugin_path() . '/upgrade.php');

+	if (get_option('geodir_installed') != 1) {

+		/**

+		 * Define language constants, here as they are not loaded yet.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once(geodir_plugin_path() . '/language.php');

+		/**

+		 * Include the plugin install file that sets up the databases and any options on first run.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once('geodirectory-admin/admin_install.php');

+		register_activation_hook(__FILE__, 'geodir_activation');

+	}

+	register_deactivation_hook(__FILE__, 'geodir_deactivation');

+	register_uninstall_hook(__FILE__, 'geodir_uninstall');

+

+	/*

      * Show a upgrade warning message if applicable.

      *

      * @since 1.5.6

      */

-    global $pagenow;

+	global $pagenow;

    if ( 'plugins.php' === $pagenow )

-    {

-        // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

-        $hook = "in_plugin_update_message-{$folder}/{$file}";

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

-    }

+	{

+		// Better update message

+		$file   = basename( __FILE__ );

+		$folder = basename( dirname( __FILE__ ) );

+		$hook = "in_plugin_update_message-{$folder}/{$file}";

+		add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+	}

 

 }

Spacing +24 added lines, -24 removed lines

@@ -34,7 +34,7 @@ 
     /**

      * Include WordPress core file so we can use core functions to check for active plugins.

      */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+    include_once(ABSPATH.'wp-admin/includes/plugin.php');

 

     if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

         deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

@@ -68,8 +68,8 @@ 
  * @global string $plugin_file_name Base file name. 'geodirectory/geodirectory.php'.

  */

 global $wpdb, $plugin_prefix, $geodir_addon_list, $plugin_file_name;

-$plugin_prefix = $wpdb->prefix . 'geodir_';

-$plugin_file_name = basename(plugin_dir_path(__FILE__)) . '/' . basename(__FILE__);

+$plugin_prefix = $wpdb->prefix.'geodir_';

+$plugin_file_name = basename(plugin_dir_path(__FILE__)).'/'.basename(__FILE__);

 

 /*

  * This will store the cached post custom fields per package for each page load so not to run for each listing.

@@ -84,24 +84,24 @@ 
 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if (!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path(__FILE__));

 

 /*

  * Declare database table names. All since version 1.0.0

  */

 

 /** Define the database name for the countries table. */

-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');

+if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix.'countries');

 /** Define the database name for the custom fields table. */

-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');

+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix.'custom_fields');

 /** Define the database name for the icons table. */

-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');

+if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix.'post_icon');

 /** Define the database name for the attachments table. */

-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');

+if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix.'attachments');

 /** Define the database name for the review table. */

-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');

+if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix.'post_review');

 /** Define the database name for the custom sort fields table. */

-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');

+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix.'custom_sort_fields');

 

 

 /*

@@ -110,7 +110,7 @@ 
 if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

 

 // Load geodirectory plugin textdomain.

-add_action( 'init', 'geodir_load_textdomain' );

+add_action('init', 'geodir_load_textdomain');

 

 /*

  * A function to log GD errors no matter the type given.

@@ -121,18 +121,18 @@ 
  * @param mixed $log The thing that should be logged.

  * @package GeoDirectory

  */

-function geodir_error_log($log){

+function geodir_error_log($log) {

     /*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

+    $should_log = apply_filters('geodir_log_errors', WP_DEBUG);

+    if (true === $should_log) {

+        if (is_array($log) || is_object($log)) {

+            error_log(print_r($log, true));

         } else {

-            error_log( $log );

+            error_log($log);

         }

     }

 }

@@ -171,7 +171,7 @@ 
 /*

  * Admin init + activation hooks

  */

-if (is_admin() || defined( 'GD_TESTING_MODE' )) {

+if (is_admin() || defined('GD_TESTING_MODE')) {

 

     /**

      * Include functions used in admin area only.

@@ -196,14 +196,14 @@ 
      *

      * @since 1.0.0

      */

-    require_once(geodir_plugin_path() . '/upgrade.php');

+    require_once(geodir_plugin_path().'/upgrade.php');

     if (get_option('geodir_installed') != 1) {

         /**

          * Define language constants, here as they are not loaded yet.

          *

          * @since 1.0.0

          */

-        require_once(geodir_plugin_path() . '/language.php');

+        require_once(geodir_plugin_path().'/language.php');

         /**

          * Include the plugin install file that sets up the databases and any options on first run.

          *

@@ -221,13 +221,13 @@ 
      * @since 1.5.6

      */

     global $pagenow;

-   if ( 'plugins.php' === $pagenow )

+   if ('plugins.php' === $pagenow)

     {

         // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

+        $file   = basename(__FILE__);

+        $folder = basename(dirname(__FILE__));

         $hook = "in_plugin_update_message-{$folder}/{$file}";

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+        add_action($hook, 'geodire_admin_upgrade_notice', 20, 2);

     }

 

 }

geodirectory-functions/map-functions/map_functions.php

Braces +3 added lines, -2 removed lines

@@ -235,8 +235,9 @@
 

         return $out;

     } else {

-        if ($cat_parent == 0)

-            return _e('No category', 'geodirectory');

+        if ($cat_parent == 0) {
+                    return _e('No category', 'geodirectory');
+        }
     }

     return;

 }

Spacing +24 added lines, -24 removed lines

@@ -64,7 +64,7 @@ 
         $title = str_replace($srcharr, $replarr, $post_title);

 

         if (is_ssl()) {

-            $icon = str_replace("http:","https:",$icon );

+            $icon = str_replace("http:", "https:", $icon);

         }

         

         if ($icon != '') {

@@ -80,7 +80,7 @@ 
             $icon_size = array('w' => 36, 'h' => 45);

         }

 

-        $post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';

+        $post_json = '{"id":"'.$post->ID.'","t": "'.$title.'","lt": "'.$post->post_latitude.'","ln": "'.$post->post_longitude.'","mk_id":"'.$post->ID.'_'.$post->default_category.'","i":"'.$icon.'","w":"'.$icon_size['w'].'","h":"'.$icon_size['h'].'"}';

 

         /**

          * Filter the json data when creating output for post json marker..

@@ -89,7 +89,7 @@ 
          * @param string $post_json JSON representation of the post marker info.

          * @param object $post The post object.

          */

-        $map_jason[] = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);

+        $map_jason[] = apply_filters('geodir_create_marker_jason_of_posts', $post_json, $post);

     }

 }

 

@@ -109,7 +109,7 @@ 
         foreach ($map_canvas_arr as $canvas => $jason) {

             if (is_array($map_jason) && !empty($map_jason)) {

 

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

@@ -117,12 +117,12 @@ 
                 if (!empty($cat_content_info)) {

                     $json_content = substr(implode(',', $cat_content_info), 1);

                     $json_content = htmlentities($json_content, ENT_QUOTES); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016

-                    $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.

@@ -134,12 +134,12 @@ 
                  * @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.

@@ -151,8 +151,8 @@ 
                  * @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);

             }

         }

 

@@ -214,11 +214,11 @@ 
         }

 

 

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

         $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : $geodir_default_map_search_pt;

         foreach ($cat_terms as $cat_term):

 

@@ -232,16 +232,16 @@ 
 

                 // Untick the category by default on home map

                 if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {

-                    if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $cat_term->term_id, $geodir_home_map_untick)) {

+                    if (!empty($geodir_home_map_untick) && in_array($post_type.'_'.$cat_term->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(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="' . ucfirst($cat_term->name) . '"/>';

-                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-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(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="'.ucfirst($cat_term->name).'"/>';

+                $out .= '<li>'.$term_check.'<label for="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'">'.$term_img.ucfirst($cat_term->name).'</label><i class="fa fa-long-arrow-down"></i>';

 

             endif;

 

@@ -353,11 +353,11 @@ 
  * @package GeoDirectory

  */

 function geodir_map_load_style() {    

-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

+    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is('geodirectory-googlemap-script', 'done')) {

 ?>

 <script type="text/javascript">

 if (!(window.google && typeof google.maps !== 'undefined')) {

-    document.write('<' + 'link id="geodirectory-leaflet-style-css" media="all" type="text/css" href="<?php echo geodir_plugin_url();?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION;?>" rel="stylesheet"' + '>');

+    document.write('<' + 'link id="geodirectory-leaflet-style-css" media="all" type="text/css" href="<?php echo geodir_plugin_url(); ?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION; ?>" rel="stylesheet"' + '>');

 }

 </script>

 <?php

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

  */

 function geodir_map_load_script() {

-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

+    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is('geodirectory-googlemap-script', 'done')) {

 ?>

 <script type="text/javascript">

 if (!(window.google && typeof google.maps !== 'undefined')) {

-    document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo geodir_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 geodir_plugin_url();?>/geodirectory-assets/leaflet/osm.geocode.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');

+    document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo geodir_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 geodir_plugin_url(); ?>/geodirectory-assets/leaflet/osm.geocode.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');

 }

 </script>

 <?php

Indentation +197 added lines, -197 removed lines

@@ -15,8 +15,8 @@ 
  */

 function  geodir_init_map_jason()

 {

-    global $map_jason;

-    $map_jason = array();

+	global $map_jason;

+	$map_jason = array();

 }

 

 /**

@@ -28,8 +28,8 @@ 
  */

 function geodir_init_map_canvas_array()

 {

-    global $map_canvas_arr;

-    $map_canvas_arr = array();

+	global $map_canvas_arr;

+	$map_canvas_arr = array();

 }

 

 

@@ -50,47 +50,47 @@ 
  */

 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) && $post->marker_json != '') {

-        $srcharr = array("'", "/", "-", '"', '\\');

-        $replarr = array("′", "⁄", "–", "“", '');

+	if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {

+		$srcharr = array("'", "/", "-", '"', '\\');

+		$replarr = array("′", "⁄", "–", "“", '');

 

 

-        $geodir_cat_icons = geodir_get_term_icon();

-        $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : '';

+		$geodir_cat_icons = geodir_get_term_icon();

+		$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->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_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->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.

-         */

-        $map_jason[] = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);

-    }

+			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_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->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.

+		 */

+		$map_jason[] = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);

+	}

 }

 

 /**

@@ -103,59 +103,59 @@ 
  */

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

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

-                    $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)) {

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

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

+			}

+		}

+

+	}

 }

 

 /**

@@ -174,92 +174,92 @@ 
  */

 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;

+	global $cat_count, $geodir_cat_icons;

 

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

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

-        foreach ($cat_terms as $cat_term):

+		$geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';

+		$post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : $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] : '';

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

+			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 (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $cat_term->term_id, $geodir_home_map_untick)) {

-                        $checked = '';

-                    }

-                }

+				// Untick the category by default on home map

+				if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {

+					if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $cat_term->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(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="' . ucfirst($cat_term->name) . '"/>';

-                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-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(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="' . ucfirst($cat_term->name) . '"/>';

+				$out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';

 

-            endif;

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

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

+			$out .= '</li>';

 

-        endforeach;

+		endforeach;

 

-        $out .= '</ul>';

+		$out .= '</ul>';

 

-        return $out;

-    } else {

-        if ($cat_parent == 0)

-            return _e('No category', 'geodirectory');

-    }

-    return;

+		return $out;

+	} else {

+		if ($cat_parent == 0)

+			return _e('No category', 'geodirectory');

+	}

+	return;

 }

 

 /**

@@ -271,19 +271,19 @@ 
  * @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);

 }

 

 /**

@@ -299,48 +299,48 @@ 
  * @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_head', 'geodir_map_load_style', 10);

@@ -352,7 +352,7 @@ 
  * @package GeoDirectory

  */

 function geodir_map_load_style() {    

-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

+	if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

 ?>

 <script type="text/javascript">

 if (!(window.google && typeof google.maps !== 'undefined')) {

@@ -360,7 +360,7 @@ 
 }

 </script>

 <?php

-    }

+	}

 }

 

 add_action('wp_footer', 'geodir_map_load_script', 10);

@@ -372,7 +372,7 @@ 
  * @package GeoDirectory

  */

 function geodir_map_load_script() {

-    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

+	if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {

 ?>

 <script type="text/javascript">

 if (!(window.google && typeof google.maps !== 'undefined')) {

@@ -381,5 +381,5 @@ 
 }

 </script>

 <?php

-    }

+	}

 }
\ No newline at end of file

geodirectory-widgets/listing_map_widget.php

Braces +6 added lines, -3 removed lines

@@ -198,7 +198,9 @@ 
                 $mapview = $maptype;

             }

 

-            if (empty($mapzoom)) $mapzoom = $zoom;

+            if (empty($mapzoom)) {
+            	$mapzoom = $zoom;
+            }
 

             // Set default map options

             $map_args['ajax_url'] = geodir_get_ajax_url();

@@ -326,8 +328,9 @@ 
 

                     foreach ($map_zoom_level as $level) {

                         $selected = '';

-                        if ($level == $zoom)

-                            $selected = 'selected="selected"';

+                        if ($level == $zoom) {
+                                                    $selected = 'selected="selected"';
+                        }
 

                         echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';

 

Spacing +8 added lines, -8 removed lines

@@ -45,7 +45,7 @@ 
          * @param string $post->marker_json JSON representation of the post marker info.

          * @param object $post The post object.

          */

-        $list_map_json[] = apply_filters('geodir_create_list_jsondata',$post->marker_json,$post);

+        $list_map_json[] = apply_filters('geodir_create_list_jsondata', $post->marker_json, $post);

     }

 

 }

@@ -72,7 +72,7 @@ 
     if (!empty($cat_content_info)) {

         $json_content = substr(implode(',', $cat_content_info), 1);

         $json_content = htmlentities($json_content, ENT_QUOTES); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016

-        $list_json = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

+        $list_json = '[{"totalcount":"'.$totalcount.'",'.$json_content.']';

     } else {

         $list_json = '[{"totalcount":"0"}]';

     }

@@ -160,8 +160,8 @@ 
 			 *

              * @param bool $display true if map should be displayed, false if not.

              */

-			$show_map = apply_filters( 'geodir_show_map_listing', $display = true );

-			if ( !$show_map ) {

+			$show_map = apply_filters('geodir_show_map_listing', $display = true);

+			if (!$show_map) {

 				return;

 			}

 

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

     {

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'sticky' => '', 'scrollwheel' => '0', 'showall' => '0'));

+        $instance = wp_parse_args((array) $instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'sticky' => '', 'scrollwheel' => '0', 'showall' => '0'));

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

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

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

@@ -306,7 +306,7 @@ 
                     <option <?php if (isset($maptype) && $maptype == 'HYBRID') {

                         echo 'selected="selected"';

                     } ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>

-					<option <?php selected($maptype, 'TERRAIN');?> 

+					<option <?php selected($maptype, 'TERRAIN'); ?> 

 							value="TERRAIN"><?php _e('Terrain Map', 'geodirectory'); ?></option>

                 </select>

             </label>

@@ -329,7 +329,7 @@ 
                         if ($level == $zoom)

                             $selected = 'selected="selected"';

 

-                        echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';

+                        echo '<option '.$selected.' value="'.$level.'">'.$level.'</option>';

 

                     } ?>

 

@@ -364,7 +364,7 @@ 
                 :

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

                        name="<?php echo $this->get_field_name('scrollwheel'); ?>" type="checkbox" value="1"

-                       <?php if ($scrollwheel){ ?>checked="checked" <?php } ?> />

+                       <?php if ($scrollwheel) { ?>checked="checked" <?php } ?> />

             </label>

         </p>

 

Indentation +183 added lines, -183 removed lines

@@ -18,9 +18,9 @@ 
  */

 function init_listing_map_script()

 {

-    global $list_map_json;

+	global $list_map_json;

 

-    $list_map_json = array();

+	$list_map_json = array();

 

 }

 

@@ -35,18 +35,18 @@ 
  */

 function create_list_jsondata($post)

 {

-    global $wpdb, $list_map_json, $add_post_in_marker_array;

-

-    if ((is_main_query() || $add_post_in_marker_array) && isset($post->marker_json) && $post->marker_json != '') {

-        /**

-         * Filter the json data for search listing map.

-         *

-         * @since 1.5.7

-         * @param string $post->marker_json JSON representation of the post marker info.

-         * @param object $post The post object.

-         */

-        $list_map_json[] = apply_filters('geodir_create_list_jsondata',$post->marker_json,$post);

-    }

+	global $wpdb, $list_map_json, $add_post_in_marker_array;

+

+	if ((is_main_query() || $add_post_in_marker_array) && isset($post->marker_json) && $post->marker_json != '') {

+		/**

+		 * Filter the json data for search listing map.

+		 *

+		 * @since 1.5.7

+		 * @param string $post->marker_json JSON representation of the post marker info.

+		 * @param object $post The post object.

+		 */

+		$list_map_json[] = apply_filters('geodir_create_list_jsondata',$post->marker_json,$post);

+	}

 

 }

 

@@ -59,28 +59,28 @@ 
  */

 function show_listing_widget_map()

 {

-    global $list_map_json;

+	global $list_map_json;

 

-    if (!empty($list_map_json)) {

-        $list_map_json = array_unique($list_map_json);

-        $cat_content_info[] = implode(',', $list_map_json);

-    }

+	if (!empty($list_map_json)) {

+		$list_map_json = array_unique($list_map_json);

+		$cat_content_info[] = implode(',', $list_map_json);

+	}

 

-    $totalcount = count(array_unique($list_map_json));

+	$totalcount = count(array_unique($list_map_json));

 

 

-    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

-        $list_json = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

-    } else {

-        $list_json = '[{"totalcount":"0"}]';

-    }

+	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

+		$list_json = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';

+	} else {

+		$list_json = '[{"totalcount":"0"}]';

+	}

 

-    $listing_map_args = array('list_json' => $list_json);

+	$listing_map_args = array('list_json' => $list_json);

 

-    // Pass the json data in listing map script

-    wp_localize_script('geodir-listing-map-widget', 'listing_map_args', $listing_map_args);

+	// Pass the json data in listing map script

+	wp_localize_script('geodir-listing-map-widget', 'listing_map_args', $listing_map_args);

 

 }

 

@@ -92,184 +92,184 @@ 
 class geodir_map_listingpage extends WP_Widget

 {

 

-    /**

+	/**

 	 * Register the listing page map widget.

 	 *

 	 * @since 1.0.0

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

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

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'widget geodir-map-listing-page', 'description' => __('Google Map for Listing page. It will show you google map V3 for Listing page.', 'geodirectory'));

-        parent::__construct(

-            'geodir_map_v3_listing_map', // Base ID

-            __('GD > GMap - Listing page', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

+	public function __construct() {

+		$widget_ops = array('classname' => 'widget geodir-map-listing-page', 'description' => __('Google Map for Listing page. It will show you google map V3 for Listing page.', 'geodirectory'));

+		parent::__construct(

+			'geodir_map_v3_listing_map', // Base ID

+			__('GD > GMap - Listing page', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

 

-        add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array

+		add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array

 

-        add_action('the_post', 'create_list_jsondata'); // Add marker in json array

+		add_action('the_post', 'create_list_jsondata'); // Add marker in json array

 

-        add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers

-    }

+		add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers

+	}

 

 	/**

 	 * Front-end display content for listing page map widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

+	 *

+	 * @global object $post The current post object.

 	 *

-     * @global object $post The current post object.

-     *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

-    public function widget($args, $instance)

-    {

-

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

-            || geodir_is_page('detail')

-        ) :

-

-            extract($args, EXTR_SKIP);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $width = empty($instance['width']) ? '294' : apply_filters('widget_width', $instance['width']);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $height = empty($instance['heigh']) ? '370' : apply_filters('widget_heigh', $instance['heigh']);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $maptype = empty($instance['maptype']) ? 'ROADMAP' : apply_filters('widget_maptype', $instance['maptype']);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $zoom = empty($instance['zoom']) ? '13' : apply_filters('widget_zoom', $instance['zoom']);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $autozoom = empty($instance['autozoom']) ? '' : apply_filters('widget_autozoom', $instance['autozoom']);

-            /**

-             * Filter the listing map value widget_sticky, to set if the map should be sticky or not (scroll with page).

-             *

-             * @since 1.0.0

-             * @param bool $sticky True if should be sticky, false if not

-             */

-            $sticky = empty($instance['sticky']) ? '' : apply_filters('widget_sticky', $instance['sticky']);

-            /** This action is documented in geodirectory_shortcodes.php */

-            $scrollwheel = empty($instance['scrollwheel']) ? '0' : apply_filters('widget_scrollwheel', $instance['scrollwheel']);

-            $showall = empty($instance['showall']) ? '0' : apply_filters('widget_showall', $instance['showall']);

+	public function widget($args, $instance)

+	{

+

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

+			|| geodir_is_page('detail')

+		) :

+

+			extract($args, EXTR_SKIP);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$width = empty($instance['width']) ? '294' : apply_filters('widget_width', $instance['width']);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$height = empty($instance['heigh']) ? '370' : apply_filters('widget_heigh', $instance['heigh']);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$maptype = empty($instance['maptype']) ? 'ROADMAP' : apply_filters('widget_maptype', $instance['maptype']);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$zoom = empty($instance['zoom']) ? '13' : apply_filters('widget_zoom', $instance['zoom']);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$autozoom = empty($instance['autozoom']) ? '' : apply_filters('widget_autozoom', $instance['autozoom']);

+			/**

+			 * Filter the listing map value widget_sticky, to set if the map should be sticky or not (scroll with page).

+			 *

+			 * @since 1.0.0

+			 * @param bool $sticky True if should be sticky, false if not

+			 */

+			$sticky = empty($instance['sticky']) ? '' : apply_filters('widget_sticky', $instance['sticky']);

+			/** This action is documented in geodirectory_shortcodes.php */

+			$scrollwheel = empty($instance['scrollwheel']) ? '0' : apply_filters('widget_scrollwheel', $instance['scrollwheel']);

+			$showall = empty($instance['showall']) ? '0' : apply_filters('widget_showall', $instance['showall']);

 			

 			/**

-             * Filter the listing map should to be displayed or not.

-             *

-             * @since 1.4.6

+			 * Filter the listing map should to be displayed or not.

 			 *

-             * @param bool $display true if map should be displayed, false if not.

-             */

+			 * @since 1.4.6

+			 *

+			 * @param bool $display true if map should be displayed, false if not.

+			 */

 			$show_map = apply_filters( 'geodir_show_map_listing', $display = true );

 			if ( !$show_map ) {

 				return;

 			}

 

-            $map_args = array();

-            $map_args['map_canvas_name'] = str_replace('-', '_', $args['widget_id']);

-            $map_args['width'] = $width;

-            $map_args['height'] = $height;

-

-            $map_args['scrollwheel'] = $scrollwheel;

-            $map_args['showall'] = $showall;

-            $map_args['child_collapse'] = '0';

-            $map_args['sticky'] = $sticky;

-            $map_args['enable_cat_filters'] = false;

-            $map_args['enable_text_search'] = false;

-            $map_args['enable_post_type_filters'] = false;

-            $map_args['enable_location_filters'] = false;

-            $map_args['enable_jason_on_load'] = true;

+			$map_args = array();

+			$map_args['map_canvas_name'] = str_replace('-', '_', $args['widget_id']);

+			$map_args['width'] = $width;

+			$map_args['height'] = $height;

+

+			$map_args['scrollwheel'] = $scrollwheel;

+			$map_args['showall'] = $showall;

+			$map_args['child_collapse'] = '0';

+			$map_args['sticky'] = $sticky;

+			$map_args['enable_cat_filters'] = false;

+			$map_args['enable_text_search'] = false;

+			$map_args['enable_post_type_filters'] = false;

+			$map_args['enable_location_filters'] = false;

+			$map_args['enable_jason_on_load'] = true;

 			

-            if (is_single()) {

-

-                global $post;

-                $map_default_lat = $address_latitude = $post->post_latitude;

-                $map_default_lng = $address_longitude = $post->post_longitude;

-                $mapview = $post->post_mapview;

-                $mapzoom = $post->post_mapzoom;

-                $map_args['map_class_name'] = 'geodir-map-listing-page-single';

-

-            } else {

-                $default_location = geodir_get_default_location();

-

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

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

-                $map_args['map_class_name'] = 'geodir-map-listing-page';

-                $mapview = $maptype;

-            }

-

-            if (empty($mapzoom)) $mapzoom = $zoom;

-

-            // Set default map options

-            $map_args['ajax_url'] = geodir_get_ajax_url();

-            $map_args['latitude'] = $map_default_lat;

-            $map_args['longitude'] = $map_default_lng;

-            $map_args['zoom'] = $zoom;

-            //$map_args['scrollwheel'] = true;

-            $map_args['scrollwheel'] = $scrollwheel;

-            $map_args['showall'] = $showall;

-            $map_args['streetViewControl'] = true;

-            $map_args['maptype'] = $maptype;

-            $map_args['showPreview'] = '0';

-            $map_args['maxZoom'] = 21;

-            $map_args['autozoom'] = $autozoom;

-            $map_args['bubble_size'] = 'small';

-

-            echo $before_widget;

-            geodir_draw_map($map_args);

-            echo $after_widget;

-

-        endif;

-    }

+			if (is_single()) {

+

+				global $post;

+				$map_default_lat = $address_latitude = $post->post_latitude;

+				$map_default_lng = $address_longitude = $post->post_longitude;

+				$mapview = $post->post_mapview;

+				$mapzoom = $post->post_mapzoom;

+				$map_args['map_class_name'] = 'geodir-map-listing-page-single';

+

+			} else {

+				$default_location = geodir_get_default_location();

+

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

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

+				$map_args['map_class_name'] = 'geodir-map-listing-page';

+				$mapview = $maptype;

+			}

+

+			if (empty($mapzoom)) $mapzoom = $zoom;

+

+			// Set default map options

+			$map_args['ajax_url'] = geodir_get_ajax_url();

+			$map_args['latitude'] = $map_default_lat;

+			$map_args['longitude'] = $map_default_lng;

+			$map_args['zoom'] = $zoom;

+			//$map_args['scrollwheel'] = true;

+			$map_args['scrollwheel'] = $scrollwheel;

+			$map_args['showall'] = $showall;

+			$map_args['streetViewControl'] = true;

+			$map_args['maptype'] = $maptype;

+			$map_args['showPreview'] = '0';

+			$map_args['maxZoom'] = 21;

+			$map_args['autozoom'] = $autozoom;

+			$map_args['bubble_size'] = 'small';

+

+			echo $before_widget;

+			geodir_draw_map($map_args);

+			echo $after_widget;

+

+		endif;

+	}

 

 	/**

 	 * Sanitize listing page map widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

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

 	 *

 	 * @return array Updated safe values to be saved.

 	 */

-    public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

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

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

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

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

-        $instance['autozoom'] = isset($new_instance['autozoom']) ? $new_instance['autozoom'] : '';

-        $instance['sticky'] = isset($new_instance['sticky']) ? $new_instance['sticky'] : '';

-        $instance['scrollwheel'] = isset($new_instance['scrollwheel']) ? ($new_instance['scrollwheel']) : '';

-        $instance['showall'] = isset($new_instance['showall']) ? ($new_instance['showall']) : '';

-

-        return $instance;

-    }

+	public function update($new_instance, $old_instance)

+	{

+		//save the widget

+		$instance = $old_instance;

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

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

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

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

+		$instance['autozoom'] = isset($new_instance['autozoom']) ? $new_instance['autozoom'] : '';

+		$instance['sticky'] = isset($new_instance['sticky']) ? $new_instance['sticky'] : '';

+		$instance['scrollwheel'] = isset($new_instance['scrollwheel']) ? ($new_instance['scrollwheel']) : '';

+		$instance['showall'] = isset($new_instance['showall']) ? ($new_instance['showall']) : '';

+

+		return $instance;

+	}

 

 	/**

 	 * Back-end listing page map widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

 	 */

-    public function form($instance)

-    {

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'sticky' => '', 'scrollwheel' => '0', 'showall' => '0'));

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

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

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

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

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

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

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

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

-        ?>

+	public function form($instance)

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'sticky' => '', 'scrollwheel' => '0', 'showall' => '0'));

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

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

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

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

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

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

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

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

+		?>

         <p>

             <label

                 for="<?php echo $this->get_field_id('width'); ?>"><?php _e('Map Width <small>(Default is : 294) you can use px or % here</small>', 'geodirectory'); ?>

@@ -298,14 +298,14 @@ 
                         name="<?php echo $this->get_field_name('maptype'); ?>">

 

                     <option <?php if (isset($maptype) && $maptype == 'ROADMAP') {

-                        echo 'selected="selected"';

-                    } ?> value="ROADMAP"><?php _e('Road Map', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="ROADMAP"><?php _e('Road Map', 'geodirectory'); ?></option>

                     <option <?php if (isset($maptype) && $maptype == 'SATELLITE') {

-                        echo 'selected="selected"';

-                    } ?> value="SATELLITE"><?php _e('Satellite Map', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="SATELLITE"><?php _e('Satellite Map', 'geodirectory'); ?></option>

                     <option <?php if (isset($maptype) && $maptype == 'HYBRID') {

-                        echo 'selected="selected"';

-                    } ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>

 					<option <?php selected($maptype, 'TERRAIN');?> 

 							value="TERRAIN"><?php _e('Terrain Map', 'geodirectory'); ?></option>

                 </select>

@@ -313,8 +313,8 @@ 
         </p>

 

         <?php

-        $map_zoom_level = geodir_map_zoom_level();

-        ?>

+		$map_zoom_level = geodir_map_zoom_level();

+		?>

 

         <p>

             <label

@@ -324,14 +324,14 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('zoom'); ?>"

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

 

-                    foreach ($map_zoom_level as $level) {

-                        $selected = '';

-                        if ($level == $zoom)

-                            $selected = 'selected="selected"';

+					foreach ($map_zoom_level as $level) {

+						$selected = '';

+						if ($level == $zoom)

+							$selected = 'selected="selected"';

 

-                        echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';

+						echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';

 

-                    } ?>

+					} ?>

 

                 </select>

 

@@ -344,8 +344,8 @@ 
                 :

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

                        name="<?php echo $this->get_field_name('autozoom'); ?>"<?php if ($autozoom) {

-                    echo 'checked="checked"';

-                } ?> /></label>

+					echo 'checked="checked"';

+				} ?> /></label>

         </p>

 

         <p>

@@ -354,8 +354,8 @@ 
                 :

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

                        name="<?php echo $this->get_field_name('sticky'); ?>"<?php if ($sticky) {

-                    echo 'checked="checked"';

-                } ?> /> </label>

+					echo 'checked="checked"';

+				} ?> /> </label>

         </p>

 

         <p>

@@ -375,7 +375,7 @@ 
     </p> -->

 

     <?php

-    }

+	}

 } // class geodir_map_listingpage

 

 register_widget('geodir_map_listingpage');

geodirectory-templates/listing-listview.php

Braces +8 added lines, -3 removed lines

@@ -80,7 +80,10 @@ 
                     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

+                } ?>" <?php if (isset($listing_width) && $listing_width) {
+                	echo "style='width:{$listing_width}%;'";
+                }
+                // Width for widget listing

 

                 echo " data-post-id='$post->ID' ";

                 /**

@@ -402,8 +405,10 @@ 
              */

             do_action('geodir_after_listing_post_listview');

 

-        else:

-			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;

+        else {
+        	:

+			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;
+        }
             

 			/**

              * Called inside the `ul` of the listings template, when no listing found.

Spacing +14 added lines, -14 removed lines

@@ -75,7 +75,7 @@ 
                 ?>

 

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

@@ -194,14 +194,14 @@ 
                                         } 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>

@@ -231,13 +231,13 @@ 
                                  */

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

@@ -261,7 +261,7 @@ 
                          * @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'); ?>">

 

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

 

@@ -316,7 +316,7 @@ 
                                  *

                                  * @since 1.0.0

                                  */

-                                do_action( 'geodir_after_favorite_html', $post->ID, 'listing' );

+                                do_action('geodir_after_favorite_html', $post->ID, 'listing');

 

 

                                 /**

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

@@ -356,7 +356,7 @@ 
                                                    title="<?php _e('Edit Listing', 'geodirectory'); ?>">

                                                     <?php

                                                     $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

-                                                    echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

+                                                    echo '<i class="'.$geodir_listing_edit_icon.'"></i>';

                                                     ?>

                                                     <?php _e('Edit', 'geodirectory'); ?>

                                                 </a>

@@ -364,7 +364,7 @@ 
                                                    title="<?php _e('Delete Listing', 'geodirectory'); ?>">

                                                     <?php

                                                     $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

-                                                    echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

+                                                    echo '<i class="'.$geodir_listing_delete_icon.'"></i>';

                                                     ?>

                                                     <?php _e('Delete', 'geodirectory'); ?>

                                                 </a>

Indentation +276 added lines, -276 removed lines

@@ -44,57 +44,57 @@ 
 

         <?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 @@ 
                                     <?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 @@ 
                         <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"><h3 class="geodir-entry-title">

                                     <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">

@@ -162,226 +162,226 @@ 
                             <!-- .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) {

-

-                                if ($related_nearest) {

-                                    $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) {

+

+								if ($related_nearest) {

+									$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="fa 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', 'fa fa-edit');

-                                                    echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

-                                                    ?>

+													$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa 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', 'fa fa-close');

-                                                    echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

-                                                    ?>

+													$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

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

@@ -394,32 +394,32 @@ 
                 </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>

geodirectory-templates/widget-listing-listview.php

Indentation +157 added lines, -157 removed lines

@@ -20,72 +20,72 @@ 
 /** 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">

                                 <h3 class="geodir-entry-title">

                                     <a href="<?php the_permalink(); ?>"

@@ -94,158 +94,158 @@ 
                             </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'] != '') {

-                                $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);

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

+								$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="fa 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', 'fa fa-edit');

-                        echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

-                        ?>

+						$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa 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', 'fa fa-close');

-                        echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

-                        ?>

+						$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

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

@@ -255,17 +255,17 @@ 
                     </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

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
             /** 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 @@ 
                 $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) {

@@ -116,7 +116,7 @@ 
                                         } else {

                                             $uom = __('meters', 'geodirectory');

                                         }

-                                        echo round($distance) . ' ' . __($uom, 'geodirectory') . '

+                                        echo round($distance).' '.__($uom, 'geodirectory').'

 			<br />

 			';

                                     } else {

@@ -125,7 +125,7 @@ 
                                         } else {

                                             $uom = __('km', 'geodirectory');

                                         }

-                                        echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '

+                                        echo round($distance, 2).' '.__($uom, 'geodirectory').'

 			<br />

 			';

                                     }

@@ -149,13 +149,13 @@ 
                                      */

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

                                         }

                                     }

                                     ?>

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

@@ -185,7 +185,7 @@ 
                                  * @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) {

 

@@ -210,7 +210,7 @@ 
                                  *

                                  * @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());

@@ -230,7 +230,7 @@ 
                        title="<?php _e('Edit Listing', 'geodirectory'); ?>">

                         <?php

                         $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

-                        echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

+                        echo '<i class="'.$geodir_listing_edit_icon.'"></i>';

                         ?>

                         <?php _e('Edit', 'geodirectory'); ?>

                     </a>

@@ -238,7 +238,7 @@ 
                        title="<?php _e('Delete Listing', 'geodirectory'); ?>">

                         <?php

                         $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

-                        echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

+                        echo '<i class="'.$geodir_listing_delete_icon.'"></i>';

                         ?>

                         <?php _e('Delete', 'geodirectory'); ?>

                     </a>