GeoDirectory / geodirectory

geodirectory-functions/custom_fields_output_functions.php

Indentation +1558 added lines, -1558 removed lines

@@ -21,84 +21,84 @@ 
  */
 function geodir_cf_checkbox($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
-        /**
-         * Filter the checkbox html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
-        /**
-         * Filter the checkbox html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the checkbox html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ( (int) $post->{$html_var} == 1 ):
-
-            if ( $post->{$html_var} == '1' ):
-                $html_val = __( 'Yes', 'geodirectory' );
-            else:
-                $html_val = __( 'No', 'geodirectory' );
-            endif;
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
+		/**
+		 * Filter the checkbox html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
+		/**
+		 * Filter the checkbox html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the checkbox html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ( (int) $post->{$html_var} == 1 ):
+
+			if ( $post->{$html_var} == '1' ):
+				$html_val = __( 'Yes', 'geodirectory' );
+			else:
+				$html_val = __( 'No', 'geodirectory' );
+			endif;
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
+			$html .= '</span>' . $html_val . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_checkbox','geodir_cf_checkbox',10,3);
 
@@ -115,71 +115,71 @@ 
  */
 function geodir_cf_fieldset($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
-        /**
-         * Filter the fieldset html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
-        /**
-         * Filter the fieldset html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the fieldset html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $field_set_start;
-        $fieldset_class = 'fieldset-'.sanitize_html_class(sanitize_title_with_dashes($cf['site_title']));
-
-        if ($field_set_start == 1) {
-            $html = '';
-        } else {
-            $html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
-            //$field_set_start = 1;
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
+		/**
+		 * Filter the fieldset html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
+		/**
+		 * Filter the fieldset html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the fieldset html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $field_set_start;
+		$fieldset_class = 'fieldset-'.sanitize_html_class(sanitize_title_with_dashes($cf['site_title']));
+
+		if ($field_set_start == 1) {
+			$html = '';
+		} else {
+			$html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
+			//$field_set_start = 1;
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_fieldset','geodir_cf_fieldset',10,3);
 
@@ -196,106 +196,106 @@ 
  */
 function geodir_cf_url($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
-        /**
-         * Filter the url html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
-        /**
-         * Filter the url html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the url html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-
-                if ($cf['name'] == 'geodir_facebook') {
-                    $field_icon_af = '<i class="fa fa-facebook-square"></i>';
-                } elseif ($cf['name'] == 'geodir_twitter') {
-                    $field_icon_af = '<i class="fa fa-twitter-square"></i>';
-                } else {
-                    $field_icon_af = '<i class="fa fa-link"></i>';
-                }
-
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $a_url = geodir_parse_custom_field_url($post->{$cf['htmlvar_name']});
-
-
-            $website = !empty($a_url['url']) ? $a_url['url'] : '';
-            $title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
-            if(!empty($cf['default_value'])){$title = $cf['default_value'];}
-            $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
-
-
-
-            // all search engines that use the nofollow value exclude links that use it from their ranking calculation
-            $rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';
-            /**
-             * Filter custom field website name.
-             *
-             * @since 1.0.0
-             *
-             * @param string $title Website Title.
-             * @param string $website Website URL.
-             * @param int $post->ID Post ID.
-             */
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
+		/**
+		 * Filter the url html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
+		/**
+		 * Filter the url html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the url html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+
+				if ($cf['name'] == 'geodir_facebook') {
+					$field_icon_af = '<i class="fa fa-facebook-square"></i>';
+				} elseif ($cf['name'] == 'geodir_twitter') {
+					$field_icon_af = '<i class="fa fa-twitter-square"></i>';
+				} else {
+					$field_icon_af = '<i class="fa fa-link"></i>';
+				}
+
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$a_url = geodir_parse_custom_field_url($post->{$cf['htmlvar_name']});
+
+
+			$website = !empty($a_url['url']) ? $a_url['url'] : '';
+			$title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
+			if(!empty($cf['default_value'])){$title = $cf['default_value'];}
+			$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
+
+
+
+			// all search engines that use the nofollow value exclude links that use it from their ranking calculation
+			$rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';
+			/**
+			 * Filter custom field website name.
+			 *
+			 * @since 1.0.0
+			 *
+			 * @param string $title Website Title.
+			 * @param string $website Website URL.
+			 * @param int $post->ID Post ID.
+			 */
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_url','geodir_cf_url',10,3);
 
@@ -312,80 +312,80 @@ 
  */
 function geodir_cf_phone($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
-        /**
-         * Filter the phone html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
-        /**
-         * Filter the phone html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the phone html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-phone"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
-                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
+		/**
+		 * Filter the phone html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
+		/**
+		 * Filter the phone html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the phone html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-phone"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
+					$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
+			$html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_phone','geodir_cf_phone',10,3);
 
@@ -402,85 +402,85 @@ 
  */
 function geodir_cf_time($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
-        /**
-         * Filter the time html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
-        /**
-         * Filter the time html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the time html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $value = '';
-            if ($post->{$cf['htmlvar_name']} != '')
-                //$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
-                $value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-clock-o"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span>' . $value . '</div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
+		/**
+		 * Filter the time html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
+		/**
+		 * Filter the time html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the time html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$value = '';
+			if ($post->{$cf['htmlvar_name']} != '')
+				//$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
+				$value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-clock-o"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
+			$html .= '</span>' . $value . '</div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_time','geodir_cf_time',10,3);
 
@@ -496,111 +496,111 @@ 
  * @return string The html to output for the custom field.
  */
 function geodir_cf_datepicker($html,$location,$cf,$p=''){
-    global $preview;
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
-        /**
-         * Filter the datepicker html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
-        /**
-         * Filter the datepicker html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the datepicker html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $date_format = geodir_default_date_format();
-            if ($cf['extra_fields'] != '') {
-                $date_format = stripslashes_deep(unserialize($cf['extra_fields']));
-                $date_format = $date_format['date_format'];
-            }
-            // check if we need to change the format or not
-            $date_format_len = strlen(str_replace(' ', '', $date_format));
-            if($date_format_len>5){// if greater then 4 then it's the old style format.
-
-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-                $replace = array('d','j','l','m','n','F','Y');//PHP date format
-
-                $date_format = str_replace($search, $replace, $date_format);
-
-                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
-            }else{
-                $post_htmlvar_value = $post->{$cf['htmlvar_name']};
-            }
-
-            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
-                $date_format_from = $preview ? $date_format : 'Y-m-d';
-                $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
-                //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
-                //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
-            }else{
-                return '';
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-calendar"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $value . '</div>';
-
-        endif;
-
-    }
-
-    return $html;
+	global $preview;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
+		/**
+		 * Filter the datepicker html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
+		/**
+		 * Filter the datepicker html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the datepicker html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$date_format = geodir_default_date_format();
+			if ($cf['extra_fields'] != '') {
+				$date_format = stripslashes_deep(unserialize($cf['extra_fields']));
+				$date_format = $date_format['date_format'];
+			}
+			// check if we need to change the format or not
+			$date_format_len = strlen(str_replace(' ', '', $date_format));
+			if($date_format_len>5){// if greater then 4 then it's the old style format.
+
+				$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
+				$replace = array('d','j','l','m','n','F','Y');//PHP date format
+
+				$date_format = str_replace($search, $replace, $date_format);
+
+				$post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
+			}else{
+				$post_htmlvar_value = $post->{$cf['htmlvar_name']};
+			}
+
+			if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
+				$date_format_from = $preview ? $date_format : 'Y-m-d';
+				$value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
+				//$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
+				//$value = date_i18n($date_format, strtotime($post_htmlvar_value));
+			}else{
+				return '';
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-calendar"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $value . '</div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_datepicker','geodir_cf_datepicker',10,3);
 
@@ -617,97 +617,97 @@ 
  */
 function geodir_cf_text($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
-        /**
-         * Filter the text html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
-        /**
-         * Filter the text html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the text html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
+		/**
+		 * Filter the text html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
+		/**
+		 * Filter the text html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the text html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
 
     
 
-    // If not html then we run the standard output.
-    if(empty($html)){
+	// If not html then we run the standard output.
+	if(empty($html)){
 
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+		if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
 
-            $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
+			$class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>';
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>';
 
-            $value = $post->{$cf['htmlvar_name']};
-            if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
-                $extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
-                if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
-                    if(!ceil($value) > 0){return '';}// dont output blank prices
-                    $value = geodir_currency_format_number($value,$cf);
-                }
-            }
+			$value = $post->{$cf['htmlvar_name']};
+			if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
+				$extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
+				if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
+					if(!ceil($value) > 0){return '';}// dont output blank prices
+					$value = geodir_currency_format_number($value,$cf);
+				}
+			}
 
 
-            $html .= $value;
-            $html .= '</div>';
+			$html .= $value;
+			$html .= '</div>';
 
-        endif;
+		endif;
 
-    }
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
 
@@ -724,98 +724,98 @@ 
  */
 function geodir_cf_radio($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
-        /**
-         * Filter the radio html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
-        /**
-         * Filter the radio html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the radio html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        $html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
-
-            if ($post->{$cf['htmlvar_name']} == 'f' || $post->{$cf['htmlvar_name']} == '0') {
-                $html_val = __('No', 'geodirectory');
-            } else if ($post->{$cf['htmlvar_name']} == 't' || $post->{$cf['htmlvar_name']} == '1') {
-                $html_val = __('Yes', 'geodirectory');
-            } else {
-                if (!empty($cf['option_values'])) {
-                    $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                    if (!empty($cf_option_values)) {
-                        foreach ($cf_option_values as $cf_option_value) {
-                            if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
-                                $html_val = $cf_option_value['label'];
-                            }
-                        }
-                    }
-                }
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
+		/**
+		 * Filter the radio html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
+		/**
+		 * Filter the radio html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the radio html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		$html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
+		if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
+
+			if ($post->{$cf['htmlvar_name']} == 'f' || $post->{$cf['htmlvar_name']} == '0') {
+				$html_val = __('No', 'geodirectory');
+			} else if ($post->{$cf['htmlvar_name']} == 't' || $post->{$cf['htmlvar_name']} == '1') {
+				$html_val = __('Yes', 'geodirectory');
+			} else {
+				if (!empty($cf['option_values'])) {
+					$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+					if (!empty($cf_option_values)) {
+						foreach ($cf_option_values as $cf_option_value) {
+							if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
+								$html_val = $cf_option_value['label'];
+							}
+						}
+					}
+				}
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $html_val . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_radio','geodir_cf_radio',10,3);
 
@@ -833,92 +833,92 @@ 
  */
 function geodir_cf_select($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
-        /**
-         * Filter the select html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
-        /**
-         * Filter the select html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the select html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-            $field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
-
-            if (!empty($cf['option_values'])) {
-                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                if (!empty($cf_option_values)) {
-                    foreach ($cf_option_values as $cf_option_value) {
-                        if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
-                            $field_value = $cf_option_value['label']; // no longer needed here. Removed comment because it displays number instead of label if option vales set like "Good/1,Fair/2".
-                        }
-                    }
-                }
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $field_value . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
+		/**
+		 * Filter the select html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
+		/**
+		 * Filter the select html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the select html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+			$field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
+
+			if (!empty($cf['option_values'])) {
+				$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+				if (!empty($cf_option_values)) {
+					foreach ($cf_option_values as $cf_option_value) {
+						if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
+							$field_value = $cf_option_value['label']; // no longer needed here. Removed comment because it displays number instead of label if option vales set like "Good/1,Fair/2".
+						}
+					}
+				}
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $field_value . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_select','geodir_cf_select',10,3);
 
@@ -935,117 +935,117 @@ 
  */
 function geodir_cf_multiselect($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
-        /**
-         * Filter the multiselect html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
-        /**
-         * Filter the multiselect html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the multiselect html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-
-        if (!empty($post->{$cf['htmlvar_name']})):
-
-            if (is_array($post->{$cf['htmlvar_name']})) {
-                $post->{$cf['htmlvar_name']} = implode(', ', $post->{$cf['htmlvar_name']});
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
-
-            if(is_array($field_values)){
-                $field_values = array_map('trim', $field_values);
-            }
-
-            $option_values = array();
-            if (!empty($cf['option_values'])) {
-                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                if (!empty($cf_option_values)) {
-                    foreach ($cf_option_values as $cf_option_value) {
-                        if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {
-                            $option_values[] = $cf_option_value['label'];
-                        }
-                    }
-                }
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>';
-
-            if (count($option_values) > 1) {
-                $html .= '<ul>';
-
-                foreach ($option_values as $val) {
-                    $html .= '<li>' . $val . '</li>';
-                }
-
-                $html .= '</ul>';
-            } else {
-                $html .= __($post->{$cf['htmlvar_name']}, 'geodirectory');
-            }
-
-            $html .= '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
+		/**
+		 * Filter the multiselect html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
+		/**
+		 * Filter the multiselect html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the multiselect html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+
+		if (!empty($post->{$cf['htmlvar_name']})):
+
+			if (is_array($post->{$cf['htmlvar_name']})) {
+				$post->{$cf['htmlvar_name']} = implode(', ', $post->{$cf['htmlvar_name']});
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
+
+			if(is_array($field_values)){
+				$field_values = array_map('trim', $field_values);
+			}
+
+			$option_values = array();
+			if (!empty($cf['option_values'])) {
+				$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+				if (!empty($cf_option_values)) {
+					foreach ($cf_option_values as $cf_option_value) {
+						if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {
+							$option_values[] = $cf_option_value['label'];
+						}
+					}
+				}
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>';
+
+			if (count($option_values) > 1) {
+				$html .= '<ul>';
+
+				foreach ($option_values as $val) {
+					$html .= '<li>' . $val . '</li>';
+				}
+
+				$html .= '</ul>';
+			} else {
+				$html .= __($post->{$cf['htmlvar_name']}, 'geodirectory');
+			}
+
+			$html .= '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
 
@@ -1062,148 +1062,148 @@ 
  */
 function geodir_cf_email($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
-        /**
-         * Filter the email html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
-        /**
-         * Filter the email html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the email html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $preview;
-        if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
-            return ''; // Remove Send Enquiry from listings page
-        }
-
-        $package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
-
-        if ($cf['htmlvar_name'] == 'geodir_email' && $post->{$cf['htmlvar_name']}) {
-            $b_send_inquiry = '';
-
-            $html = '';
-            if (!$preview) {
-                $b_send_inquiry = 'b_send_inquiry';
-                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-envelope"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-            $seperator = '';
-            if ($post->{$cf['htmlvar_name']}) {
-                $b_send_inquiry_url = apply_filters('b_send_inquiry_url', 'javascript:void(0);');
-                $html .= '<a href="'.$b_send_inquiry_url.'" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
-            }
-
-            $html .= '</span></div>';
-
-
-            if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
-            } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
-                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
-            }
-
-            /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
-
-        } else {
-
-            if ($post->{$cf['htmlvar_name']}) {
-
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } elseif ($field_icon == '') {
-                    $field_icon_af = '<i class="fa fa-envelope"></i>';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
-
-
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span><span class="geodir-email-address-output">';
-                $email = $post->{$cf['htmlvar_name']} ;
-                if($e_split = explode('@',$email)){
-                    /**
-                     * Filter email custom field name output.
-                     *
-                     * @since 1.5.3
-                     *
-                     * @param string $email The email string being output.
-                     * @param array $cf Custom field variables array.
-                     */
-                    $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
-                    if($location=='mapbubble'){
-                        $html .=  "<a href=\"mailto:$email\">$email_name</a>";
-                    }else{
-                        $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
-                    }
-
-                }else{
-                    $html .=  $email;
-                }
-                $html .= '</span></div>';
-            }
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
+		/**
+		 * Filter the email html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
+		/**
+		 * Filter the email html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the email html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $preview;
+		if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
+			return ''; // Remove Send Enquiry from listings page
+		}
+
+		$package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
+
+		if ($cf['htmlvar_name'] == 'geodir_email' && $post->{$cf['htmlvar_name']}) {
+			$b_send_inquiry = '';
+
+			$html = '';
+			if (!$preview) {
+				$b_send_inquiry = 'b_send_inquiry';
+				$html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-envelope"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+			$seperator = '';
+			if ($post->{$cf['htmlvar_name']}) {
+				$b_send_inquiry_url = apply_filters('b_send_inquiry_url', 'javascript:void(0);');
+				$html .= '<a href="'.$b_send_inquiry_url.'" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+			}
+
+			$html .= '</span></div>';
+
+
+			if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
+				$html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
+			} elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
+				$html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
+			}
+
+			/*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
+
+		} else {
+
+			if ($post->{$cf['htmlvar_name']}) {
+
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} elseif ($field_icon == '') {
+					$field_icon_af = '<i class="fa fa-envelope"></i>';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
+
+
+				$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span><span class="geodir-email-address-output">';
+				$email = $post->{$cf['htmlvar_name']} ;
+				if($e_split = explode('@',$email)){
+					/**
+					 * Filter email custom field name output.
+					 *
+					 * @since 1.5.3
+					 *
+					 * @param string $email The email string being output.
+					 * @param array $cf Custom field variables array.
+					 */
+					$email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
+					if($location=='mapbubble'){
+						$html .=  "<a href=\"mailto:$email\">$email_name</a>";
+					}else{
+						$html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
+					}
+
+				}else{
+					$html .=  $email;
+				}
+				$html .= '</span></div>';
+			}
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_email','geodir_cf_email',10,3);
 
@@ -1220,136 +1220,136 @@ 
  */
 function geodir_cf_file($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
-        /**
-         * Filter the file html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
-        /**
-         * Filter the file html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the file html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})):
-
-            $files = explode(",", $post->{$cf['htmlvar_name']});
-            if (!empty($files)):
-
-                $extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
-                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
-
-                $file_paths = '';
-                foreach ($files as $file) {
-                    if (!empty($file)) {
-
-                        // $filetype = wp_check_filetype($file);
-
-                        $image_name_arr = explode('/', $file);
-                        $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
-                        $filename = end($image_name_arr);
-                        $img_name_arr = explode('.', $filename);
-
-                        $arr_file_type = wp_check_filetype($filename);
-                        if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
-                            continue;
-                        }
-
-                        $uploaded_file_type = $arr_file_type['type'];
-                        $uploaded_file_ext = $arr_file_type['ext'];
-
-                        if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
-                            continue; // Invalid file type.
-                        }
-
-                        //$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
-                        $image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');
-                        $audio_file_types = array('audio/mpeg', 'audio/ogg', 'audio/mp4', 'audio/vnd.wav', 'audio/basic', 'audio/mid');
-
-                        // If the uploaded file is image
-                        if (in_array($uploaded_file_type, $image_file_types)) {
-                            $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';
-                            $file_paths .= '<a href="'.$file.'">';
-                            $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);
-                            $file_paths .= '</a>';
-                            //$file_paths .= '<img src="'.$file.'"  />';	
-                            $file_paths .= '</div>';
-                        }elseif (in_array($uploaded_file_type, $audio_file_types)) {// if audio
-                            $ext_path = '_' . $html_var . '_';
-                            $filename = explode($ext_path, $filename);
-                            $file_paths .= '<span class="gd-audio-name">'.$filename[count($filename) - 1].'</span>';
-                            $file_paths .= do_shortcode('[audio src="'.$file.'" ]');
-                        } else {
-                            $ext_path = '_' . $html_var . '_';
-                            $filename = explode($ext_path, $filename);
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
-                        }
-                    }
-                }
-
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } elseif ($field_icon == '') {
-                    $field_icon_af = '';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
-
-                $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span>';
-                $html .= $file_paths . '</div></div>';
-
-            endif;
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
+		/**
+		 * Filter the file html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
+		/**
+		 * Filter the file html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the file html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})):
+
+			$files = explode(",", $post->{$cf['htmlvar_name']});
+			if (!empty($files)):
+
+				$extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
+				$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
+
+				$file_paths = '';
+				foreach ($files as $file) {
+					if (!empty($file)) {
+
+						// $filetype = wp_check_filetype($file);
+
+						$image_name_arr = explode('/', $file);
+						$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
+						$filename = end($image_name_arr);
+						$img_name_arr = explode('.', $filename);
+
+						$arr_file_type = wp_check_filetype($filename);
+						if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
+							continue;
+						}
+
+						$uploaded_file_type = $arr_file_type['type'];
+						$uploaded_file_ext = $arr_file_type['ext'];
+
+						if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
+							continue; // Invalid file type.
+						}
+
+						//$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
+						$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');
+						$audio_file_types = array('audio/mpeg', 'audio/ogg', 'audio/mp4', 'audio/vnd.wav', 'audio/basic', 'audio/mid');
+
+						// If the uploaded file is image
+						if (in_array($uploaded_file_type, $image_file_types)) {
+							$file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';
+							$file_paths .= '<a href="'.$file.'">';
+							$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);
+							$file_paths .= '</a>';
+							//$file_paths .= '<img src="'.$file.'"  />';	
+							$file_paths .= '</div>';
+						}elseif (in_array($uploaded_file_type, $audio_file_types)) {// if audio
+							$ext_path = '_' . $html_var . '_';
+							$filename = explode($ext_path, $filename);
+							$file_paths .= '<span class="gd-audio-name">'.$filename[count($filename) - 1].'</span>';
+							$file_paths .= do_shortcode('[audio src="'.$file.'" ]');
+						} else {
+							$ext_path = '_' . $html_var . '_';
+							$filename = explode($ext_path, $filename);
+							$file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
+						}
+					}
+				}
+
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} elseif ($field_icon == '') {
+					$field_icon_af = '';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
+
+				$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span>';
+				$html .= $file_paths . '</div></div>';
+
+			endif;
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_file','geodir_cf_file',10,3);
 
@@ -1367,80 +1367,80 @@ 
  */
 function geodir_cf_textarea($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
-        /**
-         * Filter the textarea html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
-        /**
-         * Filter the textarea html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the textarea html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})) {
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
+		/**
+		 * Filter the textarea html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
+		/**
+		 * Filter the textarea html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the textarea html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})) {
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_textarea','geodir_cf_textarea',10,3);
 
@@ -1458,79 +1458,79 @@ 
  */
 function geodir_cf_html($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
-        /**
-         * Filter the html html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
-        /**
-         * Filter the html html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the html html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})) {
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
+		/**
+		 * Filter the html html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
+		/**
+		 * Filter the html html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the html html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})) {
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_html','geodir_cf_html',10,3);
 
@@ -1548,113 +1548,113 @@ 
  */
 function geodir_cf_taxonomy($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
-        /**
-         * Filter the taxonomy html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
-        /**
-         * Filter the taxonomy html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the taxonomy html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
-            $post_taxonomy = $post->post_type . 'category';
-            $field_value = $post->{$html_var};
-            $links = array();
-            $terms = array();
-            $termsOrdered = array();
-            if (!is_array($field_value)) {
-                $field_value = explode(",", trim($field_value, ","));
-            }
-
-            $field_value = array_unique($field_value);
-
-            if (!empty($field_value)) {
-                foreach ($field_value as $term) {
-                    $term = trim($term);
-
-                    if ($term != '') {
-                        $term = get_term_by('id', $term, $html_var);
-                        if (is_object($term)) {
-                            $links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
-                            $terms[] = $term;
-                        }
-                    }
-                }
-                if (!empty($links)) {
-                    // order alphabetically
-                    asort($links);
-                    foreach (array_keys($links) as $key) {
-                        $termsOrdered[$key] = $terms[$key];
-                    }
-                    $terms = $termsOrdered;
-                }
-            }
-            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
-
-            if ($html_value != '') {
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } else if ($field_icon == '') {
-                    $field_icon_af = '';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
-
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span> ' . $html_value . '</div>';
-            }
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
+		/**
+		 * Filter the taxonomy html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
+		/**
+		 * Filter the taxonomy html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the taxonomy html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
+			$post_taxonomy = $post->post_type . 'category';
+			$field_value = $post->{$html_var};
+			$links = array();
+			$terms = array();
+			$termsOrdered = array();
+			if (!is_array($field_value)) {
+				$field_value = explode(",", trim($field_value, ","));
+			}
+
+			$field_value = array_unique($field_value);
+
+			if (!empty($field_value)) {
+				foreach ($field_value as $term) {
+					$term = trim($term);
+
+					if ($term != '') {
+						$term = get_term_by('id', $term, $html_var);
+						if (is_object($term)) {
+							$links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
+							$terms[] = $term;
+						}
+					}
+				}
+				if (!empty($links)) {
+					// order alphabetically
+					asort($links);
+					foreach (array_keys($links) as $key) {
+						$termsOrdered[$key] = $terms[$key];
+					}
+					$terms = $termsOrdered;
+				}
+			}
+			$html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
+
+			if ($html_value != '') {
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} else if ($field_icon == '') {
+					$field_icon_af = '';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
+
+				$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span> ' . $html_value . '</div>';
+			}
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_taxonomy','geodir_cf_taxonomy',10,3);
 
@@ -1672,176 +1672,176 @@ 
  */
 function geodir_cf_address($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
-        /**
-         * Filter the address html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
-        /**
-         * Filter the address html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the address html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $preview;
-        $html_var = $cf['htmlvar_name'] . '_address';
-
-        if ($cf['extra_fields']) {
-
-            $extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
-
-            $addition_fields = '';
-
-            if (!empty($extra_fields)) {
-
-                $show_city_in_address = false;
-                if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
-                    $show_city_in_address = true;
-                }
-                /**
-                 * Filter "show city in address" value.
-                 *
-                 * @since 1.0.0
-                 */
-                $show_city_in_address = apply_filters('geodir_show_city_in_address', $show_city_in_address);
-
-
-                $show_region_in_address = false;
-                if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
-                    $show_region_in_address = true;
-                }
-                /**
-                 * Filter "show region in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_region_in_address = apply_filters('geodir_show_region_in_address', $show_region_in_address);
-
-                $show_country_in_address = false;
-                if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
-                    $show_country_in_address = true;
-                }
-                /**
-                 * Filter "show country in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_country_in_address = apply_filters('geodir_show_country_in_address', $show_country_in_address);
-
-                $show_zip_in_address = false;
-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
-                    $show_zip_in_address = true;
-                }
-                /**
-                 * Filter "show zip in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_zip_in_address = apply_filters('geodir_show_zip_in_address', $show_zip_in_address);
-
-
-            }
-
-        }
-
-
-        if ($post->{$html_var}) {
-
-            $field_icon = geodir_field_icon_proccess( $cf );
-            if ( strpos( $field_icon, 'http' ) !== false ) {
-                $field_icon_af = '';
-            } elseif ( $field_icon == '' ) {
-                $field_icon_af = '<i class="fa fa-home"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon    = '';
-            }
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
+		/**
+		 * Filter the address html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
+		/**
+		 * Filter the address html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the address html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $preview;
+		$html_var = $cf['htmlvar_name'] . '_address';
+
+		if ($cf['extra_fields']) {
+
+			$extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
+
+			$addition_fields = '';
+
+			if (!empty($extra_fields)) {
+
+				$show_city_in_address = false;
+				if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
+					$show_city_in_address = true;
+				}
+				/**
+				 * Filter "show city in address" value.
+				 *
+				 * @since 1.0.0
+				 */
+				$show_city_in_address = apply_filters('geodir_show_city_in_address', $show_city_in_address);
+
+
+				$show_region_in_address = false;
+				if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
+					$show_region_in_address = true;
+				}
+				/**
+				 * Filter "show region in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_region_in_address = apply_filters('geodir_show_region_in_address', $show_region_in_address);
+
+				$show_country_in_address = false;
+				if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
+					$show_country_in_address = true;
+				}
+				/**
+				 * Filter "show country in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_country_in_address = apply_filters('geodir_show_country_in_address', $show_country_in_address);
+
+				$show_zip_in_address = false;
+				if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
+					$show_zip_in_address = true;
+				}
+				/**
+				 * Filter "show zip in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_zip_in_address = apply_filters('geodir_show_zip_in_address', $show_zip_in_address);
+
+
+			}
+
+		}
+
+
+		if ($post->{$html_var}) {
+
+			$field_icon = geodir_field_icon_proccess( $cf );
+			if ( strpos( $field_icon, 'http' ) !== false ) {
+				$field_icon_af = '';
+			} elseif ( $field_icon == '' ) {
+				$field_icon_af = '<i class="fa fa-home"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon    = '';
+			}
             
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
-            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
-            $html .= '</span>';
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
+			$html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
+			$html .= '</span>';
             
-            $address_fields = array();
-
-            if ( isset($post->post_address) ) {
-                $address_fields['post_address'] = '<span itemprop="streetAddress">' . $post->post_address . '</span>';
-            }
-            if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
-                $address_fields['post_city'] = '<span itemprop="addressLocality">' . $post->post_city . '</span>';
-            }
-            if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
-                $address_fields['post_region'] = '<span itemprop="addressRegion">' . $post->post_region . '</span>';
-            }
-            if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
-                $address_fields['post_zip'] = '<span itemprop="postalCode">' . $post->post_zip . '</span>';
-            }
-            if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
-                $address_fields['post_country'] = '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span>';
-            }
+			$address_fields = array();
+
+			if ( isset($post->post_address) ) {
+				$address_fields['post_address'] = '<span itemprop="streetAddress">' . $post->post_address . '</span>';
+			}
+			if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
+				$address_fields['post_city'] = '<span itemprop="addressLocality">' . $post->post_city . '</span>';
+			}
+			if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
+				$address_fields['post_region'] = '<span itemprop="addressRegion">' . $post->post_region . '</span>';
+			}
+			if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
+				$address_fields['post_zip'] = '<span itemprop="postalCode">' . $post->post_zip . '</span>';
+			}
+			if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
+				$address_fields['post_country'] = '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span>';
+			}
             
-            /**
-             * Filter the address fields array being displayed.
-             *
-             * @param array $address_fields The array of address fields.
-             * @param object $post The current post object.
-             * @param array $cf The custom field array details.
-             * @param string $location The location to output the html.
-             * 
-             * @since 1.6.21
-             */
-            $address_fields = apply_filters('geodir_custom_field_output_address_fields', $address_fields, $post, $cf, $location);
+			/**
+			 * Filter the address fields array being displayed.
+			 *
+			 * @param array $address_fields The array of address fields.
+			 * @param object $post The current post object.
+			 * @param array $cf The custom field array details.
+			 * @param string $location The location to output the html.
+			 * 
+			 * @since 1.6.21
+			 */
+			$address_fields = apply_filters('geodir_custom_field_output_address_fields', $address_fields, $post, $cf, $location);
             
-            if (!empty($address_fields) && is_array($address_fields)) {
-                $address_fields = array_values($address_fields);
-                $html .= implode('<br>', $address_fields);
-            }
+			if (!empty($address_fields) && is_array($address_fields)) {
+				$address_fields = array_values($address_fields);
+				$html .= implode('<br>', $address_fields);
+			}
             
-            $html .= '</div>';
-        }
-    }
+			$html .= '</div>';
+		}
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
\ No newline at end of file

Spacing +304 added lines, -304 removed lines

@@ -19,21 +19,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_checkbox($html,$location,$cf,$p=''){
+function geodir_cf_checkbox($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_checkbox_loc_{$location}")) {
         /**
          * Filter the checkbox html by location.
          *
@@ -41,11 +41,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")) {
         /**
          * Filter the checkbox html by individual custom field.
          *
@@ -54,11 +54,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")) {
         /**
          * Filter the checkbox html by field type key.
          *
@@ -67,18 +67,18 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if ( (int) $post->{$html_var} == 1 ):
+        if ((int) $post->{$html_var} == 1):
 
-            if ( $post->{$html_var} == '1' ):
-                $html_val = __( 'Yes', 'geodirectory' );
+            if ($post->{$html_var} == '1'):
+                $html_val = __('Yes', 'geodirectory');
             else:
-                $html_val = __( 'No', 'geodirectory' );
+                $html_val = __('No', 'geodirectory');
             endif;
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -91,16 +91,16 @@ 
                 $field_icon = '';
             }
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-checkbox" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$html_val.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_checkbox','geodir_cf_checkbox',10,3);
+add_filter('geodir_custom_field_output_checkbox', 'geodir_cf_checkbox', 10, 3);
 
 
 /**
@@ -113,21 +113,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_fieldset($html,$location,$cf,$p=''){
+function geodir_cf_fieldset($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_fieldset_loc_{$location}")) {
         /**
          * Filter the fieldset html by location.
          *
@@ -135,11 +135,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")) {
         /**
          * Filter the fieldset html by individual custom field.
          *
@@ -148,11 +148,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")) {
         /**
          * Filter the fieldset html by field type key.
          *
@@ -161,11 +161,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $field_set_start;
         $fieldset_class = 'fieldset-'.sanitize_html_class(sanitize_title_with_dashes($cf['site_title']));
@@ -173,7 +173,7 @@ 
         if ($field_set_start == 1) {
             $html = '';
         } else {
-            $html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
+            $html = '<h2 class="'.$fieldset_class.'">'.__($cf['site_title'], 'geodirectory').'</h2>';
             //$field_set_start = 1;
         }
 
@@ -181,7 +181,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_fieldset','geodir_cf_fieldset',10,3);
+add_filter('geodir_custom_field_output_fieldset', 'geodir_cf_fieldset', 10, 3);
 
 
 /**
@@ -194,21 +194,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_url($html,$location,$cf,$p=''){
+function geodir_cf_url($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_url_loc_{$location}")) {
         /**
          * Filter the url html by location.
          *
@@ -216,11 +216,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_url_var_{$html_var}")) {
         /**
          * Filter the url html by individual custom field.
          *
@@ -229,11 +229,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")) {
         /**
          * Filter the url html by field type key.
          *
@@ -242,11 +242,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -273,7 +273,7 @@ 
 
             $website = !empty($a_url['url']) ? $a_url['url'] : '';
             $title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
-            if(!empty($cf['default_value'])){$title = $cf['default_value'];}
+            if (!empty($cf['default_value'])) {$title = $cf['default_value']; }
             $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
 
 
@@ -289,7 +289,7 @@ 
              * @param string $website Website URL.
              * @param int $post->ID Post ID.
              */
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-website" style="'.$field_icon.'">'.$field_icon_af.'<a href="'.$website.'" target="_blank" '.$rel.' ><strong>'.apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID).'</strong></a></span></div>';
 
         endif;
 
@@ -297,7 +297,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_url','geodir_cf_url',10,3);
+add_filter('geodir_custom_field_output_url', 'geodir_cf_url', 10, 3);
 
 
 /**
@@ -310,21 +310,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_phone($html,$location,$cf,$p=''){
+function geodir_cf_phone($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_phone_loc_{$location}")) {
         /**
          * Filter the phone html by location.
          *
@@ -332,11 +332,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_phone_var_{$html_var}")) {
         /**
          * Filter the phone html by individual custom field.
          *
@@ -345,11 +345,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")) {
         /**
          * Filter the phone html by field type key.
          *
@@ -358,11 +358,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -377,9 +377,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
-                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-contact" style="'.$field_icon.'">'.$field_icon_af.
+                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
+            $html .= '</span><a href="tel:'.preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}).'">'.$post->{$cf['htmlvar_name']}.'</a></div>';
 
         endif;
 
@@ -387,7 +387,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_phone','geodir_cf_phone',10,3);
+add_filter('geodir_custom_field_output_phone', 'geodir_cf_phone', 10, 3);
 
 
 /**
@@ -400,21 +400,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_time($html,$location,$cf,$p=''){
+function geodir_cf_time($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_time_loc_{$location}")) {
         /**
          * Filter the time html by location.
          *
@@ -422,11 +422,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_time_var_{$html_var}")) {
         /**
          * Filter the time html by individual custom field.
          *
@@ -435,11 +435,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")) {
         /**
          * Filter the time html by field type key.
          *
@@ -448,11 +448,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -472,9 +472,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span>' . $value . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-time" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
+            $html .= '</span>'.$value.'</div>';
 
         endif;
 
@@ -482,7 +482,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_time','geodir_cf_time',10,3);
+add_filter('geodir_custom_field_output_time', 'geodir_cf_time', 10, 3);
 
 
 /**
@@ -495,21 +495,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_datepicker($html,$location,$cf,$p=''){
+function geodir_cf_datepicker($html, $location, $cf, $p = '') {
     global $preview;
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_datepicker_loc_{$location}")) {
         /**
          * Filter the datepicker html by location.
          *
@@ -517,11 +517,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")) {
         /**
          * Filter the datepicker html by individual custom field.
          *
@@ -530,11 +530,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")) {
         /**
          * Filter the datepicker html by field type key.
          *
@@ -543,11 +543,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -558,24 +558,24 @@ 
             }
             // check if we need to change the format or not
             $date_format_len = strlen(str_replace(' ', '', $date_format));
-            if($date_format_len>5){// if greater then 4 then it's the old style format.
+            if ($date_format_len > 5) {// if greater then 4 then it's the old style format.
 
-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-                $replace = array('d','j','l','m','n','F','Y');//PHP date format
+                $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
+                $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
 
                 $date_format = str_replace($search, $replace, $date_format);
 
-                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
-            }else{
+                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y') ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
+            } else {
                 $post_htmlvar_value = $post->{$cf['htmlvar_name']};
             }
 
-            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
+            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']} != "0000-00-00") {
                 $date_format_from = $preview ? $date_format : 'Y-m-d';
                 $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
                 //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
                 //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
-            }else{
+            } else {
                 return '';
             }
 
@@ -592,9 +592,9 @@ 
 
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $value . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-datepicker" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$value.'</div>';
 
         endif;
 
@@ -602,7 +602,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_datepicker','geodir_cf_datepicker',10,3);
+add_filter('geodir_custom_field_output_datepicker', 'geodir_cf_datepicker', 10, 3);
 
 
 /**
@@ -615,21 +615,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_text($html,$location,$cf,$p=''){
+function geodir_cf_text($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_text_loc_{$location}")) {
         /**
          * Filter the text html by location.
          *
@@ -637,11 +637,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_text_var_{$html_var}")) {
         /**
          * Filter the text html by individual custom field.
          *
@@ -650,11 +650,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")) {
         /**
          * Filter the text html by field type key.
          *
@@ -663,15 +663,15 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
 
             $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
@@ -686,16 +686,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="'.$class.'" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
             $html .= '</span>';
 
             $value = $post->{$cf['htmlvar_name']};
-            if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
+            if (isset($cf['data_type']) && ($cf['data_type'] == 'INT' || $cf['data_type'] == 'FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']) {
                 $extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
-                if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
-                    if(!ceil($value) > 0){return '';}// dont output blank prices
-                    $value = geodir_currency_format_number($value,$cf);
+                if (isset($extra_fields['is_price']) && $extra_fields['is_price']) {
+                    if (!ceil($value) > 0) {return ''; }// dont output blank prices
+                    $value = geodir_currency_format_number($value, $cf);
                 }
             }
 
@@ -709,7 +709,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
+add_filter('geodir_custom_field_output_text', 'geodir_cf_text', 10, 3);
 
 
 /**
@@ -722,21 +722,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_radio($html,$location,$cf,$p=''){
+function geodir_cf_radio($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_radio_loc_{$location}")) {
         /**
          * Filter the radio html by location.
          *
@@ -744,11 +744,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_radio_var_{$html_var}")) {
         /**
          * Filter the radio html by individual custom field.
          *
@@ -757,11 +757,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")) {
         /**
          * Filter the radio html by field type key.
          *
@@ -770,11 +770,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         $html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
         if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
@@ -808,16 +808,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-radio" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$html_val.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_radio','geodir_cf_radio',10,3);
+add_filter('geodir_custom_field_output_radio', 'geodir_cf_radio', 10, 3);
 
 
 /**
@@ -831,21 +831,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_select($html,$location,$cf,$p=''){
+function geodir_cf_select($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_select_loc_{$location}")) {
         /**
          * Filter the select html by location.
          *
@@ -853,11 +853,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_select_var_{$html_var}")) {
         /**
          * Filter the select html by individual custom field.
          *
@@ -866,11 +866,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")) {
         /**
          * Filter the select html by field type key.
          *
@@ -879,11 +879,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
             $field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
@@ -911,16 +911,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $field_value . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$field_value.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_select','geodir_cf_select',10,3);
+add_filter('geodir_custom_field_output_select', 'geodir_cf_select', 10, 3);
 
 
 /**
@@ -933,21 +933,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_multiselect($html,$location,$cf,$p=''){
+function geodir_cf_multiselect($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_multiselect_loc_{$location}")) {
         /**
          * Filter the multiselect html by location.
          *
@@ -955,11 +955,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")) {
         /**
          * Filter the multiselect html by individual custom field.
          *
@@ -968,11 +968,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")) {
         /**
          * Filter the multiselect html by field type key.
          *
@@ -981,11 +981,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
 
         if (!empty($post->{$cf['htmlvar_name']})):
@@ -1006,7 +1006,7 @@ 
 
             $field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
 
-            if(is_array($field_values)){
+            if (is_array($field_values)) {
                 $field_values = array_map('trim', $field_values);
             }
 
@@ -1024,15 +1024,15 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
             $html .= '</span>';
 
             if (count($option_values) > 1) {
                 $html .= '<ul>';
 
                 foreach ($option_values as $val) {
-                    $html .= '<li>' . $val . '</li>';
+                    $html .= '<li>'.$val.'</li>';
                 }
 
                 $html .= '</ul>';
@@ -1047,7 +1047,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
+add_filter('geodir_custom_field_output_multiselect', 'geodir_cf_multiselect', 10, 3);
 
 
 /**
@@ -1060,21 +1060,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_email($html,$location,$cf,$p=''){
+function geodir_cf_email($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_email_loc_{$location}")) {
         /**
          * Filter the email html by location.
          *
@@ -1082,11 +1082,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_email_var_{$html_var}")) {
         /**
          * Filter the email html by individual custom field.
          *
@@ -1095,11 +1095,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")) {
         /**
          * Filter the email html by field type key.
          *
@@ -1108,18 +1108,18 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $preview;
         if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
             return ''; // Remove Send Enquiry from listings page
         }
 
-        $package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
+        $package_info = (array) geodir_post_package_info(array(), $post, $post->post_type);
 
         if ($cf['htmlvar_name'] == 'geodir_email' && $post->{$cf['htmlvar_name']}) {
             $b_send_inquiry = '';
@@ -1127,7 +1127,7 @@ 
             $html = '';
             if (!$preview) {
                 $b_send_inquiry = 'b_send_inquiry';
-                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
+                $html = '<input type="hidden" name="geodir_popup_post_id" value="'.$post->ID.'" /><div class="geodir_display_popup_forms"></div>';
             }
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -1140,20 +1140,20 @@ 
                 $field_icon = '';
             }
 
-            $html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+            $html .= '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
             $seperator = '';
             if ($post->{$cf['htmlvar_name']}) {
                 $b_send_inquiry_url = apply_filters('b_send_inquiry_url', 'javascript:void(0);');
-                $html .= '<a href="'.$b_send_inquiry_url.'" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+                $html .= '<a href="'.$b_send_inquiry_url.'" class="'.$b_send_inquiry.'" >'.SEND_INQUIRY.'</a>';
             }
 
             $html .= '</span></div>';
 
 
             if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
+                $html .= '<p class="sucess_msg">'.SEND_INQUIRY_SUCCESS.'</p>';
             } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
-                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
+                $html .= '<p class="error_msg_fix">'.WRONG_CAPTCH_MSG.'</p>';
             }
 
             /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
@@ -1173,11 +1173,11 @@ 
                 }
 
 
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
                 $html .= '</span><span class="geodir-email-address-output">';
                 $email = $post->{$cf['htmlvar_name']} ;
-                if($e_split = explode('@',$email)){
+                if ($e_split = explode('@', $email)) {
                     /**
                      * Filter email custom field name output.
                      *
@@ -1186,15 +1186,15 @@ 
                      * @param string $email The email string being output.
                      * @param array $cf Custom field variables array.
                      */
-                    $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
-                    if($location=='mapbubble'){
-                        $html .=  "<a href=\"mailto:$email\">$email_name</a>";
-                    }else{
-                        $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
+                    $email_name = apply_filters('geodir_email_field_name_output', $email, $cf);
+                    if ($location == 'mapbubble') {
+                        $html .= "<a href=\"mailto:$email\">$email_name</a>";
+                    } else {
+                        $html .= "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
                     }
 
-                }else{
-                    $html .=  $email;
+                } else {
+                    $html .= $email;
                 }
                 $html .= '</span></div>';
             }
@@ -1205,7 +1205,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_email','geodir_cf_email',10,3);
+add_filter('geodir_custom_field_output_email', 'geodir_cf_email', 10, 3);
 
 
 /**
@@ -1218,21 +1218,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_file($html,$location,$cf,$p=''){
+function geodir_cf_file($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_file_loc_{$location}")) {
         /**
          * Filter the file html by location.
          *
@@ -1240,11 +1240,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_file_var_{$html_var}")) {
         /**
          * Filter the file html by individual custom field.
          *
@@ -1253,11 +1253,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")) {
         /**
          * Filter the file html by field type key.
          *
@@ -1266,11 +1266,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})):
 
@@ -1278,7 +1278,7 @@ 
             if (!empty($files)):
 
                 $extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
-                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
+                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';
 
                 $file_paths = '';
                 foreach ($files as $file) {
@@ -1316,14 +1316,14 @@ 
                             //$file_paths .= '<img src="'.$file.'"  />';	
                             $file_paths .= '</div>';
                         }elseif (in_array($uploaded_file_type, $audio_file_types)) {// if audio
-                            $ext_path = '_' . $html_var . '_';
+                            $ext_path = '_'.$html_var.'_';
                             $filename = explode($ext_path, $filename);
                             $file_paths .= '<span class="gd-audio-name">'.$filename[count($filename) - 1].'</span>';
                             $file_paths .= do_shortcode('[audio src="'.$file.'" ]');
                         } else {
-                            $ext_path = '_' . $html_var . '_';
+                            $ext_path = '_'.$html_var.'_';
                             $filename = explode($ext_path, $filename);
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
+                            $file_paths .= '<a href="'.$file.'" target="_blank">'.$filename[count($filename) - 1].'</a>';
                         }
                     }
                 }
@@ -1338,11 +1338,11 @@ 
                     $field_icon = '';
                 }
 
-                $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+                $html = '<div class="geodir_more_info  '.$cf['css_class'].' geodir-custom-file-box '.$cf['htmlvar_name'].'"><div class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
                 $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
                 $html .= '</span>';
-                $html .= $file_paths . '</div></div>';
+                $html .= $file_paths.'</div></div>';
 
             endif;
         endif;
@@ -1351,7 +1351,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_file','geodir_cf_file',10,3);
+add_filter('geodir_custom_field_output_file', 'geodir_cf_file', 10, 3);
 
 
 
@@ -1365,21 +1365,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_textarea($html,$location,$cf,$p=''){
+function geodir_cf_textarea($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_textarea_loc_{$location}")) {
         /**
          * Filter the textarea html by location.
          *
@@ -1387,11 +1387,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_textarea_var_{$html_var}")) {
         /**
          * Filter the textarea html by individual custom field.
          *
@@ -1400,11 +1400,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")) {
         /**
          * Filter the textarea html by field type key.
          *
@@ -1413,11 +1413,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})) {
 
@@ -1432,9 +1432,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
 
         }
 
@@ -1442,7 +1442,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_textarea','geodir_cf_textarea',10,3);
+add_filter('geodir_custom_field_output_textarea', 'geodir_cf_textarea', 10, 3);
 
 
 
@@ -1456,21 +1456,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_html($html,$location,$cf,$p=''){
+function geodir_cf_html($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_html_loc_{$location}")) {
         /**
          * Filter the html html by location.
          *
@@ -1478,11 +1478,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_html_var_{$html_var}")) {
         /**
          * Filter the html html by individual custom field.
          *
@@ -1491,11 +1491,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")) {
         /**
          * Filter the html html by field type key.
          *
@@ -1504,11 +1504,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})) {
 
@@ -1522,9 +1522,9 @@ 
                 $field_icon = '';
             }
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
 
         }
 
@@ -1532,7 +1532,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_html','geodir_cf_html',10,3);
+add_filter('geodir_custom_field_output_html', 'geodir_cf_html', 10, 3);
 
 
 
@@ -1546,21 +1546,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_taxonomy($html,$location,$cf,$p=''){
+function geodir_cf_taxonomy($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")) {
         /**
          * Filter the taxonomy html by location.
          *
@@ -1568,11 +1568,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")) {
         /**
          * Filter the taxonomy html by individual custom field.
          *
@@ -1581,11 +1581,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")) {
         /**
          * Filter the taxonomy html by field type key.
          *
@@ -1594,14 +1594,14 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
-            $post_taxonomy = $post->post_type . 'category';
+        if ($html_var == $post->post_type.'category' && !empty($post->{$html_var})) {
+            $post_taxonomy = $post->post_type.'category';
             $field_value = $post->{$html_var};
             $links = array();
             $terms = array();
@@ -1619,7 +1619,7 @@ 
                     if ($term != '') {
                         $term = get_term_by('id', $term, $html_var);
                         if (is_object($term)) {
-                            $links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
+                            $links[] = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>".$term->name."</a>";
                             $terms[] = $term;
                         }
                     }
@@ -1633,7 +1633,7 @@ 
                     $terms = $termsOrdered;
                 }
             }
-            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
+            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object) $terms) : '';
 
             if ($html_value != '') {
                 $field_icon = geodir_field_icon_proccess($cf);
@@ -1646,9 +1646,9 @@ 
                     $field_icon = '';
                 }
 
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span> ' . $html_value . '</div>';
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$html_var.'" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="'.$field_icon.'">'.$field_icon_af;
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+                $html .= '</span> '.$html_value.'</div>';
             }
         }
 
@@ -1656,7 +1656,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_taxonomy','geodir_cf_taxonomy',10,3);
+add_filter('geodir_custom_field_output_taxonomy', 'geodir_cf_taxonomy', 10, 3);
 
 
 /**
@@ -1670,21 +1670,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_address($html,$location,$cf,$p=''){
+function geodir_cf_address($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_address_loc_{$location}")) {
         /**
          * Filter the address html by location.
          *
@@ -1692,11 +1692,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_address_var_{$html_var}")) {
         /**
          * Filter the address html by individual custom field.
          *
@@ -1705,11 +1705,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")) {
         /**
          * Filter the address html by field type key.
          *
@@ -1718,14 +1718,14 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $preview;
-        $html_var = $cf['htmlvar_name'] . '_address';
+        $html_var = $cf['htmlvar_name'].'_address';
 
         if ($cf['extra_fields']) {
 
@@ -1788,37 +1788,37 @@ 
 
         if ($post->{$html_var}) {
 
-            $field_icon = geodir_field_icon_proccess( $cf );
-            if ( strpos( $field_icon, 'http' ) !== false ) {
+            $field_icon = geodir_field_icon_proccess($cf);
+            if (strpos($field_icon, 'http') !== false) {
                 $field_icon_af = '';
-            } elseif ( $field_icon == '' ) {
+            } elseif ($field_icon == '') {
                 $field_icon_af = '<i class="fa fa-home"></i>';
             } else {
                 $field_icon_af = $field_icon;
                 $field_icon    = '';
             }
             
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
-            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$html_var.'" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
+            $html .= '<span class="geodir-i-location" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
             $html .= '</span>';
             
             $address_fields = array();
 
-            if ( isset($post->post_address) ) {
-                $address_fields['post_address'] = '<span itemprop="streetAddress">' . $post->post_address . '</span>';
+            if (isset($post->post_address)) {
+                $address_fields['post_address'] = '<span itemprop="streetAddress">'.$post->post_address.'</span>';
             }
-            if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
-                $address_fields['post_city'] = '<span itemprop="addressLocality">' . $post->post_city . '</span>';
+            if ($show_city_in_address && isset($post->post_city) && $post->post_city) {
+                $address_fields['post_city'] = '<span itemprop="addressLocality">'.$post->post_city.'</span>';
             }
-            if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
-                $address_fields['post_region'] = '<span itemprop="addressRegion">' . $post->post_region . '</span>';
+            if ($show_region_in_address && isset($post->post_region) && $post->post_region) {
+                $address_fields['post_region'] = '<span itemprop="addressRegion">'.$post->post_region.'</span>';
             }
-            if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
-                $address_fields['post_zip'] = '<span itemprop="postalCode">' . $post->post_zip . '</span>';
+            if ($show_zip_in_address && isset($post->post_zip) && $post->post_zip) {
+                $address_fields['post_zip'] = '<span itemprop="postalCode">'.$post->post_zip.'</span>';
             }
-            if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
-                $address_fields['post_country'] = '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span>';
+            if ($show_country_in_address && isset($post->post_country) && $post->post_country) {
+                $address_fields['post_country'] = '<span itemprop="addressCountry">'.__($post->post_country, 'geodirectory').'</span>';
             }
             
             /**
@@ -1844,4 +1844,4 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
\ No newline at end of file
+add_filter('geodir_custom_field_output_address', 'geodir_cf_address', 10, 3);
\ No newline at end of file

geodirectory-functions/general_functions.php

Spacing +1317 added lines, -1317 removed lines

@@ -10,7 +10,7 @@ 
 /**

  * Get All Plugin functions from WordPress

  */

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

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

 

 /*-----------------------------------------------------------------------------------*/

 /* Helper functions */

@@ -27,7 +27,7 @@ 
  * @return string example url eg: http://wpgeo.directory/wp-content/plugins/geodirectory

  */

 function geodir_plugin_url() {

-	return plugins_url( '', dirname( __FILE__ ) );

+	return plugins_url('', dirname(__FILE__));

 	/*

 	if ( is_ssl() ) :

 		return str_replace( 'http://', 'https://', WP_PLUGIN_URL ) . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) );

@@ -47,10 +47,10 @@ 
  * @return string example url eg: /home/geo/public_html/wp-content/plugins/geodirectory

  */

 function geodir_plugin_path() {

-	if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {

-		return dirname( dirname( __FILE__ ) );

+	if (defined('GD_TESTING_MODE') && GD_TESTING_MODE) {

+		return dirname(dirname(__FILE__));

 	} else {

-		return WP_PLUGIN_DIR . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) );

+		return WP_PLUGIN_DIR."/".plugin_basename(dirname(dirname(__FILE__)));

 	}

 }

 

@@ -65,10 +65,10 @@ 
  * @return bool true or false.

  * @todo    check if this is faster than normal WP check and remove if not.

  */

-function geodir_is_plugin_active( $plugin ) {

-	$active_plugins = get_option( 'active_plugins' );

-	foreach ( $active_plugins as $key => $active_plugin ) {

-		if ( strstr( $active_plugin, $plugin ) ) {

+function geodir_is_plugin_active($plugin) {

+	$active_plugins = get_option('active_plugins');

+	foreach ($active_plugins as $key => $active_plugin) {

+		if (strstr($active_plugin, $plugin)) {

 			return true;

 		}

 	}

@@ -90,8 +90,8 @@ 
  *

  * @return bool|int|string the formatted date.

  */

-function geodir_get_formated_date( $date ) {

-	return mysql2date( get_option( 'date_format' ), $date );

+function geodir_get_formated_date($date) {

+	return mysql2date(get_option('date_format'), $date);

 }

 

 /**

@@ -107,8 +107,8 @@ 
  *

  * @return bool|int|string the formatted time.

  */

-function geodir_get_formated_time( $time ) {

-	return mysql2date( get_option( 'time_format' ), $time, $translate = true );

+function geodir_get_formated_time($time) {

+	return mysql2date(get_option('time_format'), $time, $translate = true);

 }

 

 

@@ -126,35 +126,35 @@ 
  *

  * @return string Formatted link.

  */

-function geodir_getlink( $url, $params = array(), $use_existing_arguments = false ) {

-	if ( $use_existing_arguments ) {

+function geodir_getlink($url, $params = array(), $use_existing_arguments = false) {

+	if ($use_existing_arguments) {

 		$params = $params + $_GET;

 	}

-	if ( ! $params ) {

+	if (!$params) {

 		return $url;

 	}

 	$link = $url;

-	if ( strpos( $link, '?' ) === false ) {

+	if (strpos($link, '?') === false) {

 		$link .= '?';

 	} //If there is no '?' add one at the end

-	elseif ( strpos( $link, '//maps.google.com/maps/api/js?language=' ) ) {

+	elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) {

 		$link .= '&';

 	} //If there is no '&' at the END, add one.

-	elseif ( ! preg_match( '/(\?|\&(amp;)?)$/', $link ) ) {

+	elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) {

 		$link .= '&';

 	} //If there is no '&' at the END, add one.

 

 	$params_arr = array();

-	foreach ( $params as $key => $value ) {

-		if ( gettype( $value ) == 'array' ) { //Handle array data properly

-			foreach ( $value as $val ) {

-				$params_arr[] = $key . '[]=' . urlencode( $val );

+	foreach ($params as $key => $value) {

+		if (gettype($value) == 'array') { //Handle array data properly

+			foreach ($value as $val) {

+				$params_arr[] = $key.'[]='.urlencode($val);

 			}

 		} else {

-			$params_arr[] = $key . '=' . urlencode( $value );

+			$params_arr[] = $key.'='.urlencode($value);

 		}

 	}

-	$link .= implode( '&', $params_arr );

+	$link .= implode('&', $params_arr);

 

 	return $link;

 }

@@ -171,18 +171,18 @@ 
  *

  * @return string Listing page url if valid. Otherwise home url will be returned.

  */

-function geodir_get_addlisting_link( $post_type = '' ) {

+function geodir_get_addlisting_link($post_type = '') {

 	global $wpdb;

 

 	//$check_pkg  = $wpdb->get_var("SELECT pid FROM ".GEODIR_PRICE_TABLE." WHERE post_type='".$post_type."' and status != '0'");

 	$check_pkg = 1;

-	if ( post_type_exists( $post_type ) && $check_pkg ) {

+	if (post_type_exists($post_type) && $check_pkg) {

 

-		$add_listing_link = get_page_link( geodir_add_listing_page_id() );

+		$add_listing_link = get_page_link(geodir_add_listing_page_id());

 

-		return esc_url( add_query_arg( array( 'listing_type' => $post_type ), $add_listing_link ) );

+		return esc_url(add_query_arg(array('listing_type' => $post_type), $add_listing_link));

 	} else {

-		return get_bloginfo( 'url' );

+		return get_bloginfo('url');

 	}

 }

 

@@ -210,7 +210,7 @@ 
 	if (!empty($_SERVER['PHP_SELF']) && !empty($_SERVER['REQUEST_URI'])) {

 		// To build the entire URI we need to prepend the protocol, and the http host

 		// to the URI string.

-		$pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];

+		$pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];

 	} else {

 		/*

 		 * Since we do not have REQUEST_URI to work with, we will assume we are

@@ -219,11 +219,11 @@ 
 		 *

 		 * IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS

 		 */

-		$pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME'];

+		$pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'];

 		

 		// If the query string exists append it to the URI string

 		if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {

-			$pageURL .= '?' . $_SERVER['QUERY_STRING'];

+			$pageURL .= '?'.$_SERVER['QUERY_STRING'];

 		}

 	}

 	

@@ -234,7 +234,7 @@ 
 	 *

 	 * @param string $pageURL The URL of the current page.

 	 */

-	return apply_filters( 'geodir_curPageURL', $pageURL );

+	return apply_filters('geodir_curPageURL', $pageURL);

 }

 

 /**

@@ -249,12 +249,12 @@ 
  *

  * @return string Cleaned variable.

  */

-function geodir_clean( $string ) {

+function geodir_clean($string) {

 

-	$string = trim( strip_tags( stripslashes( $string ) ) );

-	$string = str_replace( " ", "-", $string ); // Replaces all spaces with hyphens.

-	$string = preg_replace( '/[^A-Za-z0-9\-\_]/', '', $string ); // Removes special chars.

-	$string = preg_replace( '/-+/', '-', $string ); // Replaces multiple hyphens with single one.

+	$string = trim(strip_tags(stripslashes($string)));

+	$string = str_replace(" ", "-", $string); // Replaces all spaces with hyphens.

+	$string = preg_replace('/[^A-Za-z0-9\-\_]/', '', $string); // Removes special chars.

+	$string = preg_replace('/-+/', '-', $string); // Replaces multiple hyphens with single one.

 

 	return $string;

 }

@@ -268,13 +268,13 @@ 
  */

 function geodir_get_weekday() {

 	return array(

-		__( 'Sunday', 'geodirectory' ),

-		__( 'Monday', 'geodirectory' ),

-		__( 'Tuesday', 'geodirectory' ),

-		__( 'Wednesday', 'geodirectory' ),

-		__( 'Thursday', 'geodirectory' ),

-		__( 'Friday', 'geodirectory' ),

-		__( 'Saturday', 'geodirectory' )

+		__('Sunday', 'geodirectory'),

+		__('Monday', 'geodirectory'),

+		__('Tuesday', 'geodirectory'),

+		__('Wednesday', 'geodirectory'),

+		__('Thursday', 'geodirectory'),

+		__('Friday', 'geodirectory'),

+		__('Saturday', 'geodirectory')

 	);

 }

 

@@ -287,11 +287,11 @@ 
  */

 function geodir_get_weeks() {

 	return array(

-		__( 'First', 'geodirectory' ),

-		__( 'Second', 'geodirectory' ),

-		__( 'Third', 'geodirectory' ),

-		__( 'Fourth', 'geodirectory' ),

-		__( 'Last', 'geodirectory' )

+		__('First', 'geodirectory'),

+		__('Second', 'geodirectory'),

+		__('Third', 'geodirectory'),

+		__('Fourth', 'geodirectory'),

+		__('Last', 'geodirectory')

 	);

 }

 

@@ -310,112 +310,112 @@ 
  *

  * @return bool If valid returns true. Otherwise false.

  */

-function geodir_is_page( $gdpage = '' ) {

+function geodir_is_page($gdpage = '') {

 

 	global $wp_query, $post, $wp;

 	//if(!is_admin()):

 

-	switch ( $gdpage ):

+	switch ($gdpage):

 		case 'add-listing':

 

-			if ( is_page() && get_query_var( 'page_id' ) == geodir_add_listing_page_id() ) {

+			if (is_page() && get_query_var('page_id') == geodir_add_listing_page_id()) {

 				return true;

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

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

 				return true;

 			}

 

 			break;

 		case 'preview':

-			if ( ( is_page() && get_query_var( 'page_id' ) == geodir_preview_page_id() ) && isset( $_REQUEST['listing_type'] )

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

+			if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])

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

 			) {

 				return true;

 			}

 			break;

 		case 'listing-success':

-			if ( is_page() && get_query_var( 'page_id' ) == geodir_success_page_id() ) {

+			if (is_page() && get_query_var('page_id') == geodir_success_page_id()) {

 				return true;

 			}

 			break;

 		case 'detail':

-			$post_type = get_query_var( 'post_type' );

-			if ( is_array( $post_type ) ) {

-				$post_type = reset( $post_type );

+			$post_type = get_query_var('post_type');

+			if (is_array($post_type)) {

+				$post_type = reset($post_type);

 			}

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

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

 				return true;

 			}

 			break;

 		case 'pt':

-			$post_type = get_query_var( 'post_type' );

-			if ( is_array( $post_type ) ) {

-				$post_type = reset( $post_type );

+			$post_type = get_query_var('post_type');

+			if (is_array($post_type)) {

+				$post_type = reset($post_type);

 			}

-			if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) && ! is_tax() ) {

+			if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes()) && !is_tax()) {

 				return true;

 			}

 

 			break;

 		case 'listing':

-			if ( is_tax() && geodir_get_taxonomy_posttype() ) {

+			if (is_tax() && geodir_get_taxonomy_posttype()) {

 				global $current_term, $taxonomy, $term;

 

 				return true;

 			}

-			$post_type = get_query_var( 'post_type' );

-			if ( is_array( $post_type ) ) {

-				$post_type = reset( $post_type );

+			$post_type = get_query_var('post_type');

+			if (is_array($post_type)) {

+				$post_type = reset($post_type);

 			}

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

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

 				return true;

 			}

 

 			break;

 		case 'home':

 

-			if ( ( is_page() && get_query_var( 'page_id' ) == geodir_home_page_id() ) || is_page_geodir_home() ) {

+			if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home()) {

 				return true;

 			}

 

 			break;

 		case 'location':

-			if ( is_page() && get_query_var( 'page_id' ) == geodir_location_page_id() ) {

+			if (is_page() && get_query_var('page_id') == geodir_location_page_id()) {

 				return true;

 			}

 			break;

 		case 'author':

-			if ( is_author() && isset( $_REQUEST['geodir_dashbord'] ) ) {

+			if (is_author() && isset($_REQUEST['geodir_dashbord'])) {

 				return true;

 			}

 

-			if ( function_exists( 'bp_loggedin_user_id' ) && function_exists( 'bp_displayed_user_id' ) && $my_id = (int) bp_loggedin_user_id() ) {

-				if ( ( (bool) bp_is_current_component( 'listings' ) || (bool) bp_is_current_component( 'favorites' ) ) && $my_id > 0 && $my_id == (int) bp_displayed_user_id() ) {

+			if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int) bp_loggedin_user_id()) {

+				if (((bool) bp_is_current_component('listings') || (bool) bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int) bp_displayed_user_id()) {

 					return true;

 				}

 			}

 			break;

 		case 'search':

-			if ( is_search() && isset( $_REQUEST['geodir_search'] ) ) {

+			if (is_search() && isset($_REQUEST['geodir_search'])) {

 				return true;

 			}

 			break;

 		case 'info':

-			if ( is_page() && get_query_var( 'page_id' ) == geodir_info_page_id() ) {

+			if (is_page() && get_query_var('page_id') == geodir_info_page_id()) {

 				return true;

 			}

 			break;

 		case 'login':

-			if ( is_page() && get_query_var( 'page_id' ) == geodir_login_page_id() ) {

+			if (is_page() && get_query_var('page_id') == geodir_login_page_id()) {

 				return true;

 			}

 			break;

 		case 'checkout':

-			if ( is_page() && function_exists( 'geodir_payment_checkout_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_checkout_page_id() ) {

+			if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id()) {

 				return true;

 			}

 			break;

 		case 'invoices':

-			if ( is_page() && function_exists( 'geodir_payment_invoices_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_invoices_page_id() ) {

+			if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id()) {

 				return true;

 			}

 			break;

@@ -440,25 +440,25 @@ 
  *

  * @param object $wp WordPress object.

  */

-function geodir_set_is_geodir_page( $wp ) {

-	if ( ! is_admin() ) {

+function geodir_set_is_geodir_page($wp) {

+	if (!is_admin()) {

 		//$wp->query_vars['gd_is_geodir_page'] = false;

 		//print_r()

-		if ( empty( $wp->query_vars ) || ! array_diff( array_keys( $wp->query_vars ), array(

+		if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array(

 				'preview',

 				'page',

 				'paged',

 				'cpage'

-			) )

+			))

 		) {

-			if ( geodir_is_page( 'home' ) ) {

+			if (geodir_is_page('home')) {

 				$wp->query_vars['gd_is_geodir_page'] = true;

 			}

 

 

 		}

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['page_id'] ) ) {

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['page_id'])) {

 			if (

 				$wp->query_vars['page_id'] == geodir_add_listing_page_id()

 				|| $wp->query_vars['page_id'] == geodir_preview_page_id()

@@ -467,26 +467,26 @@ 
 				|| $wp->query_vars['page_id'] == geodir_home_page_id()

 				|| $wp->query_vars['page_id'] == geodir_info_page_id()

 				|| $wp->query_vars['page_id'] == geodir_login_page_id()

-				|| ( function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() )

-				|| ( function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() )

+				|| (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())

+				|| (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())

 			) {

 				$wp->query_vars['gd_is_geodir_page'] = true;

 			}

 		}

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['pagename'] ) ) {

-			$page = get_page_by_path( $wp->query_vars['pagename'] );

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {

+			$page = get_page_by_path($wp->query_vars['pagename']);

 

-			if ( ! empty( $page ) && (

+			if (!empty($page) && (

 					$page->ID == geodir_add_listing_page_id()

 					|| $page->ID == geodir_preview_page_id()

 					|| $page->ID == geodir_success_page_id()

 					|| $page->ID == geodir_location_page_id()

-					|| ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_home_page_id() )

-					|| ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_info_page_id() )

-					|| ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_login_page_id() )

-					|| ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() )

-					|| ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() )

+					|| (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_home_page_id())

+					|| (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_info_page_id())

+					|| (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_login_page_id())

+					|| (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())

+					|| (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())

 				)

 			) {

 				$wp->query_vars['gd_is_geodir_page'] = true;

@@ -494,20 +494,20 @@ 
 		}

 

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['post_type'] ) && $wp->query_vars['post_type'] != '' ) {

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {

 			$requested_post_type = $wp->query_vars['post_type'];

 			// check if this post type is geodirectory post types

 			$post_type_array = geodir_get_posttypes();

-			if ( in_array( $requested_post_type, $post_type_array ) ) {

+			if (in_array($requested_post_type, $post_type_array)) {

 				$wp->query_vars['gd_is_geodir_page'] = true;

 			}

 		}

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) ) {

-			$geodir_taxonomis = geodir_get_taxonomies( '', true );

-			if ( ! empty( $geodir_taxonomis ) ) {

-				foreach ( $geodir_taxonomis as $taxonomy ) {

-					if ( array_key_exists( $taxonomy, $wp->query_vars ) ) {

+		if (!isset($wp->query_vars['gd_is_geodir_page'])) {

+			$geodir_taxonomis = geodir_get_taxonomies('', true);

+			if (!empty($geodir_taxonomis)) {

+				foreach ($geodir_taxonomis as $taxonomy) {

+					if (array_key_exists($taxonomy, $wp->query_vars)) {

 						$wp->query_vars['gd_is_geodir_page'] = true;

 						break;

 					}

@@ -516,20 +516,20 @@ 
 

 		}

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['author_name'] ) && isset( $_REQUEST['geodir_dashbord'] ) ) {

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord'])) {

 			$wp->query_vars['gd_is_geodir_page'] = true;

 		}

 

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $_REQUEST['geodir_search'] ) ) {

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search'])) {

 			$wp->query_vars['gd_is_geodir_page'] = true;

 		}

 

 

 //check if homepage

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] )

-		     && ! isset( $wp->query_vars['page_id'] )

-		     && ! isset( $wp->query_vars['pagename'] )

+		if (!isset($wp->query_vars['gd_is_geodir_page'])

+		     && !isset($wp->query_vars['page_id'])

+		     && !isset($wp->query_vars['pagename'])

 		     && is_page_geodir_home()

 		) {

 			$wp->query_vars['gd_is_geodir_page'] = true;

@@ -553,14 +553,14 @@ 
  */

 function geodir_is_geodir_page() {

 	global $wp;

-	if ( isset( $wp->query_vars['gd_is_geodir_page'] ) && $wp->query_vars['gd_is_geodir_page'] ) {

+	if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page']) {

 		return true;

 	} else {

 		return false;

 	}

 }

 

-if ( ! function_exists( 'geodir_get_imagesize' ) ) {

+if (!function_exists('geodir_get_imagesize')) {

 	/**

 	 * Get image size using the size key .

 	 *

@@ -571,13 +571,13 @@ 
 	 *

 	 * @return array|mixed|void|WP_Error If valid returns image size. Else returns error.

 	 */

-	function geodir_get_imagesize( $size = '' ) {

+	function geodir_get_imagesize($size = '') {

 

 		$imagesizes = array(

-			'list-thumb'   => array( 'w' => 283, 'h' => 188 ),

-			'thumbnail'    => array( 'w' => 125, 'h' => 125 ),

-			'widget-thumb' => array( 'w' => 50, 'h' => 50 ),

-			'slider-thumb' => array( 'w' => 100, 'h' => 100 )

+			'list-thumb'   => array('w' => 283, 'h' => 188),

+			'thumbnail'    => array('w' => 125, 'h' => 125),

+			'widget-thumb' => array('w' => 50, 'h' => 50),

+			'slider-thumb' => array('w' => 100, 'h' => 100)

 		);

 

 		/**

@@ -587,9 +587,9 @@ 
 		 *

 		 * @param array $imagesizes Image size array.

 		 */

-		$imagesizes = apply_filters( 'geodir_imagesizes', $imagesizes );

+		$imagesizes = apply_filters('geodir_imagesizes', $imagesizes);

 

-		if ( ! empty( $size ) && array_key_exists( $size, $imagesizes ) ) {

+		if (!empty($size) && array_key_exists($size, $imagesizes)) {

 			/**

 			 * Filters image size of the passed key.

 			 *

@@ -597,11 +597,11 @@ 
 			 *

 			 * @param array $imagesizes [$size] Image size array of the passed key.

 			 */

-			return apply_filters( 'geodir_get_imagesize_' . $size, $imagesizes[ $size ] );

+			return apply_filters('geodir_get_imagesize_'.$size, $imagesizes[$size]);

 

-		} elseif ( ! empty( $size ) ) {

+		} elseif (!empty($size)) {

 

-			return new WP_Error( 'geodir_no_imagesize', __( "Given image size is not valid", 'geodirectory' ) );

+			return new WP_Error('geodir_no_imagesize', __("Given image size is not valid", 'geodirectory'));

 

 		}

 

@@ -625,7 +625,7 @@ 
 */

 

 

-if ( ! function_exists( 'createRandomString' ) ) {

+if (!function_exists('createRandomString')) {

 	/**

 	 * Creates random string.

 	 *

@@ -635,21 +635,21 @@ 
 	 */

 	function createRandomString() {

 		$chars = "abcdefghijkmlnopqrstuvwxyz1023456789";

-		srand( (double) microtime() * 1000000 );

+		srand((double) microtime() * 1000000);

 		$i       = 0;

 		$rstring = '';

-		while ( $i <= 25 ) {

+		while ($i <= 25) {

 			$num     = rand() % 33;

-			$tmp     = substr( $chars, $num, 1 );

-			$rstring = $rstring . $tmp;

-			$i ++;

+			$tmp     = substr($chars, $num, 1);

+			$rstring = $rstring.$tmp;

+			$i++;

 		}

 

 		return $rstring;

 	}

 }

 

-if ( ! function_exists( 'geodir_getDistanceRadius' ) ) {

+if (!function_exists('geodir_getDistanceRadius')) {

 	/**

 	 * Calculates the distance radius.

 	 *

@@ -660,9 +660,9 @@ 
 	 *

 	 * @return float The mean radius.

 	 */

-	function geodir_getDistanceRadius( $uom = 'km' ) {

+	function geodir_getDistanceRadius($uom = 'km') {

 //	Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude

-		switch ( geodir_strtolower( $uom ) ):

+		switch (geodir_strtolower($uom)):

 			case 'km'    :

 				$earthMeanRadius = 6371.009; // km

 				break;

@@ -694,7 +694,7 @@ 
 }

 

 

-if ( ! function_exists( 'geodir_calculateDistanceFromLatLong' ) ) {

+if (!function_exists('geodir_calculateDistanceFromLatLong')) {

 	/**

 	 * Calculate the great circle distance between two points identified by longitude and latitude.

 	 *

@@ -707,17 +707,17 @@ 
 	 *

 	 * @return float The distance.

 	 */

-	function geodir_calculateDistanceFromLatLong( $point1, $point2, $uom = 'km' ) {

+	function geodir_calculateDistanceFromLatLong($point1, $point2, $uom = 'km') {

 //	Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude

 

-		$earthMeanRadius = geodir_getDistanceRadius( $uom );

+		$earthMeanRadius = geodir_getDistanceRadius($uom);

 

-		$deltaLatitude  = deg2rad( (float) $point2['latitude'] - (float) $point1['latitude'] );

-		$deltaLongitude = deg2rad( (float) $point2['longitude'] - (float) $point1['longitude'] );

-		$a              = sin( $deltaLatitude / 2 ) * sin( $deltaLatitude / 2 ) +

-		                  cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) *

-		                  sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 );

-		$c              = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) );

+		$deltaLatitude  = deg2rad((float) $point2['latitude'] - (float) $point1['latitude']);

+		$deltaLongitude = deg2rad((float) $point2['longitude'] - (float) $point1['longitude']);

+		$a              = sin($deltaLatitude / 2) * sin($deltaLatitude / 2) +

+		                  cos(deg2rad((float) $point1['latitude'])) * cos(deg2rad((float) $point2['latitude'])) *

+		                  sin($deltaLongitude / 2) * sin($deltaLongitude / 2);

+		$c              = 2 * atan2(sqrt($a), sqrt(1 - $a));

 		$distance       = $earthMeanRadius * $c;

 

 		return $distance;

@@ -726,7 +726,7 @@ 
 }

 

 

-if ( ! function_exists( 'geodir_sendEmail' ) ) {

+if (!function_exists('geodir_sendEmail')) {

 	/**

 	 * The main function that send transactional emails using the args provided.

 	 *

@@ -745,92 +745,92 @@ 
 	 * @param string $post_id       The post ID.

 	 * @param string $user_id       The user ID.

 	 */

-	function geodir_sendEmail( $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '' ) {

+	function geodir_sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '') {

 		$login_details = '';

 

 		// strip slashes from subject & message text

-		$to_subject = stripslashes_deep( $to_subject );

-		$to_message = stripslashes_deep( $to_message );

+		$to_subject = stripslashes_deep($to_subject);

+		$to_message = stripslashes_deep($to_message);

 

-		if ( $message_type == 'send_enquiry' ) {

-			$subject = get_option( 'geodir_email_enquiry_subject' );

-			$message = get_option( 'geodir_email_enquiry_content' );

+		if ($message_type == 'send_enquiry') {

+			$subject = get_option('geodir_email_enquiry_subject');

+			$message = get_option('geodir_email_enquiry_content');

 

 			// change to name in some cases

-			$post_author = get_post_field( 'post_author', $post_id );

-			if(is_super_admin( $post_author  )){// if admin probably not the post author so change name

-				$toEmailName = __('Business Owner','geodirectory');

-			}elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed

-				$toEmailName = __('Business Owner','geodirectory');

+			$post_author = get_post_field('post_author', $post_id);

+			if (is_super_admin($post_author)) {// if admin probably not the post author so change name

+				$toEmailName = __('Business Owner', 'geodirectory');

+			}elseif (defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id, 'claimed') != '1') {// if claim manager installed but listing not claimed

+				$toEmailName = __('Business Owner', 'geodirectory');

 			}

 

 

-		} elseif ( $message_type == 'forgot_password' ) {

-			$subject       = get_option( 'geodir_forgot_password_subject' );

-			$message       = get_option( 'geodir_forgot_password_content' );

+		} elseif ($message_type == 'forgot_password') {

+			$subject       = get_option('geodir_forgot_password_subject');

+			$message       = get_option('geodir_forgot_password_content');

 			$login_details = $to_message;

-		} elseif ( $message_type == 'registration' ) {

-			$subject       = get_option( 'geodir_registration_success_email_subject' );

-			$message       = get_option( 'geodir_registration_success_email_content' );

+		} elseif ($message_type == 'registration') {

+			$subject       = get_option('geodir_registration_success_email_subject');

+			$message       = get_option('geodir_registration_success_email_content');

 			$login_details = $to_message;

-		} elseif ( $message_type == 'post_submit' ) {

-			$subject = get_option( 'geodir_post_submited_success_email_subject' );

-			$message = get_option( 'geodir_post_submited_success_email_content' );

-		} elseif ( $message_type == 'listing_published' ) {

-			$subject = get_option( 'geodir_post_published_email_subject' );

-			$message = get_option( 'geodir_post_published_email_content' );

-		} elseif ( $message_type == 'listing_edited' ) {

-			$subject = get_option( 'geodir_post_edited_email_subject_admin' );

-			$message = get_option( 'geodir_post_edited_email_content_admin' );

+		} elseif ($message_type == 'post_submit') {

+			$subject = get_option('geodir_post_submited_success_email_subject');

+			$message = get_option('geodir_post_submited_success_email_content');

+		} elseif ($message_type == 'listing_published') {

+			$subject = get_option('geodir_post_published_email_subject');

+			$message = get_option('geodir_post_published_email_content');

+		} elseif ($message_type == 'listing_edited') {

+			$subject = get_option('geodir_post_edited_email_subject_admin');

+			$message = get_option('geodir_post_edited_email_content_admin');

 		}

 

-		if ( ! empty( $subject ) ) {

-			$subject = __( stripslashes_deep( $subject ), 'geodirectory' );

+		if (!empty($subject)) {

+			$subject = __(stripslashes_deep($subject), 'geodirectory');

 		}

 

-		if ( ! empty( $message ) ) {

-			$message = __( stripslashes_deep( $message ), 'geodirectory' );

+		if (!empty($message)) {

+			$message = __(stripslashes_deep($message), 'geodirectory');

 		}

 

-		$to_message        = nl2br( $to_message );

-		$sitefromEmail     = get_option( 'site_email' );

+		$to_message        = nl2br($to_message);

+		$sitefromEmail     = get_option('site_email');

 		$sitefromEmailName = get_site_emailName();

-		$productlink       = get_permalink( $post_id );

+		$productlink       = get_permalink($post_id);

 

 		$user_login = '';

-		if ( $user_id > 0 && $user_info = get_userdata( $user_id ) ) {

+		if ($user_id > 0 && $user_info = get_userdata($user_id)) {

 			$user_login = $user_info->user_login;

 		}

 

 		$posted_date = '';

 		$listingLink = '';

 

-		$post_info = get_post( $post_id );

+		$post_info = get_post($post_id);

 

-		if ( $post_info ) {

+		if ($post_info) {

 			$posted_date = $post_info->post_date;

-			$listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>';

+			$listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>';

 		}

 		$siteurl       = home_url();

-		$siteurl_link  = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

+		$siteurl_link  = '<a href="'.$siteurl.'">'.$siteurl.'</a>';

 		$loginurl      = geodir_login_url();

-		$loginurl_link = '<a href="' . $loginurl . '">login</a>';

+		$loginurl_link = '<a href="'.$loginurl.'">login</a>';

         

-		$post_author_id   = ! empty( $post_info ) ? $post_info->post_author : 0;

-		$post_author_data = $post_author_id ? get_userdata( $post_author_id ) : NULL;

-		$post_author_name = geodir_get_client_name( $post_author_id );

-		$post_author_email = !empty( $post_author_data->user_email ) ? $post_author_data->user_email : '';

-		$current_date     = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) );

-

-		if ( $fromEmail == '' ) {

-			$fromEmail = get_option( 'site_email' );

+		$post_author_id   = !empty($post_info) ? $post_info->post_author : 0;

+		$post_author_data = $post_author_id ? get_userdata($post_author_id) : NULL;

+		$post_author_name = geodir_get_client_name($post_author_id);

+		$post_author_email = !empty($post_author_data->user_email) ? $post_author_data->user_email : '';

+		$current_date     = date_i18n('Y-m-d H:i:s', current_time('timestamp'));

+

+		if ($fromEmail == '') {

+			$fromEmail = get_option('site_email');

 		}

 

-		if ( $fromEmailName == '' ) {

-			$fromEmailName = get_option( 'site_email_name' );

+		if ($fromEmailName == '') {

+			$fromEmailName = get_option('site_email_name');

 		}

 

-		$search_array  = array(

+		$search_array = array(

 			'[#listing_link#]',

 			'[#site_name_url#]',

 			'[#post_id#]',

@@ -872,7 +872,7 @@ 
 			$post_author_email,

 			$current_date,

 		);

-		$message       = str_replace( $search_array, $replace_array, $message );

+		$message       = str_replace($search_array, $replace_array, $message);

 

 		$search_array  = array(

 			'[#listing_link#]',

@@ -910,12 +910,12 @@ 
 			$post_author_email,

 			$current_date

 		);

-		$subject       = str_replace( $search_array, $replace_array, $subject );

+		$subject = str_replace($search_array, $replace_array, $subject);

 

-		$headers =  array();

+		$headers = array();

 		$headers[] = 'Content-type: text/html; charset=UTF-8';

-		$headers[] = "Reply-To: " . $fromEmail;

-		$headers[] = 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>';

+		$headers[] = "Reply-To: ".$fromEmail;

+		$headers[] = 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>';

 

 		$to = $toEmail;

 

@@ -937,7 +937,7 @@ 
 		 * @param string $post_id       The post ID.

 		 * @param string $user_id       The user ID.

 		 */

-		$to = apply_filters( 'geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+		$to = apply_filters('geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 		/**

 		 * Filter the client email subject.

 		 *

@@ -956,7 +956,7 @@ 
 		 * @param string $post_id       The post ID.

 		 * @param string $user_id       The user ID.

 		 */

-		$subject = apply_filters( 'geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+		$subject = apply_filters('geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 		/**

 		 * Filter the client email message.

 		 *

@@ -975,7 +975,7 @@ 
 		 * @param string $post_id       The post ID.

 		 * @param string $user_id       The user ID.

 		 */

-		$message = apply_filters( 'geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+		$message = apply_filters('geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 		/**

 		 * Filter the client email headers.

 		 *

@@ -994,39 +994,39 @@ 
 		 * @param string $post_id       The post ID.

 		 * @param string $user_id       The user ID.

 		 */

-		$headers = apply_filters( 'geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+		$headers = apply_filters('geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 

-		$sent = wp_mail( $to, $subject, $message, $headers );

+		$sent = wp_mail($to, $subject, $message, $headers);

 

-		if ( ! $sent ) {

-			if ( is_array( $to ) ) {

-				$to = implode( ',', $to );

+		if (!$sent) {

+			if (is_array($to)) {

+				$to = implode(',', $to);

 			}

 			$log_message = sprintf(

-				__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+				__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

 				$message_type,

-				date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+				date_i18n('F j Y H:i:s', current_time('timestamp')),

 				$to,

 				$subject

 			);

-			geodir_error_log( $log_message );

+			geodir_error_log($log_message);

 		}

 

 		///////// ADMIN BCC EMIALS

-		$adminEmail = get_bloginfo( 'admin_email' );

+		$adminEmail = get_bloginfo('admin_email');

 		$to         = $adminEmail;

 

 		$admin_bcc = false;

-		if ( $message_type == 'registration' ) {

-			$message_raw  = explode( __( "Password:", 'geodirectory' ), $message );

-			$message_raw2 = explode( "</p>", $message_raw[1], 2 );

-			$message      = $message_raw[0] . __( 'Password:', 'geodirectory' ) . ' **********</p>' . $message_raw2[1];

+		if ($message_type == 'registration') {

+			$message_raw  = explode(__("Password:", 'geodirectory'), $message);

+			$message_raw2 = explode("</p>", $message_raw[1], 2);

+			$message      = $message_raw[0].__('Password:', 'geodirectory').' **********</p>'.$message_raw2[1];

 		}

-		if ( $message_type == 'post_submit' && ( get_option( 'geodir_notify_post_submit' ) || get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) ) {

-			$subject = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_subject_admin' ) ), 'geodirectory' );

-			$message = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_content_admin' ) ), 'geodirectory' );

+		if ($message_type == 'post_submit' && (get_option('geodir_notify_post_submit') || get_option('geodir_notify_post_submit', '-1') == '-1')) {

+			$subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');

+			$message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');

 

-			$search_array  = array(

+			$search_array = array(

 				'[#listing_link#]',

 				'[#site_name_url#]',

 				'[#post_id#]',

@@ -1062,7 +1062,7 @@ 
 				$user_login,

 				$post_author_email,

 			);

-			$message       = str_replace( $search_array, $replace_array, $message );

+			$message       = str_replace($search_array, $replace_array, $message);

 

 			$search_array  = array(

 				'[#listing_link#]',

@@ -1094,23 +1094,23 @@ 
 				$user_login,

 				$post_author_email,

 			);

-			$subject       = str_replace( $search_array, $replace_array, $subject );

+			$subject = str_replace($search_array, $replace_array, $subject);

 

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

 

-		} elseif ( $message_type == 'registration' && get_option( 'geodir_bcc_new_user' ) ) {

+		} elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

-		} elseif ( $message_type == 'send_enquiry' && get_option( 'geodir_bcc_enquiry' ) ) {

+		} elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

-		} elseif ( $message_type == 'listing_published' && get_option( 'geodir_bcc_listing_published' ) ) {

+		} elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

 		}

 

-		if ( $admin_bcc === true ) {

+		if ($admin_bcc === true) {

 

 			/**

 			 * Filter the client email subject.

@@ -1130,7 +1130,7 @@ 
 			 * @param string $post_id       The post ID.

 			 * @param string $user_id       The user ID.

 			 */

-			$subject = apply_filters( 'geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+			$subject = apply_filters('geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 			/**

 			 * Filter the client email message.

 			 *

@@ -1149,23 +1149,23 @@ 
 			 * @param string $post_id       The post ID.

 			 * @param string $user_id       The user ID.

 			 */

-			$message = apply_filters( 'geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+			$message = apply_filters('geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 

 

-			$sent = wp_mail( $to, $subject, $message, $headers );

+			$sent = wp_mail($to, $subject, $message, $headers);

 

-			if ( ! $sent ) {

-				if ( is_array( $to ) ) {

-					$to = implode( ',', $to );

+			if (!$sent) {

+				if (is_array($to)) {

+					$to = implode(',', $to);

 				}

 				$log_message = sprintf(

-					__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+					__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

 					$message_type,

-					date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+					date_i18n('F j Y H:i:s', current_time('timestamp')),

 					$to,

 					$subject

 				);

-				geodir_error_log( $log_message );

+				geodir_error_log($log_message);

 			}

 		}

 

@@ -1181,51 +1181,51 @@ 
  */

 function geodir_taxonomy_breadcrumb() {

 

-	$term   = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );

+	$term   = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));

 	$parent = $term->parent;

 

-	while ( $parent ):

+	while ($parent):

 		$parents[]  = $parent;

-		$new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) );

+		$new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));

 		$parent     = $new_parent->parent;

 	endwhile;

 

-	if ( ! empty( $parents ) ):

-		$parents = array_reverse( $parents );

+	if (!empty($parents)):

+		$parents = array_reverse($parents);

 

-		foreach ( $parents as $parent ):

-			$item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) );

-			$url  = get_term_link( $item, get_query_var( 'taxonomy' ) );

-			echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>';

+		foreach ($parents as $parent):

+			$item = get_term_by('id', $parent, get_query_var('taxonomy'));

+			$url  = get_term_link($item, get_query_var('taxonomy'));

+			echo '<li> > <a href="'.$url.'">'.$item->name.'</a></li>';

 		endforeach;

 

 	endif;

 

-	echo '<li> > ' . $term->name . '</li>';

+	echo '<li> > '.$term->name.'</li>';

 }

 

-function geodir_wpml_post_type_archive_link($link, $post_type){

+function geodir_wpml_post_type_archive_link($link, $post_type) {

 	if (geodir_is_wpml()) {

-		$post_types   = get_option( 'geodir_post_types' );

+		$post_types = get_option('geodir_post_types');

 		

-		if ( isset( $post_types[ $post_type ] ) ) {

-			$slug = $post_types[ $post_type ]['rewrite']['slug'];

+		if (isset($post_types[$post_type])) {

+			$slug = $post_types[$post_type]['rewrite']['slug'];

 

 			// Alter the CPT slug if WPML is set to do so

-			if ( geodir_wpml_is_post_type_translated( $post_type ) ) {

-				if ( gd_wpml_slug_translation_turned_on( $post_type ) && $language_code = gd_wpml_get_lang_from_url( $link) ) {

+			if (geodir_wpml_is_post_type_translated($post_type)) {

+				if (gd_wpml_slug_translation_turned_on($post_type) && $language_code = gd_wpml_get_lang_from_url($link)) {

 

 					$org_slug = $slug;

-					$slug     = apply_filters( 'wpml_translate_single_string',

+					$slug     = apply_filters('wpml_translate_single_string',

 						$slug,

 						'WordPress',

-						'URL slug: ' . $slug,

-						$language_code );

+						'URL slug: '.$slug,

+						$language_code);

                     

-					if ( ! $slug ) {

+					if (!$slug) {

 						$slug = $org_slug;

 					} else {

-						$link = str_replace( $org_slug, $slug, $link );

+						$link = str_replace($org_slug, $slug, $link);

 					}

 				}

 			}

@@ -1234,7 +1234,7 @@ 
 

 	return $link;

 }

-add_filter( 'post_type_archive_link','geodir_wpml_post_type_archive_link', 1000, 2);

+add_filter('post_type_archive_link', 'geodir_wpml_post_type_archive_link', 1000, 2);

 

 /**

  * Main function that generates breadcrumb for all pages.

@@ -1255,9 +1255,9 @@ 
 	 *

 	 * @since 1.0.0

 	 */

-	$separator = apply_filters( 'geodir_breadcrumb_separator', ' > ' );

+	$separator = apply_filters('geodir_breadcrumb_separator', ' > ');

 

-	if ( ! geodir_is_page( 'home' ) ) {

+	if (!geodir_is_page('home')) {

 		$breadcrumb    = '';

 		$url_categoris = '';

 		$breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">';

@@ -1266,170 +1266,170 @@ 
 		 *

 		 * @since 1.0.0

 		 */

-		$breadcrumb .= '<li>' . apply_filters( 'geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __( 'Home', 'geodirectory' ) . '</a>' ) . '</li>';

+		$breadcrumb .= '<li>'.apply_filters('geodir_breadcrumb_first_link', '<a href="'.home_url().'">'.__('Home', 'geodirectory').'</a>').'</li>';

 

 		$gd_post_type   = geodir_get_current_posttype();

-		$post_type_info = get_post_type_object( $gd_post_type );

+		$post_type_info = get_post_type_object($gd_post_type);

 

-		remove_filter( 'post_type_archive_link', 'geodir_get_posttype_link' );

+		remove_filter('post_type_archive_link', 'geodir_get_posttype_link');

 

-		$listing_link = get_post_type_archive_link( $gd_post_type );

+		$listing_link = get_post_type_archive_link($gd_post_type);

 

-		add_filter( 'post_type_archive_link', 'geodir_get_posttype_link', 10, 2 );

-		$listing_link = rtrim( $listing_link, '/' );

+		add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);

+		$listing_link = rtrim($listing_link, '/');

 		$listing_link .= '/';

 

 		$post_type_for_location_link = $listing_link;

-		$location_terms              = geodir_get_current_location_terms( 'query_vars', $gd_post_type );

+		$location_terms              = geodir_get_current_location_terms('query_vars', $gd_post_type);

 

 		global $wp, $gd_session;

 		$location_link = $post_type_for_location_link;

 

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

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

 			global $post, $gd_cache_post;

-			if ( ! empty( $post ) && ! empty( $gd_cache_post ) && geodir_is_page( 'detail' ) && $post->ID == $gd_cache_post->ID && ! isset( $post->country_slug ) && isset( $gd_cache_post->country_slug ) && geodir_disable_yoast_seo_metas() ) {

+			if (!empty($post) && !empty($gd_cache_post) && geodir_is_page('detail') && $post->ID == $gd_cache_post->ID && !isset($post->country_slug) && isset($gd_cache_post->country_slug) && geodir_disable_yoast_seo_metas()) {

 				$post = $gd_cache_post;

 			}

-			$location_manager     = defined( 'POST_LOCATION_TABLE' ) ? true : false;

-			$neighbourhood_active = $location_manager && get_option( 'location_neighbourhoods' ) ? true : false;

+			$location_manager     = defined('POST_LOCATION_TABLE') ? true : false;

+			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

 

-			if ( geodir_is_page( 'detail' ) && isset( $post->country_slug ) ) {

+			if (geodir_is_page('detail') && isset($post->country_slug)) {

 				$location_terms = array(

 					'gd_country' => $post->country_slug,

 					'gd_region'  => $post->region_slug,

 					'gd_city'    => $post->city_slug

 				);

 

-				if ( $neighbourhood_active && ! empty( $location_terms['gd_city'] ) && $gd_ses_neighbourhood = $gd_session->get( 'gd_neighbourhood' ) ) {

+				if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {

 					$location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

 				}

 			}

 

-			$geodir_show_location_url = get_option( 'geodir_show_location_url' );

+			$geodir_show_location_url = get_option('geodir_show_location_url');

 

 			$hide_url_part = array();

-			if ( $location_manager ) {

-				$hide_country_part = get_option( 'geodir_location_hide_country_part' );

-				$hide_region_part  = get_option( 'geodir_location_hide_region_part' );

-

-				if ( $hide_region_part && $hide_country_part ) {

-					$hide_url_part = array( 'gd_country', 'gd_region' );

-				} else if ( $hide_region_part && ! $hide_country_part ) {

-					$hide_url_part = array( 'gd_region' );

-				} else if ( ! $hide_region_part && $hide_country_part ) {

-					$hide_url_part = array( 'gd_country' );

+			if ($location_manager) {

+				$hide_country_part = get_option('geodir_location_hide_country_part');

+				$hide_region_part  = get_option('geodir_location_hide_region_part');

+

+				if ($hide_region_part && $hide_country_part) {

+					$hide_url_part = array('gd_country', 'gd_region');

+				} else if ($hide_region_part && !$hide_country_part) {

+					$hide_url_part = array('gd_region');

+				} else if (!$hide_region_part && $hide_country_part) {

+					$hide_url_part = array('gd_country');

 				}

 			}

 

 			$hide_text_part = array();

-			if ( $geodir_show_location_url == 'country_city' ) {

-				$hide_text_part = array( 'gd_region' );

+			if ($geodir_show_location_url == 'country_city') {

+				$hide_text_part = array('gd_region');

 

-				if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {

-					unset( $location_terms['gd_region'] );

+				if (isset($location_terms['gd_region']) && !$location_manager) {

+					unset($location_terms['gd_region']);

 				}

-			} else if ( $geodir_show_location_url == 'region_city' ) {

-				$hide_text_part = array( 'gd_country' );

+			} else if ($geodir_show_location_url == 'region_city') {

+				$hide_text_part = array('gd_country');

 

-				if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {

-					unset( $location_terms['gd_country'] );

+				if (isset($location_terms['gd_country']) && !$location_manager) {

+					unset($location_terms['gd_country']);

 				}

-			} else if ( $geodir_show_location_url == 'city' ) {

-				$hide_text_part = array( 'gd_country', 'gd_region' );

+			} else if ($geodir_show_location_url == 'city') {

+				$hide_text_part = array('gd_country', 'gd_region');

 

-				if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {

-					unset( $location_terms['gd_country'] );

+				if (isset($location_terms['gd_country']) && !$location_manager) {

+					unset($location_terms['gd_country']);

 				}

-				if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {

-					unset( $location_terms['gd_region'] );

+				if (isset($location_terms['gd_region']) && !$location_manager) {

+					unset($location_terms['gd_region']);

 				}

 			}

 

 			$is_location_last = '';

 			$is_taxonomy_last = '';

 			$breadcrumb .= '<li>';

-			if ( get_query_var( $gd_post_type . 'category' ) ) {

-				$gd_taxonomy = $gd_post_type . 'category';

-			} elseif ( get_query_var( $gd_post_type . '_tags' ) ) {

-				$gd_taxonomy = $gd_post_type . '_tags';

+			if (get_query_var($gd_post_type.'category')) {

+				$gd_taxonomy = $gd_post_type.'category';

+			} elseif (get_query_var($gd_post_type.'_tags')) {

+				$gd_taxonomy = $gd_post_type.'_tags';

 			}

 

-			$breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>';

-			if ( ! empty( $gd_taxonomy ) || geodir_is_page( 'detail' ) ) {

+			$breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>';

+			if (!empty($gd_taxonomy) || geodir_is_page('detail')) {

 				$is_location_last = false;

 			} else {

 				$is_location_last = true;

 			}

 

-			if ( ! empty( $gd_taxonomy ) && geodir_is_page( 'listing' ) ) {

+			if (!empty($gd_taxonomy) && geodir_is_page('listing')) {

 				$is_taxonomy_last = true;

 			} else {

 				$is_taxonomy_last = false;

 			}

 

-			if ( ! empty( $location_terms ) ) {

-				$geodir_get_locations = function_exists( 'get_actual_location_name' ) ? true : false;

+			if (!empty($location_terms)) {

+				$geodir_get_locations = function_exists('get_actual_location_name') ? true : false;

 

-				foreach ( $location_terms as $key => $location_term ) {

-					if ( $location_term != '' ) {

-						if ( ! empty( $hide_url_part ) && in_array( $key, $hide_url_part ) ) { // Hide location part from url & breadcrumb.

+				foreach ($location_terms as $key => $location_term) {

+					if ($location_term != '') {

+						if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.

 							continue;

 						}

 

-						$gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location_term );

-						$gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text );

-						$gd_location_link_text = geodir_utf8_ucfirst( $gd_location_link_text );

+						$gd_location_link_text = preg_replace('/-(\d+)$/', '', $location_term);

+						$gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);

+						$gd_location_link_text = geodir_utf8_ucfirst($gd_location_link_text);

 

 						$location_term_actual_country = '';

 						$location_term_actual_region  = '';

 						$location_term_actual_city    = '';

 						$location_term_actual_neighbourhood = '';

-						if ( $geodir_get_locations ) {

-							if ( $key == 'gd_country' ) {

-								$location_term_actual_country = get_actual_location_name( 'country', $location_term, true );

-							} else if ( $key == 'gd_region' ) {

-								$location_term_actual_region = get_actual_location_name( 'region', $location_term, true );

-							} else if ( $key == 'gd_city' ) {

-								$location_term_actual_city = get_actual_location_name( 'city', $location_term, true );

-							} else if ( $key == 'gd_neighbourhood' ) {

-								$location_term_actual_neighbourhood = get_actual_location_name( 'neighbourhood', $location_term, true );

+						if ($geodir_get_locations) {

+							if ($key == 'gd_country') {

+								$location_term_actual_country = get_actual_location_name('country', $location_term, true);

+							} else if ($key == 'gd_region') {

+								$location_term_actual_region = get_actual_location_name('region', $location_term, true);

+							} else if ($key == 'gd_city') {

+								$location_term_actual_city = get_actual_location_name('city', $location_term, true);

+							} else if ($key == 'gd_neighbourhood') {

+								$location_term_actual_neighbourhood = get_actual_location_name('neighbourhood', $location_term, true);

 							}

 						} else {

 							$location_info = geodir_get_location();

 

-							if ( ! empty( $location_info ) && isset( $location_info->location_id ) ) {

-								if ( $key == 'gd_country' ) {

-									$location_term_actual_country = __( $location_info->country, 'geodirectory' );

-								} else if ( $key == 'gd_region' ) {

-									$location_term_actual_region = __( $location_info->region, 'geodirectory' );

-								} else if ( $key == 'gd_city' ) {

-									$location_term_actual_city = __( $location_info->city, 'geodirectory' );

+							if (!empty($location_info) && isset($location_info->location_id)) {

+								if ($key == 'gd_country') {

+									$location_term_actual_country = __($location_info->country, 'geodirectory');

+								} else if ($key == 'gd_region') {

+									$location_term_actual_region = __($location_info->region, 'geodirectory');

+								} else if ($key == 'gd_city') {

+									$location_term_actual_city = __($location_info->city, 'geodirectory');

 								}

 							}

 						}

 

-						if ( $is_location_last && $key == 'gd_country' && ! ( isset( $location_terms['gd_region'] ) && $location_terms['gd_region'] != '' ) && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {

-							$breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text;

-						} else if ( $is_location_last && $key == 'gd_region' && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {

-							$breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text;

-						} else if ( $is_location_last && $key == 'gd_city' && empty( $location_terms['gd_neighbourhood'] ) ) {

-							$breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text;

-						} else if ( $is_location_last && $key == 'gd_neighbourhood' ) {

-							$breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator . $location_term_actual_neighbourhood : $separator . $gd_location_link_text;

+						if ($is_location_last && $key == 'gd_country' && !(isset($location_terms['gd_region']) && $location_terms['gd_region'] != '') && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {

+							$breadcrumb .= $location_term_actual_country != '' ? $separator.$location_term_actual_country : $separator.$gd_location_link_text;

+						} else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {

+							$breadcrumb .= $location_term_actual_region != '' ? $separator.$location_term_actual_region : $separator.$gd_location_link_text;

+						} else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {

+							$breadcrumb .= $location_term_actual_city != '' ? $separator.$location_term_actual_city : $separator.$gd_location_link_text;

+						} else if ($is_location_last && $key == 'gd_neighbourhood') {

+							$breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator.$location_term_actual_neighbourhood : $separator.$gd_location_link_text;

 						} else {

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

-								$location_link .= $location_term . '/';

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

+								$location_link .= $location_term.'/';

 							} else {

-								$location_link .= "&$key=" . $location_term;

+								$location_link .= "&$key=".$location_term;

 							}

 

-							if ( $key == 'gd_country' && $location_term_actual_country != '' ) {

+							if ($key == 'gd_country' && $location_term_actual_country != '') {

 								$gd_location_link_text = $location_term_actual_country;

-							} else if ( $key == 'gd_region' && $location_term_actual_region != '' ) {

+							} else if ($key == 'gd_region' && $location_term_actual_region != '') {

 								$gd_location_link_text = $location_term_actual_region;

-							} else if ( $key == 'gd_city' && $location_term_actual_city != '' ) {

+							} else if ($key == 'gd_city' && $location_term_actual_city != '') {

 								$gd_location_link_text = $location_term_actual_city;

-							} else if ( $key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '' ) {

+							} else if ($key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '') {

 								$gd_location_link_text = $location_term_actual_neighbourhood;

 							}

 

@@ -1439,77 +1439,77 @@ 
                             }

                             */

 

-							$breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>';

+							$breadcrumb .= $separator.'<a href="'.$location_link.'">'.$gd_location_link_text.'</a>';

 						}

 					}

 				}

 			}

 

-			if ( ! empty( $gd_taxonomy ) ) {

+			if (!empty($gd_taxonomy)) {

 				$term_index = 1;

 

 				//if(get_option('geodir_add_categories_url'))

 				{

-					if ( get_query_var( $gd_post_type . '_tags' ) ) {

-						$cat_link = $listing_link . 'tags/';

+					if (get_query_var($gd_post_type.'_tags')) {

+						$cat_link = $listing_link.'tags/';

 					} else {

 						$cat_link = $listing_link;

 					}

 

-					foreach ( $location_terms as $key => $location_term ) {

-						if ( $location_manager && in_array( $key, $hide_url_part ) ) {

+					foreach ($location_terms as $key => $location_term) {

+						if ($location_manager && in_array($key, $hide_url_part)) {

 							continue;

 						}

 

-						if ( $location_term != '' ) {

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

-								$cat_link .= $location_term . '/';

+						if ($location_term != '') {

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

+								$cat_link .= $location_term.'/';

 							}

 						}

 					}

 

-					$term_array = explode( "/", trim( $wp_query->query[ $gd_taxonomy ], "/" ) );

-					foreach ( $term_array as $term ) {

-						$term_link_text = preg_replace( '/-(\d+)$/', '', $term );

-						$term_link_text = preg_replace( '/[_-]/', ' ', $term_link_text );

+					$term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));

+					foreach ($term_array as $term) {

+						$term_link_text = preg_replace('/-(\d+)$/', '', $term);

+						$term_link_text = preg_replace('/[_-]/', ' ', $term_link_text);

 

 						// get term actual name

-						$term_info = get_term_by( 'slug', $term, $gd_taxonomy, 'ARRAY_A' );

-						if ( ! empty( $term_info ) && isset( $term_info['name'] ) && $term_info['name'] != '' ) {

-							$term_link_text = urldecode( $term_info['name'] );

+						$term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');

+						if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {

+							$term_link_text = urldecode($term_info['name']);

 						} else {

 							continue;

 							//$term_link_text = wp_strip_all_tags(geodir_ucwords(urldecode($term_link_text)));

 						}

 

-						if ( $term_index == count( $term_array ) && $is_taxonomy_last ) {

-							$breadcrumb .= $separator . $term_link_text;

+						if ($term_index == count($term_array) && $is_taxonomy_last) {

+							$breadcrumb .= $separator.$term_link_text;

 						} else {

-							$cat_link .= $term . '/';

-							$breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>';

+							$cat_link .= $term.'/';

+							$breadcrumb .= $separator.'<a href="'.$cat_link.'">'.$term_link_text.'</a>';

 						}

-						$term_index ++;

+						$term_index++;

 					}

 				}

 

 

 			}

 

-			if ( geodir_is_page( 'detail' ) ) {

-				$breadcrumb .= $separator . get_the_title();

+			if (geodir_is_page('detail')) {

+				$breadcrumb .= $separator.get_the_title();

 			}

 

 			$breadcrumb .= '</li>';

 

 

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

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

 			$dashboard_post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : $gd_post_type;

 			$user_id             = get_current_user_id();

-			$author_link         = get_author_posts_url( $user_id );

-			$default_author_link = geodir_getlink( $author_link, array(

+			$author_link         = get_author_posts_url($user_id);

+			$default_author_link = geodir_getlink($author_link, array(

 				'geodir_dashbord' => 'true',

 				'stype'           => $dashboard_post_type

-			), false );

+			), false);

 

 			/**

 			 * Filter author page link.

@@ -1519,16 +1519,16 @@ 
 			 * @param string $default_author_link Default author link.

 			 * @param int $user_id                Author ID.

 			 */

-			$default_author_link = apply_filters( 'geodir_dashboard_author_link', $default_author_link, $user_id );

+			$default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);

 

 			$breadcrumb .= '<li>';

-			$breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __( 'My Dashboard', 'geodirectory' ) . '</a>';

+			$breadcrumb .= $separator.'<a href="'.$default_author_link.'">'.__('My Dashboard', 'geodirectory').'</a>';

 

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

-				$author_link = geodir_getlink( $author_link, array(

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

+				$author_link = geodir_getlink($author_link, array(

 					'geodir_dashbord' => 'true',

 					'stype'           => $_REQUEST['stype']

-				), false );

+				), false);

 

 				/**

 				 * Filter author page link.

@@ -1539,64 +1539,64 @@ 
 				 * @param int $user_id        Author ID.

 				 * @param string $_REQUEST    ['stype'] Post type.

 				 */

-				$author_link = apply_filters( 'geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype'] );

+				$author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);

 

-				$breadcrumb .= $separator . '<a href="' . $author_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>';

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

-					$breadcrumb .= $separator . MY_FAVOURITE_TEXT;

+				$breadcrumb .= $separator.'<a href="'.$author_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>';

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

+					$breadcrumb .= $separator.MY_FAVOURITE_TEXT;

 				}

 

 			} else {

-				$breadcrumb .= $separator . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' );

+				$breadcrumb .= $separator.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory');

 			}

 

 			$breadcrumb .= '</li>';

-		} elseif ( is_category() || is_single() ) {

+		} elseif (is_category() || is_single()) {

 			$category = get_the_category();

-			if ( is_category() ) {

-				$breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>';

+			if (is_category()) {

+				$breadcrumb .= '<li>'.$separator.$category[0]->cat_name.'</li>';

 			}

-			if ( is_single() ) {

-				$breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link( $category[0]->term_id ) . '">' . $category[0]->cat_name . '</a></li>';

-				$breadcrumb .= '<li>' . $separator . get_the_title() . '</li>';

+			if (is_single()) {

+				$breadcrumb .= '<li>'.$separator.'<a href="'.get_category_link($category[0]->term_id).'">'.$category[0]->cat_name.'</a></li>';

+				$breadcrumb .= '<li>'.$separator.get_the_title().'</li>';

 			}

 			/* End of my version ##################################################### */

-		} else if ( is_page() ) {

+		} else if (is_page()) {

 			$page_title = get_the_title();

 

-			if ( geodir_is_page( 'location' ) ) {

+			if (geodir_is_page('location')) {

 				$location_page_id = geodir_location_page_id();

-				$loc_post         = get_post( $location_page_id );

+				$loc_post         = get_post($location_page_id);

 				$post_name        = $loc_post->post_name;

-				$slug             = ucwords( str_replace( '-', ' ', $post_name ) );

-				$page_title       = ! empty( $slug ) ? $slug : __( 'Location', 'geodirectory' );

+				$slug             = ucwords(str_replace('-', ' ', $post_name));

+				$page_title       = !empty($slug) ? $slug : __('Location', 'geodirectory');

 			}

 

-			$breadcrumb .= '<li>' . $separator;

-			$breadcrumb .= stripslashes_deep( $page_title );

+			$breadcrumb .= '<li>'.$separator;

+			$breadcrumb .= stripslashes_deep($page_title);

 			$breadcrumb .= '</li>';

-		} else if ( is_tag() ) {

-			$breadcrumb .= "<li> " . $separator . single_tag_title( '', false ) . '</li>';

-		} else if ( is_day() ) {

-			$breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " ";

-			the_time( 'F jS, Y' );

+		} else if (is_tag()) {

+			$breadcrumb .= "<li> ".$separator.single_tag_title('', false).'</li>';

+		} else if (is_day()) {

+			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";

+			the_time('F jS, Y');

 			$breadcrumb .= '</li>';

-		} else if ( is_month() ) {

-			$breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " ";

-			the_time( 'F, Y' );

+		} else if (is_month()) {

+			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";

+			the_time('F, Y');

 			$breadcrumb .= '</li>';

-		} else if ( is_year() ) {

-			$breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " ";

-			the_time( 'Y' );

+		} else if (is_year()) {

+			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";

+			the_time('Y');

 			$breadcrumb .= '</li>';

-		} else if ( is_author() ) {

-			$breadcrumb .= "<li> " . $separator . __( " Author Archive", 'geodirectory' );

+		} else if (is_author()) {

+			$breadcrumb .= "<li> ".$separator.__(" Author Archive", 'geodirectory');

 			$breadcrumb .= '</li>';

-		} else if ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) {

-			$breadcrumb .= "<li>" . $separator . __( "Blog Archives", 'geodirectory' );

+		} else if (isset($_GET['paged']) && !empty($_GET['paged'])) {

+			$breadcrumb .= "<li>".$separator.__("Blog Archives", 'geodirectory');

 			$breadcrumb .= '</li>';

-		} else if ( is_search() ) {

-			$breadcrumb .= "<li> " . $separator . __( " Search Results", 'geodirectory' );

+		} else if (is_search()) {

+			$breadcrumb .= "<li> ".$separator.__(" Search Results", 'geodirectory');

 			$breadcrumb .= '</li>';

 		}

 		$breadcrumb .= '</ul></div>';

@@ -1609,13 +1609,13 @@ 
 		 * @param string $breadcrumb Breadcrumb HTML.

 		 * @param string $separator  Breadcrumb separator.

 		 */

-		echo $breadcrumb = apply_filters( 'geodir_breadcrumb', $breadcrumb, $separator );

+		echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);

 	}

 }

 

 

-add_action( "admin_init", "geodir_allow_wpadmin" ); // check user is admin

-if ( ! function_exists( 'geodir_allow_wpadmin' ) ) {

+add_action("admin_init", "geodir_allow_wpadmin"); // check user is admin

+if (!function_exists('geodir_allow_wpadmin')) {

 	/**

 	 * Allow only admins to access wp-admin.

 	 *

@@ -1627,12 +1627,12 @@ 
 	 */

 	function geodir_allow_wpadmin() {

 		global $wpdb;

-		if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) // checking action in request to allow ajax request go through

+		if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!defined('DOING_AJAX'))) // checking action in request to allow ajax request go through

 		{

-			if ( current_user_can( 'administrator' ) ) {

+			if (current_user_can('administrator')) {

 			} else {

 

-				wp_redirect( home_url() );

+				wp_redirect(home_url());

 				exit;

 			}

 

@@ -1651,23 +1651,23 @@ 
  *

  * @return array|WP_Error The uploaded data as array. When failure returns error.

  */

-function fetch_remote_file( $url ) {

+function fetch_remote_file($url) {

 	// extract the file name and extension from the url

-	require_once( ABSPATH . 'wp-includes/pluggable.php' );

-	$file_name = basename( $url );

-	if ( strpos( $file_name, '?' ) !== false ) {

-		list( $file_name ) = explode( '?', $file_name );

+	require_once(ABSPATH.'wp-includes/pluggable.php');

+	$file_name = basename($url);

+	if (strpos($file_name, '?') !== false) {

+		list($file_name) = explode('?', $file_name);

 	}

 	$dummy        = false;

 	$add_to_cache = false;

 	$key          = null;

-	if ( strpos( $url, '/dummy/' ) !== false ) {

+	if (strpos($url, '/dummy/') !== false) {

 		$dummy = true;

-		$key   = "dummy_" . str_replace( '.', '_', $file_name );

-		$value = get_transient( 'cached_dummy_images' );

-		if ( $value ) {

-			if ( isset( $value[ $key ] ) ) {

-				return $value[ $key ];

+		$key   = "dummy_".str_replace('.', '_', $file_name);

+		$value = get_transient('cached_dummy_images');

+		if ($value) {

+			if (isset($value[$key])) {

+				return $value[$key];

 			} else {

 				$add_to_cache = true;

 			}

@@ -1678,62 +1678,62 @@ 
 

 	// get placeholder file in the upload dir with a unique, sanitized filename

 

-	$post_upload_date = isset( $post['upload_date'] ) ? $post['upload_date'] : '';

+	$post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : '';

 

-	$upload = wp_upload_bits( $file_name, 0, '', $post_upload_date );

-	if ( $upload['error'] ) {

-		return new WP_Error( 'upload_dir_error', $upload['error'] );

+	$upload = wp_upload_bits($file_name, 0, '', $post_upload_date);

+	if ($upload['error']) {

+		return new WP_Error('upload_dir_error', $upload['error']);

 	}

 

 

-	sleep( 0.3 );// if multiple remote file this can cause the remote server to timeout so we add a slight delay

+	sleep(0.3); // if multiple remote file this can cause the remote server to timeout so we add a slight delay

 

 	// fetch the remote url and write it to the placeholder file

-	$headers = wp_remote_get( $url, array( 'stream' => true, 'filename' => $upload['file'] ) );

+	$headers = wp_remote_get($url, array('stream' => true, 'filename' => $upload['file']));

 

 	$log_message = '';

-	if ( is_wp_error( $headers ) ) {

-		echo 'file: ' . $url;

+	if (is_wp_error($headers)) {

+		echo 'file: '.$url;

 

-		return new WP_Error( 'import_file_error', $headers->get_error_message() );

+		return new WP_Error('import_file_error', $headers->get_error_message());

 	}

 

 	// clear cache to make compat with EWWW Image Optimizer

-	if(defined( 'EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')){

+	if (defined('EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')) {

 		clearstatcache();

 	}

-	$filesize = filesize( $upload['file'] );

+	$filesize = filesize($upload['file']);

 	// request failed

-	if ( ! $headers ) {

-		$log_message = __( 'Remote server did not respond', 'geodirectory' );

+	if (!$headers) {

+		$log_message = __('Remote server did not respond', 'geodirectory');

 	} // make sure the fetch was successful

-	elseif ( $headers['response']['code'] != '200' ) {

-		$log_message = sprintf( __( 'Remote server returned error response %1$d %2$s', 'geodirectory' ), esc_html( $headers['response'] ), get_status_header_desc( $headers['response'] ) );

-	} elseif ( isset( $headers['headers']['content-length'] ) && $filesize != $headers['headers']['content-length'] ) {

-		$log_message = __( 'Remote file is incorrect size', 'geodirectory' );

-	} elseif ( 0 == $filesize ) {

-		$log_message = __( 'Zero size file downloaded', 'geodirectory' );

-	}

-

-	if ( $log_message ) {

-		$del = unlink( $upload['file'] );

-		if ( ! $del ) {

-			geodir_error_log( __( 'GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory' ) );

+	elseif ($headers['response']['code'] != '200') {

+		$log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));

+	} elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {

+		$log_message = __('Remote file is incorrect size', 'geodirectory');

+	} elseif (0 == $filesize) {

+		$log_message = __('Zero size file downloaded', 'geodirectory');

+	}

+

+	if ($log_message) {

+		$del = unlink($upload['file']);

+		if (!$del) {

+			geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));

 		}

 

-		return new WP_Error( 'import_file_error', $log_message );

+		return new WP_Error('import_file_error', $log_message);

 	}

 

-	if ( $dummy && $add_to_cache && is_array( $upload ) ) {

-		$images = get_transient( 'cached_dummy_images' );

-		if ( is_array( $images ) ) {

-			$images[ $key ] = $upload;

+	if ($dummy && $add_to_cache && is_array($upload)) {

+		$images = get_transient('cached_dummy_images');

+		if (is_array($images)) {

+			$images[$key] = $upload;

 		} else {

-			$images = array( $key => $upload );

+			$images = array($key => $upload);

 		}

 

 		//setting the cache using the WP Transient API

-		set_transient( 'cached_dummy_images', $images, 60 * 10 ); //10 minutes cache

+		set_transient('cached_dummy_images', $images, 60 * 10); //10 minutes cache

 	}

 

 	return $upload;

@@ -1747,12 +1747,12 @@ 
  * @return string|void Max upload size.

  */

 function geodir_max_upload_size() {

-	$max_filesize = (float) get_option( 'geodir_upload_max_filesize', 2 );

+	$max_filesize = (float) get_option('geodir_upload_max_filesize', 2);

 

-	if ( $max_filesize > 0 && $max_filesize < 1 ) {

-		$max_filesize = (int) ( $max_filesize * 1024 ) . 'kb';

+	if ($max_filesize > 0 && $max_filesize < 1) {

+		$max_filesize = (int) ($max_filesize * 1024).'kb';

 	} else {

-		$max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

+		$max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb';

 	}

 

 	/**

@@ -1762,7 +1762,7 @@ 
 	 *

 	 * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb.

 	 */

-	return apply_filters( 'geodir_default_image_upload_size_limit', $max_filesize );

+	return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

 }

 

 /**

@@ -1775,8 +1775,8 @@ 
  * @return bool If dummy folder exists returns true, else false.

  */

 function geodir_dummy_folder_exists() {

-	$path = geodir_plugin_path() . '/geodirectory-admin/dummy/';

-	if ( ! is_dir( $path ) ) {

+	$path = geodir_plugin_path().'/geodirectory-admin/dummy/';

+	if (!is_dir($path)) {

 		return false;

 	} else {

 		return true;

@@ -1795,17 +1795,17 @@ 
  *

  * @return object Author info.

  */

-function geodir_get_author_info( $aid ) {

+function geodir_get_author_info($aid) {

 	global $wpdb;

 	/*$infosql = "select * from $wpdb->users where ID=$aid";*/

-	$infosql = $wpdb->prepare( "select * from $wpdb->users where ID=%d", array( $aid ) );

-	$info    = $wpdb->get_results( $infosql );

-	if ( $info ) {

+	$infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));

+	$info    = $wpdb->get_results($infosql);

+	if ($info) {

 		return $info[0];

 	}

 }

 

-if ( ! function_exists( 'adminEmail' ) ) {

+if (!function_exists('adminEmail')) {

 	/**

 	 * Send emails to client on post submission, renew etc.

 	 *

@@ -1818,67 +1818,67 @@ 
 	 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 	 * @param string $custom_1     Custom data to be sent.

 	 */

-	function adminEmail( $page_id, $user_id, $message_type, $custom_1 = '' ) {

+	function adminEmail($page_id, $user_id, $message_type, $custom_1 = '') {

 		global $wpdb;

-		if ( $message_type == 'expiration' ) {

-			$subject        = stripslashes( __( get_option( 'renew_email_subject' ), 'geodirectory' ) );

-			$client_message = stripslashes( __( get_option( 'renew_email_content' ), 'geodirectory' ) );

-		} elseif ( $message_type == 'post_submited' ) {

-			$subject        = __( get_option( 'post_submited_success_email_subject_admin' ), 'geodirectory' );

-			$client_message = __( get_option( 'post_submited_success_email_content_admin' ), 'geodirectory' );

-		} elseif ( $message_type == 'renew' ) {

-			$subject        = __( get_option( 'post_renew_success_email_subject_admin' ), 'geodirectory' );

-			$client_message = __( get_option( 'post_renew_success_email_content_admin' ), 'geodirectory' );

-		} elseif ( $message_type == 'upgrade' ) {

-			$subject        = __( get_option( 'post_upgrade_success_email_subject_admin' ), 'geodirectory' );

-			$client_message = __( get_option( 'post_upgrade_success_email_content_admin' ), 'geodirectory' );

-		} elseif ( $message_type == 'claim_approved' ) {

-			$subject        = __( get_option( 'claim_approved_email_subject' ), 'geodirectory' );

-			$client_message = __( get_option( 'claim_approved_email_content' ), 'geodirectory' );

-		} elseif ( $message_type == 'claim_rejected' ) {

-			$subject        = __( get_option( 'claim_rejected_email_subject' ), 'geodirectory' );

-			$client_message = __( get_option( 'claim_rejected_email_content' ), 'geodirectory' );

-		} elseif ( $message_type == 'claim_requested' ) {

-			$subject        = __( get_option( 'claim_email_subject_admin' ), 'geodirectory' );

-			$client_message = __( get_option( 'claim_email_content_admin' ), 'geodirectory' );

-		} elseif ( $message_type == 'auto_claim' ) {

-			$subject        = __( get_option( 'auto_claim_email_subject' ), 'geodirectory' );

-			$client_message = __( get_option( 'auto_claim_email_content' ), 'geodirectory' );

-		} elseif ( $message_type == 'payment_success' ) {

-			$subject        = __( get_option( 'post_payment_success_admin_email_subject' ), 'geodirectory' );

-			$client_message = __( get_option( 'post_payment_success_admin_email_content' ), 'geodirectory' );

-		} elseif ( $message_type == 'payment_fail' ) {

-			$subject        = __( get_option( 'post_payment_fail_admin_email_subject' ), 'geodirectory' );

-			$client_message = __( get_option( 'post_payment_fail_admin_email_content' ), 'geodirectory' );

+		if ($message_type == 'expiration') {

+			$subject        = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));

+			$client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));

+		} elseif ($message_type == 'post_submited') {

+			$subject        = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');

+			$client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');

+		} elseif ($message_type == 'renew') {

+			$subject        = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');

+			$client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');

+		} elseif ($message_type == 'upgrade') {

+			$subject        = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');

+			$client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');

+		} elseif ($message_type == 'claim_approved') {

+			$subject        = __(get_option('claim_approved_email_subject'), 'geodirectory');

+			$client_message = __(get_option('claim_approved_email_content'), 'geodirectory');

+		} elseif ($message_type == 'claim_rejected') {

+			$subject        = __(get_option('claim_rejected_email_subject'), 'geodirectory');

+			$client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');

+		} elseif ($message_type == 'claim_requested') {

+			$subject        = __(get_option('claim_email_subject_admin'), 'geodirectory');

+			$client_message = __(get_option('claim_email_content_admin'), 'geodirectory');

+		} elseif ($message_type == 'auto_claim') {

+			$subject        = __(get_option('auto_claim_email_subject'), 'geodirectory');

+			$client_message = __(get_option('auto_claim_email_content'), 'geodirectory');

+		} elseif ($message_type == 'payment_success') {

+			$subject        = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');

+			$client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');

+		} elseif ($message_type == 'payment_fail') {

+			$subject        = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');

+			$client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');

 		}

 		$transaction_details = $custom_1;

-		$fromEmail           = get_option( 'site_email' );

+		$fromEmail           = get_option('site_email');

 		$fromEmailName       = get_site_emailName();

 //$alivedays = get_post_meta($page_id,'alive_days',true);

-		$pkg_limit            = get_property_price_info_listing( $page_id );

+		$pkg_limit            = get_property_price_info_listing($page_id);

 		$alivedays            = $pkg_limit['days'];

-		$productlink          = get_permalink( $page_id );

-		$post_info            = get_post( $page_id );

-		$post_date            = date( 'dS F,Y', strtotime( $post_info->post_date ) );

-		$listingLink          = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>';

+		$productlink          = get_permalink($page_id);

+		$post_info            = get_post($page_id);

+		$post_date            = date('dS F,Y', strtotime($post_info->post_date));

+		$listingLink          = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>';

 		$loginurl             = geodir_login_url();

-		$loginurl_link        = '<a href="' . $loginurl . '">login</a>';

+		$loginurl_link        = '<a href="'.$loginurl.'">login</a>';

 		$siteurl              = home_url();

-		$siteurl_link         = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>';

-		$user_info            = get_userdata( $user_id );

+		$siteurl_link         = '<a href="'.$siteurl.'">'.$fromEmailName.'</a>';

+		$user_info            = get_userdata($user_id);

 		$user_email           = $user_info->user_email;

-		$display_name         = geodir_get_client_name( $user_id );

+		$display_name         = geodir_get_client_name($user_id);

 		$user_login           = $user_info->user_login;

-		$number_of_grace_days = get_option( 'ptthemes_listing_preexpiry_notice_days' );

-		if ( $number_of_grace_days == '' ) {

+		$number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');

+		if ($number_of_grace_days == '') {

 			$number_of_grace_days = 1;

 		}

-		if ( $post_info->post_type == 'event' ) {

+		if ($post_info->post_type == 'event') {

 			$post_type = 'event';

 		} else {

 			$post_type = 'listing';

 		}

-		$renew_link     = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>';

+		$renew_link     = '<a href="'.$siteurl.'?ptype=post_'.$post_type.'&renew=1&pid='.$page_id.'">'.RENEW_LINK.'</a>';

 		$search_array   = array(

 			'[#client_name#]',

 			'[#listing_link#]',

@@ -1894,7 +1894,7 @@ 
 			'[#site_name#]',

 			'[#transaction_details#]'

 		);

-		$replace_array  = array(

+		$replace_array = array(

 			$display_name,

 			$listingLink,

 			$post_date,

@@ -1909,13 +1909,13 @@ 
 			$fromEmailName,

 			$transaction_details

 		);

-		$client_message = str_replace( $search_array, $replace_array, $client_message );

-		$subject        = str_replace( $search_array, $replace_array, $subject );

+		$client_message = str_replace($search_array, $replace_array, $client_message);

+		$subject        = str_replace($search_array, $replace_array, $subject);

 		

 		

-		$headers  = array();

+		$headers = array();

 		$headers[] = 'Content-type: text/html; charset=UTF-8';

-		$headers[] = 'From: ' . $fromEmailName . ' <' . $fromEmail . '>';

+		$headers[] = 'From: '.$fromEmailName.' <'.$fromEmail.'>';

 

 		$to      = $fromEmail;

 		$message = $client_message;

@@ -1933,7 +1933,7 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$to = apply_filters( 'geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1 );

+		$to = apply_filters('geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1);

 		/**

 		 * Filter the admin email subject.

 		 *

@@ -1946,7 +1946,7 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$subject = apply_filters( 'geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1 );

+		$subject = apply_filters('geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1);

 		/**

 		 * Filter the admin email message.

 		 *

@@ -1959,7 +1959,7 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$message = apply_filters( 'geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1 );

+		$message = apply_filters('geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1);

 		/**

 		 * Filter the admin email headers.

 		 *

@@ -1972,22 +1972,22 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$headers = apply_filters( 'geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1 );

+		$headers = apply_filters('geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1);

 

 

-		$sent = wp_mail( $to, $subject, $message, $headers );

-		if ( ! $sent ) {

-			if ( is_array( $to ) ) {

-				$to = implode( ',', $to );

+		$sent = wp_mail($to, $subject, $message, $headers);

+		if (!$sent) {

+			if (is_array($to)) {

+				$to = implode(',', $to);

 			}

 			$log_message = sprintf(

-				__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+				__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

 				$message_type,

-				date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+				date_i18n('F j Y H:i:s', current_time('timestamp')),

 				$to,

 				$subject

 			);

-			geodir_error_log( $log_message );

+			geodir_error_log($log_message);

 		}

 	}

 }

@@ -2007,12 +2007,12 @@ 
  *

  * @return array Category IDs.

  */

-function gd_lang_object_ids( $ids_array, $type ) {

-	if ( geodir_is_wpml() ) {

+function gd_lang_object_ids($ids_array, $type) {

+	if (geodir_is_wpml()) {

 		$res = array();

-		foreach ( $ids_array as $id ) {

-			$xlat = geodir_wpml_object_id( $id, $type, false );

-			if ( ! is_null( $xlat ) ) {

+		foreach ($ids_array as $id) {

+			$xlat = geodir_wpml_object_id($id, $type, false);

+			if (!is_null($xlat)) {

 				$res[] = $xlat;

 			}

 		}

@@ -2036,20 +2036,20 @@ 
  *

  * @return array Modified Body CSS classes.

  */

-function geodir_custom_posts_body_class( $classes ) {

+function geodir_custom_posts_body_class($classes) {

 	global $wpdb, $wp;

-	$post_types = geodir_get_posttypes( 'object' );

-	if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {

+	$post_types = geodir_get_posttypes('object');

+	if (!empty($post_types) && count((array) $post_types) > 1) {

 		$classes[] = 'geodir_custom_posts';

 	}

 

 	// fix body class for signup page

-	if ( geodir_is_page( 'login' ) ) {

+	if (geodir_is_page('login')) {

 		$new_classes   = array();

 		$new_classes[] = 'signup page-geodir-signup';

-		if ( ! empty( $classes ) ) {

-			foreach ( $classes as $class ) {

-				if ( $class && $class != 'home' && $class != 'blog' ) {

+		if (!empty($classes)) {

+			foreach ($classes as $class) {

+				if ($class && $class != 'home' && $class != 'blog') {

 					$new_classes[] = $class;

 				}

 			}

@@ -2057,14 +2057,14 @@ 
 		$classes = $new_classes;

 	}

 

-	if ( geodir_is_geodir_page() ) {

+	if (geodir_is_geodir_page()) {

 		$classes[] = 'geodir-page';

 	}

 

 	return $classes;

 }

 

-add_filter( 'body_class', 'geodir_custom_posts_body_class' ); // let's add a class to the body so we can style the new addition to the search

+add_filter('body_class', 'geodir_custom_posts_body_class'); // let's add a class to the body so we can style the new addition to the search

 

 

 /**

@@ -2080,7 +2080,7 @@ 
 	 *

 	 * @since 1.0.0

 	 */

-	return apply_filters( 'geodir_map_zoom_level', array(

+	return apply_filters('geodir_map_zoom_level', array(

 		1,

 		2,

 		3,

@@ -2100,7 +2100,7 @@ 
 		17,

 		18,

 		19

-	) );

+	));

 

 }

 

@@ -2113,12 +2113,12 @@ 
  *

  * @param string $geodir_option_name Option key.

  */

-function geodir_option_version_backup( $geodir_option_name ) {

+function geodir_option_version_backup($geodir_option_name) {

 	$version_date  = time();

-	$geodir_option = get_option( $geodir_option_name );

+	$geodir_option = get_option($geodir_option_name);

 

-	if ( ! empty( $geodir_option ) ) {

-		add_option( $geodir_option_name . '_' . $version_date, $geodir_option );

+	if (!empty($geodir_option)) {

+		add_option($geodir_option_name.'_'.$version_date, $geodir_option);

 	}

 }

 

@@ -2132,10 +2132,10 @@ 
  *

  * @return int Page ID.

  */

-function get_page_id_geodir_add_listing_page( $page_id ) {

-	if ( geodir_wpml_multilingual_status() ) {

+function get_page_id_geodir_add_listing_page($page_id) {

+	if (geodir_wpml_multilingual_status()) {

 		$post_type = 'post_page';

-		$page_id   = geodir_get_wpml_element_id( $page_id, $post_type );

+		$page_id   = geodir_get_wpml_element_id($page_id, $post_type);

 	}

 

 	return $page_id;

@@ -2149,7 +2149,7 @@ 
  * @return bool Returns true when sitepress multilingual CMS active. else returns false.

  */

 function geodir_wpml_multilingual_status() {

-	if ( geodir_is_wpml() ) {

+	if (geodir_is_wpml()) {

 		return true;

 	}

 

@@ -2167,19 +2167,19 @@ 
  *

  * @return int Element ID when exists. Else the page id.

  */

-function geodir_get_wpml_element_id( $page_id, $post_type ) {

+function geodir_get_wpml_element_id($page_id, $post_type) {

 	global $sitepress;

-	if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {

-		$trid = $sitepress->get_element_trid( $page_id, $post_type );

+	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {

+		$trid = $sitepress->get_element_trid($page_id, $post_type);

 

-		if ( $trid > 0 ) {

-			$translations = $sitepress->get_element_translations( $trid, $post_type );

+		if ($trid > 0) {

+			$translations = $sitepress->get_element_translations($trid, $post_type);

 

 			$lang = $sitepress->get_current_language();

 			$lang = $lang ? $lang : $sitepress->get_default_language();

 

-			if ( ! empty( $translations ) && ! empty( $lang ) && isset( $translations[ $lang ] ) && isset( $translations[ $lang ]->element_id ) && ! empty( $translations[ $lang ]->element_id ) ) {

-				$page_id = $translations[ $lang ]->element_id;

+			if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {

+				$page_id = $translations[$lang]->element_id;

 			}

 		}

 	}

@@ -2196,15 +2196,15 @@ 
  */

 function geodir_wpml_check_element_id() {

 	global $sitepress;

-	if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {

+	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {

 		$el_type      = 'post_page';

-		$el_id        = get_option( 'geodir_add_listing_page' );

+		$el_id        = get_option('geodir_add_listing_page');

 		$default_lang = $sitepress->get_default_language();

-		$el_details   = $sitepress->get_element_language_details( $el_id, $el_type );

+		$el_details   = $sitepress->get_element_language_details($el_id, $el_type);

 

-		if ( ! ( $el_id > 0 && $default_lang && ! empty( $el_details ) && isset( $el_details->language_code ) && $el_details->language_code == $default_lang ) ) {

-			if ( ! $el_details->source_language_code ) {

-				$sitepress->set_element_language_details( $el_id, $el_type, '', $default_lang );

+		if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {

+			if (!$el_details->source_language_code) {

+				$sitepress->set_element_language_details($el_id, $el_type, '', $default_lang);

 				$sitepress->icl_translations_cache->clear();

 			}

 		}

@@ -2224,44 +2224,44 @@ 
  *

  * @return string Orderby SQL.

  */

-function geodir_widget_listings_get_order( $query_args ) {

+function geodir_widget_listings_get_order($query_args) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

-		return $wpdb->posts . ".post_date DESC, ";

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

+		return $wpdb->posts.".post_date DESC, ";

 	}

 

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

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

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

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

 

-	$sort_by = ! empty( $query_args['order_by'] ) ? $query_args['order_by'] : '';

+	$sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : '';

 

-	switch ( $sort_by ) {

+	switch ($sort_by) {

 		case 'latest':

 		case 'newest':

-			$orderby = $wpdb->posts . ".post_date DESC, ";

+			$orderby = $wpdb->posts.".post_date DESC, ";

 			break;

 		case 'featured':

-			$orderby = $table . ".is_featured ASC, ". $wpdb->posts . ".post_date DESC, ";

+			$orderby = $table.".is_featured ASC, ".$wpdb->posts.".post_date DESC, ";

 			break;

 		case 'az':

-			$orderby = $wpdb->posts . ".post_title ASC, ";

+			$orderby = $wpdb->posts.".post_title ASC, ";

 			break;

 		case 'high_review':

-			$orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

+			$orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, ";

 			break;

 		case 'high_rating':

-			$orderby = "( " . $table . ".overall_rating  ) DESC, ";

+			$orderby = "( ".$table.".overall_rating  ) DESC, ";

 			break;

 		case 'random':

 			$orderby = "RAND(), ";

 			break;

 		default:

-			if ( $custom_orderby = geodir_prepare_custom_sorting( $sort_by, $table ) ) {

-				$orderby = $custom_orderby . ", ";

+			if ($custom_orderby = geodir_prepare_custom_sorting($sort_by, $table)) {

+				$orderby = $custom_orderby.", ";

 			} else {

-				$orderby = $wpdb->posts . ".post_title ASC, ";

+				$orderby = $wpdb->posts.".post_title ASC, ";

 			}

 			break;

 	}

@@ -2286,16 +2286,16 @@ 
  *

  * @return mixed Result object.

  */

-function geodir_get_widget_listings( $query_args = array(), $count_only = false ) {

+function geodir_get_widget_listings($query_args = array(), $count_only = false) {

 	global $wpdb, $plugin_prefix, $table_prefix;

 	$GLOBALS['gd_query_args_widgets'] = $query_args;

 	$gd_query_args_widgets            = $query_args;

 

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

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

-	$supports_wpml = geodir_wpml_is_post_type_translated( $post_type );

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

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

+	$supports_wpml = geodir_wpml_is_post_type_translated($post_type);

 

-	$fields = $wpdb->posts . ".*, " . $table . ".*";

+	$fields = $wpdb->posts.".*, ".$table.".*";

 	/**

 	 * Filter widget listing fields string part that is being used for query.

 	 *

@@ -2305,17 +2305,17 @@ 
 	 * @param string $table     Table name.

 	 * @param string $post_type Post type.

 	 */

-	$fields = apply_filters( 'geodir_filter_widget_listings_fields', $fields, $table, $post_type );

+	$fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);

 

-	$join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";

+	$join = "INNER JOIN ".$table." ON (".$table.".post_id = ".$wpdb->posts.".ID)";

 

 	########### WPML ###########

 

-	if ( $supports_wpml ) {

+	if ($supports_wpml) {

 		global $sitepress;

 		$lang_code = ICL_LANGUAGE_CODE;

-		if ( $lang_code ) {

-			$join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

+		if ($lang_code) {

+			$join .= " JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID";

 		}

 	}

 

@@ -2329,15 +2329,15 @@ 
 	 * @param string $join      Join clause string.

 	 * @param string $post_type Post type.

 	 */

-	$join = apply_filters( 'geodir_filter_widget_listings_join', $join, $post_type );

+	$join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);

 

-	$post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : '';

+	$post_status = is_super_admin() ? " OR ".$wpdb->posts.".post_status = 'private'" : '';

 

-	$where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'";

+	$where = " AND ( ".$wpdb->posts.".post_status = 'publish' ".$post_status." ) AND ".$wpdb->posts.".post_type = '".$post_type."'";

 

 	########### WPML ###########

-	if ( $supports_wpml ) {

-		if ( $lang_code ) {

+	if ($supports_wpml) {

+		if ($lang_code) {

 			$where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' ";

 		}

 	}

@@ -2350,8 +2350,8 @@ 
 	 * @param string $where     Where clause string.

 	 * @param string $post_type Post type.

 	 */

-	$where = apply_filters( 'geodir_filter_widget_listings_where', $where, $post_type );

-	$where = $where != '' ? " WHERE 1=1 " . $where : '';

+	$where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);

+	$where = $where != '' ? " WHERE 1=1 ".$where : '';

 

 	$groupby = " GROUP BY $wpdb->posts.ID "; //@todo is this needed? faster without

 	/**

@@ -2362,15 +2362,15 @@ 
 	 * @param string $groupby   Group by clause string.

 	 * @param string $post_type Post type.

 	 */

-	$groupby = apply_filters( 'geodir_filter_widget_listings_groupby', $groupby, $post_type );

+	$groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);

 

-	if ( $count_only ) {

-		$sql  = "SELECT COUNT(DISTINCT " . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . "

-			" . $join . "

+	if ($count_only) {

+		$sql  = "SELECT COUNT(DISTINCT ".$wpdb->posts.".ID) AS total FROM ".$wpdb->posts."

+			" . $join."

 			" . $where;

-		$rows = (int) $wpdb->get_var( $sql );

+		$rows = (int) $wpdb->get_var($sql);

 	} else {

-		$orderby = geodir_widget_listings_get_order( $query_args );

+		$orderby = geodir_widget_listings_get_order($query_args);

 		/**

 		 * Filter widget listing orderby clause string part that is being used for query.

 		 *

@@ -2380,33 +2380,33 @@ 
 		 * @param string $table     Table name.

 		 * @param string $post_type Post type.

 		 */

-		$orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type );

+		$orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);

 		

 		$second_orderby = array();

-		if ( strpos( $orderby, strtolower( $table . ".is_featured" )  ) === false ) {

-			$second_orderby[] = $table . ".is_featured ASC";

+		if (strpos($orderby, strtolower($table.".is_featured")) === false) {

+			$second_orderby[] = $table.".is_featured ASC";

 		}

 		

-		if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_date" )  ) === false ) {

-			$second_orderby[] = $wpdb->posts . ".post_date DESC";

+		if (strpos($orderby, strtolower($wpdb->posts.".post_date")) === false) {

+			$second_orderby[] = $wpdb->posts.".post_date DESC";

 		}

 		

-		if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_title" )  ) === false ) {

-			$second_orderby[] = $wpdb->posts . ".post_title ASC";

+		if (strpos($orderby, strtolower($wpdb->posts.".post_title")) === false) {

+			$second_orderby[] = $wpdb->posts.".post_title ASC";

 		}

 		

-		if ( !empty( $second_orderby ) ) {

-			$orderby .= implode( ', ', $second_orderby );

+		if (!empty($second_orderby)) {

+			$orderby .= implode(', ', $second_orderby);

 		}

 		

-		if ( !empty( $orderby ) ) {

-			$orderby = trim( $orderby );

-			$orderby = rtrim( $orderby, "," );

+		if (!empty($orderby)) {

+			$orderby = trim($orderby);

+			$orderby = rtrim($orderby, ",");

 		}

 		

-		$orderby = $orderby != '' ? " ORDER BY " . $orderby : '';

+		$orderby = $orderby != '' ? " ORDER BY ".$orderby : '';

 

-		$limit = ! empty( $query_args['posts_per_page'] ) ? $query_args['posts_per_page'] : 5;

+		$limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5;

 		/**

 		 * Filter widget listing limit that is being used for query.

 		 *

@@ -2415,27 +2415,27 @@ 
 		 * @param int $limit        Query results limit.

 		 * @param string $post_type Post type.

 		 */

-		$limit = apply_filters( 'geodir_filter_widget_listings_limit', $limit, $post_type );

+		$limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);

 

-		$page = ! empty( $query_args['pageno'] ) ? absint( $query_args['pageno'] ) : 1;

-		if ( ! $page ) {

+		$page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1;

+		if (!$page) {

 			$page = 1;

 		}

 

-		$limit = (int) $limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int) $limit ) . ", " . (int) $limit : "";

+		$limit = (int) $limit > 0 ? " LIMIT ".absint(($page - 1) * (int) $limit).", ".(int) $limit : "";

 

 		//@todo removed SQL_CALC_FOUND_ROWS from below as don't think it is needed and query is faster without

-		$sql  = "SELECT " . $fields . " FROM " . $wpdb->posts . "

-			" . $join . "

-			" . $where . "

-			" . $groupby . "

-			" . $orderby . "

+		$sql = "SELECT ".$fields." FROM ".$wpdb->posts."

+			" . $join."

+			" . $where."

+			" . $groupby."

+			" . $orderby."

 			" . $limit;

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

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

 	}

 

-	unset( $GLOBALS['gd_query_args_widgets'] );

-	unset( $gd_query_args_widgets );

+	unset($GLOBALS['gd_query_args_widgets']);

+	unset($gd_query_args_widgets);

 

 	return $rows;

 }

@@ -2452,11 +2452,11 @@ 
  *

  * @return string Modified fields SQL.

  */

-function geodir_function_widget_listings_fields( $fields ) {

+function geodir_function_widget_listings_fields($fields) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $fields;

 	}

 

@@ -2475,24 +2475,24 @@ 
  *

  * @return string Modified join clause SQL.

  */

-function geodir_function_widget_listings_join( $join ) {

+function geodir_function_widget_listings_join($join) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $join;

 	}

 

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

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

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

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

 

-	if ( ! empty( $query_args['with_pics_only'] ) ) {

-		$join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

+	if (!empty($query_args['with_pics_only'])) {

+		$join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )";

 	}

 

-	if ( ! empty( $query_args['tax_query'] ) ) {

-		$tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' );

-		if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {

+	if (!empty($query_args['tax_query'])) {

+		$tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID');

+		if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {

 			$join .= $tax_queries['join'];

 		}

 	}

@@ -2513,67 +2513,67 @@ 
  *

  * @return string Modified where clause SQL.

  */

-function geodir_function_widget_listings_where( $where ) {

+function geodir_function_widget_listings_where($where) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $where;

 	}

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

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

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

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

 

-	if ( ! empty( $query_args ) ) {

-		if ( ! empty( $query_args['gd_location'] ) && function_exists( 'geodir_default_location_where' ) ) {

-			$where = geodir_default_location_where( $where, $table );

+	if (!empty($query_args)) {

+		if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {

+			$where = geodir_default_location_where($where, $table);

 		}

 

-		if ( ! empty( $query_args['post_author'] ) ) {

-			$where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author'];

+		if (!empty($query_args['post_author'])) {

+			$where .= " AND ".$wpdb->posts.".post_author = ".(int) $query_args['post_author'];

 		}

 

-		if ( ! empty( $query_args['show_featured_only'] ) ) {

-			$where .= " AND " . $table . ".is_featured = '1'";

+		if (!empty($query_args['show_featured_only'])) {

+			$where .= " AND ".$table.".is_featured = '1'";

 		}

 

-		if ( ! empty( $query_args['show_special_only'] ) ) {

-			$where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

+		if (!empty($query_args['show_special_only'])) {

+			$where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )";

 		}

 

-		if ( ! empty( $query_args['with_pics_only'] ) ) {

-			$where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL ";

+		if (!empty($query_args['with_pics_only'])) {

+			$where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL ";

 		}

 

-		if ( ! empty( $query_args['featured_image_only'] ) ) {

-			$where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' ";

+		if (!empty($query_args['featured_image_only'])) {

+			$where .= " AND ".$table.".featured_image IS NOT NULL AND ".$table.".featured_image!='' ";

 		}

 

-		if ( ! empty( $query_args['with_videos_only'] ) ) {

-			$where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

+		if (!empty($query_args['with_videos_only'])) {

+			$where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )";

 		}

         

-		if ( ! empty( $query_args['show_favorites_only'] ) ) {

+		if (!empty($query_args['show_favorites_only'])) {

 			$user_favorites = '-1';

 			

-			if ( !empty( $query_args['favorites_by_user'] ) ) {

+			if (!empty($query_args['favorites_by_user'])) {

 

 				$site_id = '';

-				if ( is_multisite() ) {

+				if (is_multisite()) {

 					$blog_id = get_current_blog_id();

-					if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}

+					if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }

 				}

 				

-				$user_favorites = geodir_get_user_favourites( (int)$query_args['favorites_by_user'] );

+				$user_favorites = geodir_get_user_favourites((int) $query_args['favorites_by_user']);

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

 			}

 			

-			$where .= " AND `" . $wpdb->posts . "`.`ID` IN('" . $user_favorites . "')";

+			$where .= " AND `".$wpdb->posts."`.`ID` IN('".$user_favorites."')";

 		}

 

-		if ( ! empty( $query_args['tax_query'] ) ) {

-			$tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' );

+		if (!empty($query_args['tax_query'])) {

+			$tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID');

 

-			if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {

+			if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {

 				$where .= $tax_queries['where'];

 			}

 		}

@@ -2594,11 +2594,11 @@ 
  *

  * @return string Modified orderby clause SQL.

  */

-function geodir_function_widget_listings_orderby( $orderby ) {

+function geodir_function_widget_listings_orderby($orderby) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $orderby;

 	}

 

@@ -2617,15 +2617,15 @@ 
  *

  * @return int Query limit.

  */

-function geodir_function_widget_listings_limit( $limit ) {

+function geodir_function_widget_listings_limit($limit) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $limit;

 	}

 

-	if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {

+	if (!empty($query_args) && !empty($query_args['posts_per_page'])) {

 		$limit = (int) $query_args['posts_per_page'];

 	}

 

@@ -2643,12 +2643,12 @@ 
  *

  * @return int Large size width.

  */

-function geodir_media_image_large_width( $default = 800, $params = '' ) {

-	$large_size_w = get_option( 'large_size_w' );

+function geodir_media_image_large_width($default = 800, $params = '') {

+	$large_size_w = get_option('large_size_w');

 	$large_size_w = $large_size_w > 0 ? $large_size_w : $default;

-	$large_size_w = absint( $large_size_w );

+	$large_size_w = absint($large_size_w);

 

-	if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {

+	if (!get_option('geodir_use_wp_media_large_size')) {

 		$large_size_w = 800;

 	}

 

@@ -2661,7 +2661,7 @@ 
 	 * @param int $default         Default width.

 	 * @param string|array $params Image parameters.

 	 */

-	$large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params );

+	$large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);

 

 	return $large_size_w;

 }

@@ -2677,12 +2677,12 @@ 
  *

  * @return int Large size height.

  */

-function geodir_media_image_large_height( $default = 800, $params = '' ) {

-	$large_size_h = get_option( 'large_size_h' );

+function geodir_media_image_large_height($default = 800, $params = '') {

+	$large_size_h = get_option('large_size_h');

 	$large_size_h = $large_size_h > 0 ? $large_size_h : $default;

-	$large_size_h = absint( $large_size_h );

+	$large_size_h = absint($large_size_h);

 

-	if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {

+	if (!get_option('geodir_use_wp_media_large_size')) {

 		$large_size_h = 800;

 	}

 

@@ -2695,7 +2695,7 @@ 
 	 * @param int $default         Default height.

 	 * @param string|array $params Image parameters.

 	 */

-	$large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params );

+	$large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);

 

 	return $large_size_h;

 }

@@ -2712,8 +2712,8 @@ 
  *

  * @return string Sanitized name.

  */

-function geodir_sanitize_location_name( $type, $name, $translate = true ) {

-	if ( $name == '' ) {

+function geodir_sanitize_location_name($type, $name, $translate = true) {

+	if ($name == '') {

 		return null;

 	}

 

@@ -2722,13 +2722,13 @@ 
 	$type = $type == 'gd_city' ? 'city' : $type;

 

 	$return = $name;

-	if ( function_exists( 'get_actual_location_name' ) ) {

-		$return = get_actual_location_name( $type, $name, $translate );

+	if (function_exists('get_actual_location_name')) {

+		$return = get_actual_location_name($type, $name, $translate);

 	} else {

-		$return = preg_replace( '/-(\d+)$/', '', $return );

-		$return = preg_replace( '/[_-]/', ' ', $return );

-		$return = geodir_ucwords( $return );

-		$return = $translate ? __( $return, 'geodirectory' ) : $return;

+		$return = preg_replace('/-(\d+)$/', '', $return);

+		$return = preg_replace('/[_-]/', ' ', $return);

+		$return = geodir_ucwords($return);

+		$return = $translate ? __($return, 'geodirectory') : $return;

 	}

 

 	return $return;

@@ -2746,26 +2746,26 @@ 
  *

  * @param int $number Comments number.

  */

-function geodir_comments_number( $number ) {

+function geodir_comments_number($number) {

 	global $post;

 	

-	if ( !empty( $post->post_type ) && geodir_cpt_has_rating_disabled( $post->post_type ) ) {

+	if (!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type)) {

 		$number = get_comments_number();

 		

-		if ( $number > 1 ) {

-			$output = str_replace( '%', number_format_i18n( $number ), __( '% Comments', 'geodirectory' ) );

-		} elseif ( $number == 0 || $number == '' ) {

-			$output = __( 'No Comments', 'geodirectory' );

+		if ($number > 1) {

+			$output = str_replace('%', number_format_i18n($number), __('% Comments', 'geodirectory'));

+		} elseif ($number == 0 || $number == '') {

+			$output = __('No Comments', 'geodirectory');

 		} else { // must be one

-			$output = __( '1 Comment', 'geodirectory' );

+			$output = __('1 Comment', 'geodirectory');

 		}

 	} else {    

-		if ( $number > 1 ) {

-			$output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) );

-		} elseif ( $number == 0 || $number == '' ) {

-			$output = __( 'No Reviews', 'geodirectory' );

+		if ($number > 1) {

+			$output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));

+		} elseif ($number == 0 || $number == '') {

+			$output = __('No Reviews', 'geodirectory');

 		} else { // must be one

-			$output = __( '1 Review', 'geodirectory' );

+			$output = __('1 Review', 'geodirectory');

 		}

 	}

 	

@@ -2782,18 +2782,18 @@ 
  */

 function is_page_geodir_home() {

 	global $wpdb;

-	$cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() );

-	if ( function_exists( 'geodir_location_geo_home_link' ) ) {

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

+	$cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());

+	if (function_exists('geodir_location_geo_home_link')) {

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

 	}

-	$home_url = home_url( '', 'http' );

-	if ( function_exists( 'geodir_location_geo_home_link' ) ) {

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

+	$home_url = home_url('', 'http');

+	if (function_exists('geodir_location_geo_home_link')) {

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

 	}

-	$home_url = str_replace( "www.", "", $home_url );

-	if ( ( strpos( $home_url, $cur_url ) !== false || strpos( $home_url . '/', $cur_url ) !== false ) && ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) ) {

+	$home_url = str_replace("www.", "", $home_url);

+	if ((strpos($home_url, $cur_url) !== false || strpos($home_url.'/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page'))) {

 		return true;

-	} elseif ( get_query_var( 'page_id' ) == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) {

+	} elseif (get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page')) {

 		return true;

 	} else {

 		return false;

@@ -2813,18 +2813,18 @@ 
  *

  * @return string The canonical URL.

  */

-function geodir_wpseo_homepage_canonical( $url ) {

+function geodir_wpseo_homepage_canonical($url) {

 	global $post;

 

-	if ( is_page_geodir_home() ) {

+	if (is_page_geodir_home()) {

 		return home_url();

 	}

 

 	return $url;

 }

 

-add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 );

-add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 );

+add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);

+add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);

 

 /**

  * Add extra fields to google maps script call.

@@ -2837,20 +2837,20 @@ 
  *

  * @return string Modified extra string.

  */

-function geodir_googlemap_script_extra_details_page( $extra ) {

+function geodir_googlemap_script_extra_details_page($extra) {

 	global $post;

 	$add_google_places_api = false;

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

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

 		$add_google_places_api = true;

 	}

-	if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {

+	if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {

 		$extra .= "&amp;libraries=places";

 	}

 

 	return $extra;

 }

 

-add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 );

+add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);

 

 

 /**

@@ -2869,122 +2869,122 @@ 
  *                                          after_widget.

  * @param array|string $instance            The settings for the particular instance of the widget.

  */

-function geodir_popular_post_category_output( $args = '', $instance = '' ) {

+function geodir_popular_post_category_output($args = '', $instance = '') {

 	// prints the widget

 	global $wpdb, $plugin_prefix, $geodir_post_category_str;

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 

 	echo $before_widget;

 

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 

 	$gd_post_type = geodir_get_current_posttype();

 

-	$category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15;

+	$category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15;

 	if (!isset($category_restrict)) {

 		$category_restrict = false;

 	}

-	if ( ! empty( $gd_post_type ) ) {

+	if (!empty($gd_post_type)) {

 		$default_post_type = $gd_post_type;

-	} elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {

+	} elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {

 		$default_post_type = $instance['default_post_type'];

 	} else {

 		$all_gd_post_type  = geodir_get_posttypes();

-		$default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : '';

+		$default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : '';

 	}

-	$parent_only = !empty( $instance['parent_only'] ) ? true : false;

+	$parent_only = !empty($instance['parent_only']) ? true : false;

 

 	$taxonomy = array();

-	if ( ! empty( $gd_post_type ) ) {

-		$taxonomy[] = $gd_post_type . "category";

+	if (!empty($gd_post_type)) {

+		$taxonomy[] = $gd_post_type."category";

 	} else {

-		$taxonomy = geodir_get_taxonomies( $gd_post_type );

+		$taxonomy = geodir_get_taxonomies($gd_post_type);

 	}

 

 	$taxonomy = apply_filters('geodir_pp_category_taxonomy', $taxonomy);

 

-	$term_args = array( 'taxonomy' => $taxonomy );

-	if ( $parent_only ) {

+	$term_args = array('taxonomy' => $taxonomy);

+	if ($parent_only) {

 		$term_args['parent'] = 0;

 	}

 

-	$terms   = get_terms( $term_args );

+	$terms   = get_terms($term_args);

 	$a_terms = array();

 	$b_terms = array();

 

-	foreach ( $terms as $term ) {

-		if ( $term->count > 0 ) {

-			$a_terms[ $term->taxonomy ][] = $term;

+	foreach ($terms as $term) {

+		if ($term->count > 0) {

+			$a_terms[$term->taxonomy][] = $term;

 		}

 	}

 

-	if ( ! empty( $a_terms ) ) {

+	if (!empty($a_terms)) {

 		// Sort CPT taxonomies in categories widget.

-		if ( !empty( $taxonomy ) && is_array( $taxonomy ) && count( $taxonomy ) > 1 ) {

+		if (!empty($taxonomy) && is_array($taxonomy) && count($taxonomy) > 1) {

 			$gd_post_types = geodir_get_posttypes();

 			$sort_taxonomies = array();

 			

-			foreach ( $gd_post_types as $gd_post_type ) {

-				$taxonomy_name = $gd_post_type . 'category';

+			foreach ($gd_post_types as $gd_post_type) {

+				$taxonomy_name = $gd_post_type.'category';

 				

-				if ( !empty( $a_terms[$taxonomy_name] ) ) {

+				if (!empty($a_terms[$taxonomy_name])) {

 					$sort_taxonomies[$taxonomy_name] = $a_terms[$taxonomy_name];

 				}

 			}

-			$a_terms = !empty( $sort_taxonomies ) ? $sort_taxonomies : $a_terms;

+			$a_terms = !empty($sort_taxonomies) ? $sort_taxonomies : $a_terms;

 		}

 

 		$sort_by = apply_filters('geodir_pp_category_sort', 'count');

-		foreach ( $a_terms as $b_key => $b_val ) {

-			$b_terms[ $b_key ] = geodir_sort_terms( $b_val, $sort_by );

+		foreach ($a_terms as $b_key => $b_val) {

+			$b_terms[$b_key] = geodir_sort_terms($b_val, $sort_by);

 		}

 

-		$default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : '';

+		$default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : '';

 

 		$tax_change_output = '';

-		if ( count( $b_terms ) > 1 ) {

-			$tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax'  onchange='geodir_get_post_term(this);'>";

-			foreach ( $b_terms as $key => $val ) {

-				$ptype    = get_post_type_object( str_replace( "category", "", $key ) );

-				$cpt_name = __( $ptype->labels->singular_name, 'geodirectory' );

-				$tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>";

+		if (count($b_terms) > 1) {

+			$tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax'  onchange='geodir_get_post_term(this);'>";

+			foreach ($b_terms as $key => $val) {

+				$ptype    = get_post_type_object(str_replace("category", "", $key));

+				$cpt_name = __($ptype->labels->singular_name, 'geodirectory');

+				$tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";

 			}

 			$tax_change_output .= "</select>";

 		}

 

-		if ( ! empty( $b_terms ) ) {

-			$terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array

-			global $cat_count;//make global so we can change via function

+		if (!empty($b_terms)) {

+			$terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array

+			global $cat_count; //make global so we can change via function

 			$cat_count = 0;

 			?>

 			<div class="geodir-category-list-in clearfix">

 				<div class="geodir-cat-list clearfix">

 					<?php

-					echo $before_title . __( $title ) . $after_title;

+					echo $before_title.__($title).$after_title;

 

 					echo $tax_change_output;

 

 					echo '<ul class="geodir-popular-cat-list">';

 

-					geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict);

+					geodir_helper_cat_list_output($terms, $category_limit, $category_restrict);

 

 					echo '</ul>';

 					?>

 				</div>

 				<?php

-				if ( empty( $category_restrict ) ) { 

+				if (empty($category_restrict)) { 

 					$hide = '';

-					if ( $cat_count < $category_limit ) {

+					if ($cat_count < $category_limit) {

 						$hide = 'style="display:none;"';

 					}

 					echo "<div class='geodir-cat-list-more' $hide >";

-					echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>';

-					echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>';

+					echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';

+					echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';

 					echo "</div>";

 				}

 				/* add scripts */

-				add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 );

+				add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);

 				?>

 			</div>

 			<?php

@@ -3004,28 +3004,28 @@ 
  * @param int $category_limit               Number of categories to display by default.

  * @param bool $category_restrict           If the cat limit should be hidden or not shown.

  */

-function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {

+function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {

 	global $geodir_post_category_str, $cat_count;

 	$term_icons = geodir_get_term_icon();

 

 	$geodir_post_category_str = array();

 

 

-	foreach ( $terms as $cat ) {

-		$post_type     = str_replace( "category", "", $cat->taxonomy );

-		$term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : '';

+	foreach ($terms as $cat) {

+		$post_type     = str_replace("category", "", $cat->taxonomy);

+		$term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : '';

 

-		$cat_count ++;

+		$cat_count++;

 

-		$geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id );

+		$geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);

 

-		$class_row  = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show';

-		if($category_restrict && $cat_count > $category_limit ){

+		$class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show';

+		if ($category_restrict && $cat_count > $category_limit) {

 			continue;

 		}

 		$total_post = $cat->count;

 

-		$term_link = get_term_link( $cat, $cat->taxonomy );

+		$term_link = get_term_link($cat, $cat->taxonomy);

 		/**

 		 * Filer the category term link.

 		 *

@@ -3035,11 +3035,11 @@ 
 		 * @param int $cat          ->term_id The term id.

 		 * @param string $post_type Wordpress post type.

 		 */

-		$term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type );

+		$term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);

 

-		echo '<li class="' . $class_row . '"><a href="' . $term_link . '">';

-		echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">';

-		echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';

+		echo '<li class="'.$class_row.'"><a href="'.$term_link.'">';

+		echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">';

+		echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';

 		echo '</a></li>';

 	}

 }

@@ -3054,14 +3054,14 @@ 
  * @param array|string $args     Display arguments including before_title, after_title, before_widget, and after_widget.

  * @param array|string $instance The settings for the particular instance of the widget.

  */

-function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {

+function geodir_listing_slider_widget_output($args = '', $instance = '') {

 	// prints the widget

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 

 	echo $before_widget;

 

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 	/**

 	 * Filter the widget post type.

 	 *

@@ -3069,7 +3069,7 @@ 
 	 *

 	 * @param string $instance ['post_type'] Post type of listing.

 	 */

-	$post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] );

+	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);

 	/**

 	 * Filter the widget's term.

 	 *

@@ -3077,7 +3077,7 @@ 
 	 *

 	 * @param string $instance ['category'] Filter by term. Can be any valid term.

 	 */

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

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

 	/**

 	 * Filter widget's "add_location_filter" value.

 	 *

@@ -3085,7 +3085,7 @@ 
 	 *

 	 * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0.

 	 */

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

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

 	/**

 	 * Filter the widget listings limit.

 	 *

@@ -3093,7 +3093,7 @@ 
 	 *

 	 * @param string $instance ['post_number'] Number of listings to display.

 	 */

-	$post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] );

+	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);

 	/**

 	 * Filter the widget listings limit shown at one time.

 	 *

@@ -3101,7 +3101,7 @@ 
 	 *

 	 * @param string $instance ['max_show'] Number of listings to display on screen.

 	 */

-	$max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] );

+	$max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);

 	/**

 	 * Filter the widget slide width.

 	 *

@@ -3109,7 +3109,7 @@ 
 	 *

 	 * @param string $instance ['slide_width'] Width of the slides shown.

 	 */

-	$slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] );

+	$slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);

 	/**

 	 * Filter widget's "show title" value.

 	 *

@@ -3117,7 +3117,7 @@ 
 	 *

 	 * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0.

 	 */

-	$show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] );

+	$show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);

 	/**

 	 * Filter widget's "slideshow" value.

 	 *

@@ -3125,7 +3125,7 @@ 
 	 *

 	 * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically.

 	 */

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

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

 	/**

 	 * Filter widget's "animationLoop" value.

 	 *

@@ -3133,7 +3133,7 @@ 
 	 *

 	 * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop.

 	 */

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

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

 	/**

 	 * Filter widget's "directionNav" value.

 	 *

@@ -3141,7 +3141,7 @@ 
 	 *

 	 * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0.

 	 */

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

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

 	/**

 	 * Filter widget's "slideshowSpeed" value.

 	 *

@@ -3149,7 +3149,7 @@ 
 	 *

 	 * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds.

 	 */

-	$slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] );

+	$slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);

 	/**

 	 * Filter widget's "animationSpeed" value.

 	 *

@@ -3157,7 +3157,7 @@ 
 	 *

 	 * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds.

 	 */

-	$animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] );

+	$animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);

 	/**

 	 * Filter widget's "animation" value.

 	 *

@@ -3165,7 +3165,7 @@ 
 	 *

 	 * @param string $instance ['animation'] Controls the animation type, "fade" or "slide".

 	 */

-	$animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] );

+	$animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);

 	/**

 	 * Filter widget's "list_sort" type.

 	 *

@@ -3173,10 +3173,10 @@ 
 	 *

 	 * @param string $instance ['list_sort'] Listing sort by type.

 	 */

-	$list_sort          = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] );

-	$show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null;

+	$list_sort          = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);

+	$show_featured_only = !empty($instance['show_featured_only']) ? 1 : null;

 

-	wp_enqueue_script( 'geodirectory-jquery-flexslider-js' );

+	wp_enqueue_script('geodirectory-jquery-flexslider-js');

 	?>

 		<script type="text/javascript">

 		jQuery(window).load(function () {

@@ -3195,7 +3195,7 @@ 
 				itemWidth: 75,

 				itemMargin: 5,

 				asNavFor: '#geodir_widget_slider',

-				rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>,

+				rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>,

 				start: function (slider) {

 					// chrome 53 introduced a bug, so we need to repaint the slider when shown.

 					jQuery('.geodir-slides', jQuery(slider)).removeClass('flexslider-fix-rtl');

@@ -3203,19 +3203,19 @@ 
 			});

 			

 			jQuery('#geodir_widget_slider').flexslider({

-				animation: "<?php echo $animation;?>",

+				animation: "<?php echo $animation; ?>",

 				selector: ".geodir-slides > li",

 				namespace: "geodir-",

 				controlNav: true,

-				animationLoop: <?php echo $animationLoop;?>,

-				slideshow: <?php echo $slideshow;?>,

-				slideshowSpeed: <?php echo $slideshowSpeed;?>,

-				animationSpeed: <?php echo $animationSpeed;?>,

-				directionNav: <?php echo $directionNav;?>,

-				maxItems: <?php echo $max_show;?>,

+				animationLoop: <?php echo $animationLoop; ?>,

+				slideshow: <?php echo $slideshow; ?>,

+				slideshowSpeed: <?php echo $slideshowSpeed; ?>,

+				animationSpeed: <?php echo $animationSpeed; ?>,

+				directionNav: <?php echo $directionNav; ?>,

+				maxItems: <?php echo $max_show; ?>,

 				move: 1,

-				<?php if ( $slide_width ) {

-				echo "itemWidth: " . $slide_width . ",";

+				<?php if ($slide_width) {

+				echo "itemWidth: ".$slide_width.",";

 			}?>

 				sync: "#geodir_widget_carousel",

 				start: function (slider) {

@@ -3226,7 +3226,7 @@ 
 					jQuery('#geodir_widget_slider').css({'visibility': 'visible'});

 					jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});

 				},

-				rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>

+				rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>

 			});

 		});

 	</script>

@@ -3239,62 +3239,62 @@ 
 		'order_by'       => $list_sort

 	);

 

-	if ( $show_featured_only ) {

+	if ($show_featured_only) {

 		$query_args['show_featured_only'] = 1;

 	}

 

-	if ( $category != 0 || $category != '' ) {

-		$category_taxonomy = geodir_get_taxonomies( $post_type );

+	if ($category != 0 || $category != '') {

+		$category_taxonomy = geodir_get_taxonomies($post_type);

 		$tax_query         = array(

 			'taxonomy' => $category_taxonomy[0],

 			'field'    => 'id',

 			'terms'    => $category

 		);

 

-		$query_args['tax_query'] = array( $tax_query );

+		$query_args['tax_query'] = array($tax_query);

 	}

 

 	// we want listings with featured image only

 	$query_args['featured_image_only'] = 1;

 

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

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

 		$query_args['gedir_event_listing_filter'] = 'upcoming';

 	}// show only upcoming events

 

-	$widget_listings = geodir_get_widget_listings( $query_args );

-	if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {

-		if ( $title ) {

-			echo $before_title . $title . $after_title;

+	$widget_listings = geodir_get_widget_listings($query_args);

+	if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {

+		if ($title) {

+			echo $before_title.$title.$after_title;

 		}

 

 		global $post;

 

-		$current_post = $post;// keep current post info

+		$current_post = $post; // keep current post info

 

 		$widget_main_slides = '';

 		$nav_slides         = '';

 		$widget_slides      = 0;

 

-		foreach ( $widget_listings as $widget_listing ) {

+		foreach ($widget_listings as $widget_listing) {

 			global $gd_widget_listing_type;

 			$post         = $widget_listing;

-			$widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) );

+			$widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

 

-			if ( ! empty( $widget_image ) ) {

-				if ( $widget_image->height >= 200 ) {

+			if (!empty($widget_image)) {

+				if ($widget_image->height >= 200) {

 					$widget_spacer_height = 0;

 				} else {

-					$widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 );

+					$widget_spacer_height = ((200 - $widget_image->height) / 2);

 				}

 

-				$widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:' . $widget_spacer_height . 'px !important;margin:0 auto;" width="100" />';

+				$widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="'.geodir_plugin_url()."/geodirectory-assets/images/spacer.gif".'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:'.$widget_spacer_height.'px !important;margin:0 auto;" width="100" />';

 

 				$title = '';

-				if ( $show_title ) {

-					$title_html     = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>';

+				if ($show_title) {

+					$title_html     = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>';

 					$post_id        = $post->ID;

-					$post_permalink = get_permalink( $post->ID );

-					$post_title     = get_the_title( $post->ID );

+					$post_permalink = get_permalink($post->ID);

+					$post_title     = get_the_title($post->ID);

 					/**

 					 * Filter the listing slider widget title.

 					 *

@@ -3305,12 +3305,12 @@ 
 					 * @param string $post_permalink The post permalink url.

 					 * @param string $post_title     The post title text.

 					 */

-					$title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title );

+					$title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);

 				}

 

-				$widget_main_slides .= $title . '<a href="' . get_permalink( $post->ID ) . '"><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></a></li>';

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

-				$widget_slides ++;

+				$widget_main_slides .= $title.'<a href="'.get_permalink($post->ID).'"><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:200px;margin:0 auto;" /></a></li>';

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

+				$widget_slides++;

 			}

 		}

 		?>

@@ -3319,7 +3319,7 @@ 
 			<div id="geodir_widget_slider" class="geodir_flexslider">

 				<ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul>

 			</div>

-			<?php if ( $widget_slides > 1 ) { ?>

+			<?php if ($widget_slides > 1) { ?>

 				<div id="geodir_widget_carousel" class="geodir_flexslider">

 					<ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul>

 				</div>

@@ -3327,7 +3327,7 @@ 
 		</div>

 		<?php

 		$GLOBALS['post'] = $current_post;

-		setup_postdata( $current_post );

+		setup_postdata($current_post);

 	}

 	echo $after_widget;

 }

@@ -3343,50 +3343,50 @@ 
  * @param array|string $args     Display arguments including before_title, after_title, before_widget, and after_widget.

  * @param array|string $instance The settings for the particular instance of the widget.

  */

-function geodir_loginwidget_output( $args = '', $instance = '' ) {

+function geodir_loginwidget_output($args = '', $instance = '') {

 	//print_r($args);

 	//print_r($instance);

 	// prints the widget

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));

 

 	echo $before_widget;

-	echo $before_title . $title . $after_title;

+	echo $before_title.$title.$after_title;

 

 //	global $gd_session;

 //	print_r($gd_session);

 //	print_r($_SESSION);

 

-	if ( is_user_logged_in() ) {

+	if (is_user_logged_in()) {

 		global $current_user;

 

-		$author_link = get_author_posts_url( $current_user->data->ID );

-		$author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );

+		$author_link = get_author_posts_url($current_user->data->ID);

+		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);

 

 		echo '<ul class="geodir-loginbox-list">';

 		ob_start();

 		?>

 		<li><a class="signin"

-		       href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li>

+		       href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>

 		<?php

-		$post_types                           = geodir_get_posttypes( 'object' );

-		$show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' );

-		$geodir_allow_posttype_frontend       = get_option( 'geodir_allow_posttype_frontend' );

+		$post_types                           = geodir_get_posttypes('object');

+		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');

+		$geodir_allow_posttype_frontend       = get_option('geodir_allow_posttype_frontend');

 

-		if ( ! empty( $show_add_listing_post_types_main_nav ) ) {

+		if (!empty($show_add_listing_post_types_main_nav)) {

 			$addlisting_links = '';

-			foreach ( $post_types as $key => $postobj ) {

+			foreach ($post_types as $key => $postobj) {

 

-				if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {

+				if (in_array($key, $show_add_listing_post_types_main_nav)) {

 

-					if ( $add_link = geodir_get_addlisting_link( $key ) ) {

+					if ($add_link = geodir_get_addlisting_link($key)) {

 

 						$name = $postobj->labels->name;

 

 						$selected = '';

-						if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {

+						if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {

 							$selected = 'selected="selected"';

 						}

 

@@ -3399,23 +3399,23 @@ 
 						 * @param string $key       Add listing array key.

 						 * @param int $current_user ->ID Current user ID.

 						 */

-						$add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID );

-						$name = apply_filters( 'geodir_dashboard_label_add_listing', $name, $key, $current_user->ID );

+						$add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);

+						$name = apply_filters('geodir_dashboard_label_add_listing', $name, $key, $current_user->ID);

 

-						$addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>';

+						$addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>';

 

 					}

 				}

 

 			}

 

-			if ( $addlisting_links != '' ) { ?>

+			if ($addlisting_links != '') { ?>

 

 				<li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value"

 				            option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false"

-				            data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>">

+				            data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">

 						<option value="" disabled="disabled" selected="selected"

-						        style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option>

+						        style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>

 						<?php echo $addlisting_links; ?>

 					</select></li> <?php

 

@@ -3423,24 +3423,24 @@ 
 

 		}

 		// My Favourites in Dashboard

-		$show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );

+		$show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');

 		$user_favourite                    = geodir_user_favourite_listing_count();

 

-		if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {

+		if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {

 			$favourite_links = '';

 

-			foreach ( $post_types as $key => $postobj ) {

-				if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {

+			foreach ($post_types as $key => $postobj) {

+				if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {

 					$name           = $postobj->labels->name;

 					$fav_author_link = apply_filters('gd_dash_fav_author_link', $author_link, $current_user->data->ID);

-					$post_type_link = geodir_getlink( $fav_author_link, array(

+					$post_type_link = geodir_getlink($fav_author_link, array(

 						'stype' => $key,

 						'list'  => 'favourite'

-					), false );

+					), false);

 

 					$selected = '';

 

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

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

 						$selected = 'selected="selected"';

 					}

 					/**

@@ -3452,20 +3452,20 @@ 
 					 * @param string $key            Favorite listing array key.

 					 * @param int $current_user      ->ID Current user ID.

 					 */

-					$post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID );

+					$post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);

 

-					$favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>';

+					$favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>';

 				}

 			}

 

-			if ( $favourite_links != '' ) {

+			if ($favourite_links != '') {

 				?>

 				<li>

 					<select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value"

 					        option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false"

-					        data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>">

+					        data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">

 						<option value="" disabled="disabled" selected="selected"

-						        style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option>

+						        style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>

 						<?php echo $favourite_links; ?>

 					</select>

 				</li>

@@ -3474,20 +3474,20 @@ 
 		}

 

 

-		$show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );

+		$show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');

 		$user_listing                     = geodir_user_post_listing_count();

 

-		if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {

+		if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {

 			$listing_links = '';

 

-			foreach ( $post_types as $key => $postobj ) {

-				if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {

+			foreach ($post_types as $key => $postobj) {

+				if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {

 					$name         = $postobj->labels->name;

 					$listing_author_link = apply_filters('gd_dash_listing_author_link', $author_link, $current_user->data->ID);

-					$listing_link = geodir_getlink( $listing_author_link, array( 'stype' => $key ), false );

+					$listing_link = geodir_getlink($listing_author_link, array('stype' => $key), false);

 

 					$selected = '';

-					if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {

+					if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {

 						$selected = 'selected="selected"';

 					}

 

@@ -3500,20 +3500,20 @@ 
 					 * @param string $key          My listing array key.

 					 * @param int $current_user    ->ID Current user ID.

 					 */

-					$listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID );

+					$listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);

 

-					$listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>';

+					$listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>';

 				}

 			}

 

-			if ( $listing_links != '' ) {

+			if ($listing_links != '') {

 				?>

 				<li>

 					<select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value"

 					        option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false"

-					        data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>">

+					        data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">

 						<option value="" disabled="disabled" selected="selected"

-						        style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option>

+						        style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>

 						<?php echo $listing_links; ?>

 					</select>

 				</li>

@@ -3529,7 +3529,7 @@ 
 		 *

 		 * @param string $dashboard_link Dashboard links HTML.

 		 */

-		echo apply_filters( 'geodir_dashboard_links', $dashboard_link );

+		echo apply_filters('geodir_dashboard_links', $dashboard_link);

 		echo '</ul>';

 

 		/**

@@ -3537,7 +3537,7 @@ 
 		 *

 		 * @since 1.6.6

 		 */

-		do_action( 'geodir_after_loginwidget_form_logged_in' );

+		do_action('geodir_after_loginwidget_form_logged_in');

 

 

 	} else {

@@ -3552,18 +3552,18 @@ 
 		<form name="loginform" class="loginform1"

 		      action="<?php echo geodir_login_url(); ?>"

 		      method="post">

-			<div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __( 'Email', 'geodirectory' )); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"

+			<div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __('Email', 'geodirectory')); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"

 			                                    type="text" class="textfield user_login1"/> <span

 					class="user_loginInfo"></span></div>

-			<div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>"

+			<div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"

 			                                    name="<?php echo apply_filters('gd_login_wid_login_pwd', 'pwd'); ?>" type="password"

 			                                    class="textfield user_pass1 input-text"/><span

 					class="user_passInfo"></span></div>

 

-			<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/>

+			<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/>

 			<input type="hidden" name="testcookie" value="1"/>

 

-				<?php do_action( 'login_form' ); ?>

+				<?php do_action('login_form'); ?>

 

 			<div class="geodir_form_row clearfix"><input type="submit" name="submit"

 			                                             value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/>

@@ -3575,11 +3575,11 @@ 
 					 *

 					 * @since 1.0.0

 					 */

-					$is_enable_signup = get_option( 'users_can_register' );

+					$is_enable_signup = get_option('users_can_register');

 					

-					if ( $is_enable_signup ) {

+					if ($is_enable_signup) {

 					?>

-						<a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>"

+						<a href="<?php echo geodir_login_url(array('signup' => true)); ?>"

 						   class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a>

 

 					<?php

@@ -3590,7 +3590,7 @@ 
 					 * @since 1.0.0

 					 */

 					?>

-					<a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>"

+					<a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"

 					   class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div>

 		</form>

 		<?php

@@ -3599,7 +3599,7 @@ 
 		 *

 		 * @since 1.6.6

 		 */

-		do_action( 'geodir_after_loginwidget_form_logged_out' );

+		do_action('geodir_after_loginwidget_form_logged_out');

 	}

 

 	echo $after_widget;

@@ -3622,13 +3622,13 @@ 
  *                                         after_widget.

  * @param array|string $instance           The settings for the particular instance of the widget.

  */

-function geodir_popular_postview_output( $args = '', $instance = '' ) {

+function geodir_popular_postview_output($args = '', $instance = '') {

 	global $gd_session;

 

 	// prints the widget

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 	/**

 	 * Filter the widget post type.

 	 *

@@ -3636,7 +3636,7 @@ 
 	 *

 	 * @param string $instance ['post_type'] Post type of listing.

 	 */

-	$post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] );

+	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);

 	/**

 	 * Filter the widget's term.

 	 *

@@ -3644,7 +3644,7 @@ 
 	 *

 	 * @param string $instance ['category'] Filter by term. Can be any valid term.

 	 */

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

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

 	/**

 	 * Filter the widget listings limit.

 	 *

@@ -3652,7 +3652,7 @@ 
 	 *

 	 * @param string $instance ['post_number'] Number of listings to display.

 	 */

-	$post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] );

+	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);

 	/**

 	 * Filter widget's "layout" type.

 	 *

@@ -3660,7 +3660,7 @@ 
 	 *

 	 * @param string $instance ['layout'] Widget layout type.

 	 */

-	$layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] );

+	$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);

 	/**

 	 * Filter widget's "add_location_filter" value.

 	 *

@@ -3668,7 +3668,7 @@ 
 	 *

 	 * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0.

 	 */

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

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

 	/**

 	 * Filter widget's listing width.

 	 *

@@ -3676,7 +3676,7 @@ 
 	 *

 	 * @param string $instance ['listing_width'] Listing width.

 	 */

-	$listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] );

+	$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);

 	/**

 	 * Filter widget's "list_sort" type.

 	 *

@@ -3684,7 +3684,7 @@ 
 	 *

 	 * @param string $instance ['list_sort'] Listing sort by type.

 	 */

-	$list_sort             = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] );

+	$list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);

 	/**

 	 * Filter widget's "title_tag" type.

 	 *

@@ -3692,36 +3692,36 @@ 
 	 *

 	 * @param string $instance ['title_tag'] Listing title tag.

 	 */

-	$title_tag            = empty( $instance['title_tag'] ) ? 'h3' : apply_filters( 'widget_title_tag', $instance['title_tag'] );

-	$use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false;

+	$title_tag = empty($instance['title_tag']) ? 'h3' : apply_filters('widget_title_tag', $instance['title_tag']);

+	$use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false;

 

 	// set post type to current viewing post type

-	if ( $use_viewing_post_type ) {

+	if ($use_viewing_post_type) {

 		$current_post_type = geodir_get_current_posttype();

-		if ( $current_post_type != '' && $current_post_type != $post_type ) {

+		if ($current_post_type != '' && $current_post_type != $post_type) {

 			$post_type = $current_post_type;

 			$category  = array(); // old post type category will not work for current changed post type

 		}

 	}

 	// replace widget title dynamically

-	$posttype_plural_label   = __( get_post_type_plural_label( $post_type ), 'geodirectory' );

-	$posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' );

+	$posttype_plural_label   = __(get_post_type_plural_label($post_type), 'geodirectory');

+	$posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory');

 

-	$title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title );

-	$title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title );

+	$title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);

+	$title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);

     

 	$categories = $category;

-	if ( ! empty( $category ) && $category[0] != '0' ) {

-		$category_taxonomy = geodir_get_taxonomies( $post_type );

+	if (!empty($category) && $category[0] != '0') {

+		$category_taxonomy = geodir_get_taxonomies($post_type);

 		

 		######### WPML #########

-		if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {

-			$category = gd_lang_object_ids( $category, $category_taxonomy[0] );

+		if (geodir_wpml_is_taxonomy_translated($category_taxonomy[0])) {

+			$category = gd_lang_object_ids($category, $category_taxonomy[0]);

 		}

 		######### WPML #########

 	}

 

-	if ( isset( $instance['character_count'] ) ) {

+	if (isset($instance['character_count'])) {

 		/**

 		 * Filter the widget's excerpt character count.

 		 *

@@ -3729,38 +3729,38 @@ 
 		 *

 		 * @param int $instance ['character_count'] Excerpt character count.

 		 */

-		$character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] );

+		$character_count = apply_filters('widget_list_character_count', $instance['character_count']);

 	} else {

 		$character_count = '';

 	}

 

-	if ( empty( $title ) || $title == 'All' ) {

-		$post_type_name = __( get_post_type_plural_label( $post_type ), 'geodirectory' );

-		$title = !empty( $title ) ? wp_sprintf( __( 'All %s', 'geodirectory' ), $post_type_name ) : $post_type_name;

+	if (empty($title) || $title == 'All') {

+		$post_type_name = __(get_post_type_plural_label($post_type), 'geodirectory');

+		$title = !empty($title) ? wp_sprintf(__('All %s', 'geodirectory'), $post_type_name) : $post_type_name;

 	}

 

 	$location_url = array();

-	$city         = get_query_var( 'gd_city' );

-	if ( ! empty( $city ) ) {

-		$country = get_query_var( 'gd_country' );

-		$region  = get_query_var( 'gd_region' );

+	$city         = get_query_var('gd_city');

+	if (!empty($city)) {

+		$country = get_query_var('gd_country');

+		$region  = get_query_var('gd_region');

 

-		$geodir_show_location_url = get_option( 'geodir_show_location_url' );

+		$geodir_show_location_url = get_option('geodir_show_location_url');

 

-		if ( $geodir_show_location_url == 'all' ) {

-			if ( $country != '' ) {

+		if ($geodir_show_location_url == 'all') {

+			if ($country != '') {

 				$location_url[] = $country;

 			}

 

-			if ( $region != '' ) {

+			if ($region != '') {

 				$location_url[] = $region;

 			}

-		} else if ( $geodir_show_location_url == 'country_city' ) {

-			if ( $country != '' ) {

+		} else if ($geodir_show_location_url == 'country_city') {

+			if ($country != '') {

 				$location_url[] = $country;

 			}

-		} else if ( $geodir_show_location_url == 'region_city' ) {

-			if ( $region != '' ) {

+		} else if ($geodir_show_location_url == 'region_city') {

+			if ($region != '') {

 				$location_url[] = $region;

 			}

 		}

@@ -3768,54 +3768,54 @@ 
 		$location_url[] = $city;

 	}

 

-	$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-	$location_url  = implode( '/', $location_url );

+	$location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

+	$location_url  = implode('/', $location_url);

 	$skip_location = false;

-	if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {

+	if (!$add_location_filter && $gd_session->get('gd_multi_location')) {

 		$skip_location = true;

-		$gd_session->un_set( 'gd_multi_location' );

+		$gd_session->un_set('gd_multi_location');

 	}

 

-	if ( $location_allowed && $add_location_filter && $gd_session->get( 'all_near_me' ) && geodir_is_page( 'location' ) ) {

-		$viewall_url = add_query_arg( array( 

+	if ($location_allowed && $add_location_filter && $gd_session->get('all_near_me') && geodir_is_page('location')) {

+		$viewall_url = add_query_arg(array( 

 			'geodir_search' => 1, 

 			'stype' => $post_type,

 			's' => '',

-			'snear' => __( 'Near:', 'geodiradvancesearch' ) . ' ' . __( 'Me', 'geodiradvancesearch' ),

-			'sgeo_lat' => $gd_session->get( 'user_lat' ),

-			'sgeo_lon' => $gd_session->get( 'user_lon' )

-		), geodir_search_page_base_url() );

+			'snear' => __('Near:', 'geodiradvancesearch').' '.__('Me', 'geodiradvancesearch'),

+			'sgeo_lat' => $gd_session->get('user_lat'),

+			'sgeo_lon' => $gd_session->get('user_lon')

+		), geodir_search_page_base_url());

 

-		if ( ! empty( $category ) && !in_array( '0', $category ) ) {

-			$viewall_url = add_query_arg( array( 's' . $post_type . 'category' => $category ), $viewall_url );

+		if (!empty($category) && !in_array('0', $category)) {

+			$viewall_url = add_query_arg(array('s'.$post_type.'category' => $category), $viewall_url);

 		}

 	} else {

-		if ( get_option( 'permalink_structure' ) ) {

-			$viewall_url = get_post_type_archive_link( $post_type );

+		if (get_option('permalink_structure')) {

+			$viewall_url = get_post_type_archive_link($post_type);

 		} else {

-			$viewall_url = get_post_type_archive_link( $post_type );

+			$viewall_url = get_post_type_archive_link($post_type);

 		}

 

-		if ( ! empty( $category ) && $category[0] != '0' ) {

+		if (!empty($category) && $category[0] != '0') {

 			global $geodir_add_location_url;

 

 			$geodir_add_location_url = '0';

 

-			if ( $add_location_filter != '0' ) {

+			if ($add_location_filter != '0') {

 				$geodir_add_location_url = '1';

 			}

 

-			$viewall_url = get_term_link( (int) $category[0], $post_type . 'category' );

+			$viewall_url = get_term_link((int) $category[0], $post_type.'category');

 

 			$geodir_add_location_url = null;

 		}

 	}

 

-	if ( $skip_location ) {

-		$gd_session->set( 'gd_multi_location', 1 );

+	if ($skip_location) {

+		$gd_session->set('gd_multi_location', 1);

 	}

 

-	if ( is_wp_error( $viewall_url ) ) {

+	if (is_wp_error($viewall_url)) {

 		$viewall_url = '';

 	}

 

@@ -3827,43 +3827,43 @@ 
 		'order_by'       => $list_sort

 	);

 

-	if ( $character_count ) {

+	if ($character_count) {

 		$query_args['excerpt_length'] = $character_count;

 	}

 

-	if ( ! empty( $instance['show_featured_only'] ) ) {

+	if (!empty($instance['show_featured_only'])) {

 		$query_args['show_featured_only'] = 1;

 	}

 

-	if ( ! empty( $instance['show_special_only'] ) ) {

+	if (!empty($instance['show_special_only'])) {

 		$query_args['show_special_only'] = 1;

 	}

 

-	if ( ! empty( $instance['with_pics_only'] ) ) {

+	if (!empty($instance['with_pics_only'])) {

 		$query_args['with_pics_only']      = 0;

 		$query_args['featured_image_only'] = 1;

 	}

 

-	if ( ! empty( $instance['with_videos_only'] ) ) {

+	if (!empty($instance['with_videos_only'])) {

 		$query_args['with_videos_only'] = 1;

 	}

-	$hide_if_empty = ! empty( $instance['hide_if_empty'] ) ? true : false;

+	$hide_if_empty = !empty($instance['hide_if_empty']) ? true : false;

 

-	if ( ! empty( $categories ) && $categories[0] != '0' && !empty( $category_taxonomy ) ) {

+	if (!empty($categories) && $categories[0] != '0' && !empty($category_taxonomy)) {

 		$tax_query = array(

 			'taxonomy' => $category_taxonomy[0],

 			'field'    => 'id',

 			'terms'    => $category

 		);

 

-		$query_args['tax_query'] = array( $tax_query );

+		$query_args['tax_query'] = array($tax_query);

 	}

 

 	global $gridview_columns_widget, $geodir_is_widget_listing;

 

-	$widget_listings = geodir_get_widget_listings( $query_args );

+	$widget_listings = geodir_get_widget_listings($query_args);

     

-	if ( $hide_if_empty && empty( $widget_listings ) ) {

+	if ($hide_if_empty && empty($widget_listings)) {

 		return;

 	}

     

@@ -3878,11 +3878,11 @@ 
 		 *

 		 * @since 1.0.0

 		 */

-		do_action( 'geodir_before_view_all_link_in_widget' ); ?>

+		do_action('geodir_before_view_all_link_in_widget'); ?>

 		<div class="geodir_list_heading clearfix">

-			<?php echo $before_title . $title . $after_title; ?>

+			<?php echo $before_title.$title.$after_title; ?>

 			<a href="<?php echo $viewall_url; ?>"

-			   class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a>

+			   class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>

 		</div>

 		<?php

 		/**

@@ -3890,10 +3890,10 @@ 
 		 *

 		 * @since 1.0.0

 		 */

-		do_action( 'geodir_after_view_all_link_in_widget' ); ?>

+		do_action('geodir_after_view_all_link_in_widget'); ?>

 		<?php

-		if ( strstr( $layout, 'gridview' ) ) {

-			$listing_view_exp        = explode( '_', $layout );

+		if (strstr($layout, 'gridview')) {

+			$listing_view_exp        = explode('_', $layout);

 			$gridview_columns_widget = $layout;

 			$layout                  = $listing_view_exp[0];

 		} else {

@@ -3904,8 +3904,8 @@ 
 		 *

 		 * @since 1.0.0

 		 */

-		$template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) );

-		if ( ! isset( $character_count ) ) {

+		$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));

+		if (!isset($character_count)) {

 			/**

 			 * Filter the widget's excerpt character count.

 			 *

@@ -3913,7 +3913,7 @@ 
 			 *

 			 * @param int $instance ['character_count'] Excerpt character count.

 			 */

-			$character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count );

+			$character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);

 		}

 

 		global $post, $map_jason, $map_canvas_arr;

@@ -3928,13 +3928,13 @@ 
 		 *

 		 * @since 1.0.0

 		 */

-		include( $template );

+		include($template);

 

 		$geodir_is_widget_listing = false;

 

 		$GLOBALS['post'] = $current_post;

-		if ( ! empty( $current_post ) ) {

-			setup_postdata( $current_post );

+		if (!empty($current_post)) {

+			setup_postdata($current_post);

 		}

 		$map_jason      = $current_map_jason;

 		$map_canvas_arr = $current_map_canvas_arr;

@@ -3963,12 +3963,12 @@ 
  *

  * @return int Reviews count.

  */

-function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {

+function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {

 	global $wpdb, $plugin_prefix;

 

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

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

 

-	$sql = "SELECT COALESCE(SUM(rating_count),0) FROM " . $detail_table . " WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(" . $term_id . ", " . $taxonomy . ")";

+	$sql = "SELECT COALESCE(SUM(rating_count),0) FROM ".$detail_table." WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(".$term_id.", ".$taxonomy.")";

 

 	/**

 	 * Filter count review sql query.

@@ -3980,9 +3980,9 @@ 
 	 * @param int $taxonomy     The taxonomy Id.

 	 * @param string $post_type The post type.

 	 */

-	$sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type );

+	$sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);

 

-	$count = $wpdb->get_var( $sql );

+	$count = $wpdb->get_var($sql);

 

 	return $count;

 }

@@ -4000,7 +4000,7 @@ 
  *

  * @return array Term array data.

  */

-function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {

+function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {

 	/**

 	 * Filter review count option data.

 	 *

@@ -4010,78 +4010,78 @@ 
 	 * @param bool $force_update Force update option value?. Default.false.

 	 * @param int $post_ID       The post id to update if any.

 	 */

-	$option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID );

-	if ( ! empty( $option_data ) ) {

+	$option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);

+	if (!empty($option_data)) {

 		return $option_data;

 	}

 

-	$option_data = get_option( 'geodir_global_review_count' );

+	$option_data = get_option('geodir_global_review_count');

 

-	if ( ! $option_data || $force_update ) {

-		if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.

+	if (!$option_data || $force_update) {

+		if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.

 			global $gd_session;

 			$term_array = (array) $option_data;

-			$post_type  = get_post_type( $post_ID );

-			$taxonomy   = $post_type . 'category';

-			$terms      = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) );

-

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

-				foreach ( $terms as $term_id ) {

-					$count                  = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type );

-					$children               = get_term_children( $term_id, $taxonomy );

-					$term_array[ $term_id ] = $count;

+			$post_type  = get_post_type($post_ID);

+			$taxonomy   = $post_type.'category';

+			$terms      = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));

+

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

+				foreach ($terms as $term_id) {

+					$count                  = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type);

+					$children               = get_term_children($term_id, $taxonomy);

+					$term_array[$term_id] = $count;

 				}

 			}

 

-			$session_listing = $gd_session->get( 'listing' );

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

 

 			$terms = array();

-			if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {

-				$terms = (array) $_POST['post_category'][ $taxonomy ];

-			} else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {

-				$terms = (array) $session_listing['post_category'][ $taxonomy ];

+			if (isset($_POST['post_category'][$taxonomy])) {

+				$terms = (array) $_POST['post_category'][$taxonomy];

+			} else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {

+				$terms = (array) $session_listing['post_category'][$taxonomy];

 			}

 

-			if ( ! empty( $terms ) ) {

-				foreach ( $terms as $term_id ) {

-					if ( $term_id > 0 ) {

-						$count                  = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type );

-						$children               = get_term_children( $term_id, $taxonomy );

-						$term_array[ $term_id ] = $count;

+			if (!empty($terms)) {

+				foreach ($terms as $term_id) {

+					if ($term_id > 0) {

+						$count                  = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type);

+						$children               = get_term_children($term_id, $taxonomy);

+						$term_array[$term_id] = $count;

 					}

 				}

 			}

 		} else { // Update reviews count for all post categories.

 			$term_array = array();

 			$post_types = geodir_get_posttypes();

-			foreach ( $post_types as $post_type ) {

+			foreach ($post_types as $post_type) {

 

-				$taxonomy = geodir_get_taxonomies( $post_type );

+				$taxonomy = geodir_get_taxonomies($post_type);

 				$taxonomy = $taxonomy[0];

 

 				$args = array(

 					'hide_empty' => false

 				);

 

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

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

 

-				foreach ( $terms as $term ) {

-					$count    = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type );

-					$children = get_term_children( $term->term_id, $taxonomy );

+				foreach ($terms as $term) {

+					$count    = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type);

+					$children = get_term_children($term->term_id, $taxonomy);

 					/*if ( is_array( $children ) ) {

                         foreach ( $children as $child_id ) {

                             $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type);

                             $count = $count + $child_count;

                         }

                     }*/

-					$term_array[ $term->term_id ] = $count;

+					$term_array[$term->term_id] = $count;

 				}

 			}

 		}

 

-		update_option( 'geodir_global_review_count', $term_array );

+		update_option('geodir_global_review_count', $term_array);

 		//clear cache

-		wp_cache_delete( 'geodir_global_review_count' );

+		wp_cache_delete('geodir_global_review_count');

 

 		return $term_array;

 	} else {

@@ -4097,39 +4097,39 @@ 
  * @package GeoDirectory

  * @return bool

  */

-function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {

-	if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {

+function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {

+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {

 		return; // do not run if importing listings

 	}

 

-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {

+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {

 		return;

 	}

 

 	$post_ID = 0;

-	if ( ! empty( $post ) ) {

-		if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {

+	if (!empty($post)) {

+		if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {

 			return;

 		}

 

-		if ( $new_status == 'auto-draft' && $old_status == 'new' ) {

+		if ($new_status == 'auto-draft' && $old_status == 'new') {

 			return;

 		}

 

-		if ( ! empty( $post->ID ) ) {

+		if (!empty($post->ID)) {

 			$post_ID = $post->ID;

 		}

 	}

 

-	if ( $new_status != $old_status ) {

-		geodir_count_reviews_by_terms( true, $post_ID );

+	if ($new_status != $old_status) {

+		geodir_count_reviews_by_terms(true, $post_ID);

 	}

 

 	return true;

 }

 

-function geodir_term_review_count_force_update_single_post( $post_id ) {

-	geodir_count_reviews_by_terms( true, $post_id );

+function geodir_term_review_count_force_update_single_post($post_id) {

+	geodir_count_reviews_by_terms(true, $post_id);

 }

 

 /*-----------------------------------------------------------------------------------*/

@@ -4146,11 +4146,11 @@ 
  *

  * @return int Post count.

  */

-function geodir_count_posts_by_term( $data, $term ) {

+function geodir_count_posts_by_term($data, $term) {

 

-	if ( $data ) {

-		if ( isset( $data[ $term->term_id ] ) ) {

-			return $data[ $term->term_id ];

+	if ($data) {

+		if (isset($data[$term->term_id])) {

+			return $data[$term->term_id];

 		} else {

 			return 0;

 		}

@@ -4167,8 +4167,8 @@ 
  * param array $terms An array of term objects.

  * @return array Sorted terms array.

  */

-function geodir_sort_terms_by_count( $terms ) {

-	usort( $terms, "geodir_sort_by_count_obj" );

+function geodir_sort_terms_by_count($terms) {

+	usort($terms, "geodir_sort_by_count_obj");

 

 	return $terms;

 }

@@ -4183,8 +4183,8 @@ 
  *

  * @return array Sorted terms array.

  */

-function geodir_sort_terms_by_review_count( $terms ) {

-	usort( $terms, "geodir_sort_by_review_count_obj" );

+function geodir_sort_terms_by_review_count($terms) {

+	usort($terms, "geodir_sort_by_review_count_obj");

 

 	return $terms;

 }

@@ -4200,12 +4200,12 @@ 
  *

  * @return array Sorted terms array.

  */

-function geodir_sort_terms( $terms, $sort = 'count' ) {

-	if ( $sort == 'count' ) {

-		return geodir_sort_terms_by_count( $terms );

+function geodir_sort_terms($terms, $sort = 'count') {

+	if ($sort == 'count') {

+		return geodir_sort_terms_by_count($terms);

 	}

-	if ( $sort == 'review_count' ) {

-		return geodir_sort_terms_by_review_count( $terms );

+	if ($sort == 'review_count') {

+		return geodir_sort_terms_by_review_count($terms);

 	}

 	return $terms;

 }

@@ -4224,7 +4224,7 @@ 
  *

  * @return bool

  */

-function geodir_sort_by_count( $a, $b ) {

+function geodir_sort_by_count($a, $b) {

 	return $a['count'] < $b['count'];

 }

 

@@ -4239,7 +4239,7 @@ 
  *

  * @return bool

  */

-function geodir_sort_by_count_obj( $a, $b ) {

+function geodir_sort_by_count_obj($a, $b) {

 	return $a->count < $b->count;

 }

 

@@ -4254,7 +4254,7 @@ 
  *

  * @return bool

  */

-function geodir_sort_by_review_count_obj( $a, $b ) {

+function geodir_sort_by_review_count_obj($a, $b) {

 	return $a->review_count < $b->review_count;

 }

 

@@ -4271,35 +4271,35 @@ 
 	 * @since   1.4.2

 	 * @package GeoDirectory

 	 */

-	$locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' );

+	$locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');

 

-	load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' );

-	load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' );

+	load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');

+	load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');

 

 	/**

 	 * Define language constants.

 	 *

 	 * @since 1.0.0

 	 */

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

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

 

-	$language_file = geodir_plugin_path() . '/db-language.php';

+	$language_file = geodir_plugin_path().'/db-language.php';

 

 	// Load language string file if not created yet

-	if ( ! file_exists( $language_file ) ) {

+	if (!file_exists($language_file)) {

 		geodirectory_load_db_language();

 	}

 

-	if ( file_exists( $language_file ) ) {

+	if (file_exists($language_file)) {

 		/**

 		 * Language strings from database.

 		 *

 		 * @since 1.4.2

 		 */

 		try {

-			require_once( $language_file );

-		} catch ( Exception $e ) {

-			error_log( 'Language Error: ' . $e->getMessage() );

+			require_once($language_file);

+		} catch (Exception $e) {

+			error_log('Language Error: '.$e->getMessage());

 		}

 	}

 }

@@ -4316,19 +4316,19 @@ 
  */

 function geodirectory_load_db_language() {

 	global $wp_filesystem;

-	if ( empty( $wp_filesystem ) ) {

-		require_once( ABSPATH . '/wp-admin/includes/file.php' );

+	if (empty($wp_filesystem)) {

+		require_once(ABSPATH.'/wp-admin/includes/file.php');

 		WP_Filesystem();

 		global $wp_filesystem;

 	}

 

-	$language_file = geodir_plugin_path() . '/db-language.php';

+	$language_file = geodir_plugin_path().'/db-language.php';

 

-	if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {

+	if (is_file($language_file) && !is_writable($language_file)) {

 		return false;

 	} // Not possible to create.

 

-	if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {

+	if (!is_file($language_file) && !is_writable(dirname($language_file))) {

 		return false;

 	} // Not possible to create.

 

@@ -4342,9 +4342,9 @@ 
 	 *

 	 * @param array $contents_strings Array of strings.

 	 */

-	$contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings );

+	$contents_strings = apply_filters('geodir_load_db_language', $contents_strings);

 

-	$contents_strings = array_unique( $contents_strings );

+	$contents_strings = array_unique($contents_strings);

 

 	$contents_head   = array();

 	$contents_head[] = "<?php";

@@ -4361,21 +4361,21 @@ 
 	$contents_foot[] = "";

 	$contents_foot[] = "";

 

-	$contents = implode( PHP_EOL, $contents_head );

+	$contents = implode(PHP_EOL, $contents_head);

 

-	if ( ! empty( $contents_strings ) ) {

-		foreach ( $contents_strings as $string ) {

-			if ( is_scalar( $string ) && $string != '' ) {

-				$string = str_replace( "'", "\'", $string );

-				geodir_wpml_register_string( $string );

-				$contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";

+	if (!empty($contents_strings)) {

+		foreach ($contents_strings as $string) {

+			if (is_scalar($string) && $string != '') {

+				$string = str_replace("'", "\'", $string);

+				geodir_wpml_register_string($string);

+				$contents .= PHP_EOL."__('".$string."', 'geodirectory');";

 			}

 		}

 	}

 

-	$contents .= implode( PHP_EOL, $contents_foot );

+	$contents .= implode(PHP_EOL, $contents_foot);

 

-	if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {

+	if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {

 		return false;

 	} // Failure; could not write file.

 

@@ -4396,49 +4396,49 @@ 
  *

  * @return array Translation texts.

  */

-function geodir_load_custom_field_translation( $translation_texts = array() ) {

+function geodir_load_custom_field_translation($translation_texts = array()) {

 	global $wpdb;

 

 	// Custom fields table

-	$sql  = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE;

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

+	$sql  = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE;

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

 

-	if ( ! empty( $rows ) ) {

-		foreach ( $rows as $row ) {

-			if ( ! empty( $row->admin_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->admin_title );

+	if (!empty($rows)) {

+		foreach ($rows as $row) {

+			if (!empty($row->admin_title)) {

+				$translation_texts[] = stripslashes_deep($row->admin_title);

 			}

 

-			if ( ! empty( $row->admin_desc ) ) {

-				$translation_texts[] = stripslashes_deep( $row->admin_desc );

+			if (!empty($row->admin_desc)) {

+				$translation_texts[] = stripslashes_deep($row->admin_desc);

 			}

 

-			if ( ! empty( $row->site_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->site_title );

+			if (!empty($row->site_title)) {

+				$translation_texts[] = stripslashes_deep($row->site_title);

 			}

 

-			if ( ! empty( $row->clabels ) ) {

-				$translation_texts[] = stripslashes_deep( $row->clabels );

+			if (!empty($row->clabels)) {

+				$translation_texts[] = stripslashes_deep($row->clabels);

 			}

 

-			if ( ! empty( $row->required_msg ) ) {

-				$translation_texts[] = stripslashes_deep( $row->required_msg );

+			if (!empty($row->required_msg)) {

+				$translation_texts[] = stripslashes_deep($row->required_msg);

 			}

             

-			if ( ! empty( $row->validation_msg ) ) {

-				$translation_texts[] = stripslashes_deep( $row->validation_msg );

+			if (!empty($row->validation_msg)) {

+				$translation_texts[] = stripslashes_deep($row->validation_msg);

 			}

 

-			if ( ! empty( $row->default_value ) ) {

-				$translation_texts[] = stripslashes_deep( $row->default_value );

+			if (!empty($row->default_value)) {

+				$translation_texts[] = stripslashes_deep($row->default_value);

 			}

 

-			if ( ! empty( $row->option_values ) ) {

-				$option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) );

+			if (!empty($row->option_values)) {

+				$option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values));

 

-				if ( ! empty( $option_values ) ) {

-					foreach ( $option_values as $option_value ) {

-						if ( ! empty( $option_value['label'] ) ) {

+				if (!empty($option_values)) {

+					foreach ($option_values as $option_value) {

+						if (!empty($option_value['label'])) {

 							$translation_texts[] = $option_value['label'];

 						}

 					}

@@ -4448,56 +4448,56 @@ 
 	}

 

 	// Custom sorting fields table

-	$sql  = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE;

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

+	$sql  = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE;

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

 

-	if ( ! empty( $rows ) ) {

-		foreach ( $rows as $row ) {

-			if ( ! empty( $row->site_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->site_title );

+	if (!empty($rows)) {

+		foreach ($rows as $row) {

+			if (!empty($row->site_title)) {

+				$translation_texts[] = stripslashes_deep($row->site_title);

 			}

 

-			if ( ! empty( $row->asc_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->asc_title );

+			if (!empty($row->asc_title)) {

+				$translation_texts[] = stripslashes_deep($row->asc_title);

 			}

 

-			if ( ! empty( $row->desc_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->desc_title );

+			if (!empty($row->desc_title)) {

+				$translation_texts[] = stripslashes_deep($row->desc_title);

 			}

 		}

 	}

 

 	// Advance search filter fields table

-	if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {

-		$sql  = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE;

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

-

-		if ( ! empty( $rows ) ) {

-			foreach ( $rows as $row ) {

-				if ( ! empty( $row->field_site_name ) ) {

-					$translation_texts[] = stripslashes_deep( $row->field_site_name );

+	if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {

+		$sql  = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE;

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

+

+		if (!empty($rows)) {

+			foreach ($rows as $row) {

+				if (!empty($row->field_site_name)) {

+					$translation_texts[] = stripslashes_deep($row->field_site_name);

 				}

 

-				if ( ! empty( $row->front_search_title ) ) {

-					$translation_texts[] = stripslashes_deep( $row->front_search_title );

+				if (!empty($row->front_search_title)) {

+					$translation_texts[] = stripslashes_deep($row->front_search_title);

 				}

 

-				if ( ! empty( $row->first_search_text ) ) {

-					$translation_texts[] = stripslashes_deep( $row->first_search_text );

+				if (!empty($row->first_search_text)) {

+					$translation_texts[] = stripslashes_deep($row->first_search_text);

 				}

 

-				if ( ! empty( $row->last_search_text ) ) {

-					$translation_texts[] = stripslashes_deep( $row->last_search_text );

+				if (!empty($row->last_search_text)) {

+					$translation_texts[] = stripslashes_deep($row->last_search_text);

 				}

 

-				if ( ! empty( $row->field_desc ) ) {

-					$translation_texts[] = stripslashes_deep( $row->field_desc );

+				if (!empty($row->field_desc)) {

+					$translation_texts[] = stripslashes_deep($row->field_desc);

 				}

 			}

 		}

 	}

 

-	$translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts;

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

 	return $translation_texts;

 }

@@ -4519,7 +4519,7 @@ 
 	 *

 	 * @param array $geodir_allowed_mime_types and file extensions.

 	 */

-	return apply_filters( 'geodir_allowed_mime_types', array(

+	return apply_filters('geodir_allowed_mime_types', array(

 			'Image'       => array( // Image formats.

 				'jpg'  => 'image/jpeg',

 				'jpe'  => 'image/jpeg',

@@ -4588,18 +4588,18 @@ 
  *

  * @return string User display name.

  */

-function geodir_get_client_name( $user_id ) {

+function geodir_get_client_name($user_id) {

 	$client_name = '';

 

-	$user_data = get_userdata( $user_id );

+	$user_data = get_userdata($user_id);

 

-	if ( ! empty( $user_data ) ) {

-		if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {

-			$client_name = trim( $user_data->display_name );

-		} else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {

-			$client_name = trim( $user_data->user_nicename );

+	if (!empty($user_data)) {

+		if (isset($user_data->display_name) && trim($user_data->display_name) != '') {

+			$client_name = trim($user_data->display_name);

+		} else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {

+			$client_name = trim($user_data->user_nicename);

 		} else {

-			$client_name = trim( $user_data->user_login );

+			$client_name = trim($user_data->user_login);

 		}

 	}

 

@@ -4607,17 +4607,17 @@ 
 }

 

 

-add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 );

+add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);

 /*

  * Add location variables to wpseo replacements.

  *

  * @since 1.5.4

  */

-function geodir_wpseo_replacements( $vars ) {

+function geodir_wpseo_replacements($vars) {

 

 	// location variables

 	$gd_post_type   = geodir_get_current_posttype();

-	$location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type );

+	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);

 	/**

 	 * Filter the title variables location variables array

 	 *

@@ -4627,7 +4627,7 @@ 
 	 * @param array $location_array The array of location variables.

 	 * @param array $vars           The page title variables.

 	 */

-	$location_array  = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars );

+	$location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);

 

 

 	$location_replace_vars = geodir_location_replace_vars($location_array, NULL, '');

@@ -4642,13 +4642,13 @@ 
 	 * @param string $vars          The title with variables.

 	 * @param array $location_array The array of location variables.

 	 */

-	return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array );

+	return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);

 }

 

 

-add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 );

-add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 );

-add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 );

+add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);

+add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);

+add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);

 

 /**

  * Filter the title variables.

@@ -4690,14 +4690,14 @@ 
  *

  * @return string Title after filtered variables.

  */

-function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {

+function geodir_filter_title_variables($title, $gd_page, $sep = '') {

 	global $wp, $post;

 

-	if ( ! $gd_page || ! $title ) {

+	if (!$gd_page || !$title) {

 		return $title; // if no a GD page then bail.

 	}

 

-	if ( $sep == '' ) {

+	if ($sep == '') {

 		/**

 		 * Filter the page title separator.

 		 *

@@ -4706,100 +4706,100 @@ 
 		 *

 		 * @param string $sep The separator, default: `|`.

 		 */

-		$sep = apply_filters( 'geodir_page_title_separator', '|' );

+		$sep = apply_filters('geodir_page_title_separator', '|');

 	}

 

-	if ( strpos( $title, '%%title%%' ) !== false ) {

-		$title = str_replace( "%%title%%", $post->post_title, $title );

+	if (strpos($title, '%%title%%') !== false) {

+		$title = str_replace("%%title%%", $post->post_title, $title);

 	}

 

-	if ( strpos( $title, '%%sitename%%' ) !== false ) {

-		$title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title );

+	if (strpos($title, '%%sitename%%') !== false) {

+		$title = str_replace("%%sitename%%", get_bloginfo('name'), $title);

 	}

 

-	if ( strpos( $title, '%%sitedesc%%' ) !== false ) {

-		$title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title );

+	if (strpos($title, '%%sitedesc%%') !== false) {

+		$title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);

 	}

 

-	if ( strpos( $title, '%%excerpt%%' ) !== false ) {

-		$title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title );

+	if (strpos($title, '%%excerpt%%') !== false) {

+		$title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);

 	}

 

-	if ( $gd_page == 'search' || $gd_page == 'author' ) {

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

-	} else if ( $gd_page == 'add-listing' ) {

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

-		$post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type;

-	} else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+	if ($gd_page == 'search' || $gd_page == 'author') {

+		$post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : '';

+	} else if ($gd_page == 'add-listing') {

+		$post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : '';

+		$post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type;

+	} else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {

 		$post_type = $post->post_type;

 	} else {

-		$post_type = get_query_var( 'post_type' );

+		$post_type = get_query_var('post_type');

 	}

 

-	if ( strpos( $title, '%%pt_single%%' ) !== false ) {

+	if (strpos($title, '%%pt_single%%') !== false) {

 		$singular_name = '';

-		if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {

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

+		if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {

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

 		}

 

-		$title = str_replace( "%%pt_single%%", $singular_name, $title );

+		$title = str_replace("%%pt_single%%", $singular_name, $title);

 	}

 

-	if ( strpos( $title, '%%pt_plural%%' ) !== false ) {

+	if (strpos($title, '%%pt_plural%%') !== false) {

 		$plural_name = '';

-		if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {

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

+		if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {

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

 		}

 

-		$title = str_replace( "%%pt_plural%%", $plural_name, $title );

+		$title = str_replace("%%pt_plural%%", $plural_name, $title);

 	}

 

-	if ( strpos( $title, '%%category%%' ) !== false ) {

+	if (strpos($title, '%%category%%') !== false) {

 		$cat_name = '';

 

-		if ( $gd_page == 'detail' ) {

-			if ( $post->default_category ) {

-				$cat      = get_term( $post->default_category, $post->post_type . 'category' );

-				$cat_name = ( isset( $cat->name ) ) ? $cat->name : '';

+		if ($gd_page == 'detail') {

+			if ($post->default_category) {

+				$cat      = get_term($post->default_category, $post->post_type.'category');

+				$cat_name = (isset($cat->name)) ? $cat->name : '';

 			}

-		} else if ( $gd_page == 'listing' ) {

+		} else if ($gd_page == 'listing') {

 			$queried_object = get_queried_object();

-			if ( isset( $queried_object->name ) ) {

+			if (isset($queried_object->name)) {

 				$cat_name = $queried_object->name;

 			}

 		}

-		$title = str_replace( "%%category%%", $cat_name, $title );

+		$title = str_replace("%%category%%", $cat_name, $title);

 	}

 

-	if ( strpos( $title, '%%tag%%' ) !== false ) {

+	if (strpos($title, '%%tag%%') !== false) {

 		$cat_name = '';

 

-		if ( $gd_page == 'detail' ) {

-			if ( $post->default_category ) {

-				$cat      = get_term( $post->default_category, $post->post_type . 'category' );

-				$cat_name = ( isset( $cat->name ) ) ? $cat->name : '';

+		if ($gd_page == 'detail') {

+			if ($post->default_category) {

+				$cat      = get_term($post->default_category, $post->post_type.'category');

+				$cat_name = (isset($cat->name)) ? $cat->name : '';

 			}

-		} else if ( $gd_page == 'listing' ) {

+		} else if ($gd_page == 'listing') {

 			$queried_object = get_queried_object();

-			if ( isset( $queried_object->name ) ) {

+			if (isset($queried_object->name)) {

 				$cat_name = $queried_object->name;

 			}

 		}

-		$title = str_replace( "%%tag%%", $cat_name, $title );

+		$title = str_replace("%%tag%%", $cat_name, $title);

 	}

 

-	if ( strpos( $title, '%%id%%' ) !== false ) {

-		$ID    = ( isset( $post->ID ) ) ? $post->ID : '';

-		$title = str_replace( "%%id%%", $ID, $title );

+	if (strpos($title, '%%id%%') !== false) {

+		$ID    = (isset($post->ID)) ? $post->ID : '';

+		$title = str_replace("%%id%%", $ID, $title);

 	}

 

-	if ( strpos( $title, '%%sep%%' ) !== false ) {

-		$title = str_replace( "%%sep%%", $sep, $title );

+	if (strpos($title, '%%sep%%') !== false) {

+		$title = str_replace("%%sep%%", $sep, $title);

 	}

 

 	// location variables

 	$gd_post_type   = geodir_get_current_posttype();

-	$location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type );

+	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);

 	

 	/**

 	 * Filter the title variables location variables array

@@ -4812,20 +4812,20 @@ 
 	 * @param string $gd_page       The page being filtered.

 	 * @param string $sep           The separator, default: `|`.

 	 */

-	$location_array  = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep );

+	$location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);

 	

-	if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {

-		if ( get_query_var( 'gd_country_full' ) ) {

-			$location_array['gd_country'] = get_query_var( 'gd_country_full' );

+	if ($gd_page == 'location' && get_query_var('gd_country_full')) {

+		if (get_query_var('gd_country_full')) {

+			$location_array['gd_country'] = get_query_var('gd_country_full');

 		}

-		if ( get_query_var( 'gd_region_full' ) ) {

-			$location_array['gd_region'] = get_query_var( 'gd_region_full' );

+		if (get_query_var('gd_region_full')) {

+			$location_array['gd_region'] = get_query_var('gd_region_full');

 		}

-		if ( get_query_var( 'gd_city_full' ) ) {

-			$location_array['gd_city'] = get_query_var( 'gd_city_full' );

+		if (get_query_var('gd_city_full')) {

+			$location_array['gd_city'] = get_query_var('gd_city_full');

 		}

-		if ( get_query_var( 'gd_neighbourhood_full' ) ) {

-			$location_array['gd_neighbourhood'] = get_query_var( 'gd_neighbourhood_full' );

+		if (get_query_var('gd_neighbourhood_full')) {

+			$location_array['gd_neighbourhood'] = get_query_var('gd_neighbourhood_full');

 		}

 	}

 	

@@ -4840,58 +4840,58 @@ 
 	 * @param string $gd_page       The page being filtered.

 	 * @param string $sep           The separator, default: `|`.

 	 */

-	$title = apply_filters( 'geodir_replace_location_variables', $title, $location_array, $gd_page, $sep );

+	$title = apply_filters('geodir_replace_location_variables', $title, $location_array, $gd_page, $sep);

 	

-	if ( strpos( $title, '%%search_term%%' ) !== false ) {

+	if (strpos($title, '%%search_term%%') !== false) {

 		$search_term = '';

-		if ( isset( $_REQUEST['s'] ) ) {

-			$search_term = esc_attr( $_REQUEST['s'] );

-			$search_term = str_replace(array("%E2%80%99","’"),array("%27","'"),$search_term);

+		if (isset($_REQUEST['s'])) {

+			$search_term = esc_attr($_REQUEST['s']);

+			$search_term = str_replace(array("%E2%80%99", "’"), array("%27", "'"), $search_term);

 		}

-		$title = str_replace( "%%search_term%%", $search_term, $title );

+		$title = str_replace("%%search_term%%", $search_term, $title);

 	}

 

-	if ( strpos( $title, '%%search_near%%' ) !== false ) {

+	if (strpos($title, '%%search_near%%') !== false) {

 		$search_term = '';

-		if ( isset( $_REQUEST['snear'] ) ) {

-			$search_term = esc_attr( $_REQUEST['snear'] );

+		if (isset($_REQUEST['snear'])) {

+			$search_term = esc_attr($_REQUEST['snear']);

 		}

-		$title = str_replace( "%%search_near%%", $search_term, $title );

+		$title = str_replace("%%search_near%%", $search_term, $title);

 	}

 

-	if ( strpos( $title, '%%name%%' ) !== false ) {

-		if ( is_author() ) {

-			$curauth     = ( get_query_var( 'author_name' ) ) ? get_user_by( 'slug', get_query_var( 'author_name' ) ) : get_userdata( get_query_var( 'author' ) );

+	if (strpos($title, '%%name%%') !== false) {

+		if (is_author()) {

+			$curauth     = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

 			$author_name = $curauth->display_name;

 		} else {

 			$author_name = get_the_author();

 		}

-		if ( ! $author_name || $author_name === '' ) {

+		if (!$author_name || $author_name === '') {

 			$queried_object = get_queried_object();

 

-			if ( isset( $queried_object->data->user_nicename ) ) {

+			if (isset($queried_object->data->user_nicename)) {

 				$author_name = $queried_object->data->display_name;

 			}

 		}

-		$title = str_replace( "%%name%%", $author_name, $title );

+		$title = str_replace("%%name%%", $author_name, $title);

 	}

 

-	if ( strpos( $title, '%%page%%' ) !== false ) {

-		$page  = geodir_title_meta_page( $sep );

-		$title = str_replace( "%%page%%", $page, $title );

+	if (strpos($title, '%%page%%') !== false) {

+		$page  = geodir_title_meta_page($sep);

+		$title = str_replace("%%page%%", $page, $title);

 	}

-	if ( strpos( $title, '%%pagenumber%%' ) !== false ) {

+	if (strpos($title, '%%pagenumber%%') !== false) {

 		$pagenumber = geodir_title_meta_pagenumber();

-		$title      = str_replace( "%%pagenumber%%", $pagenumber, $title );

+		$title      = str_replace("%%pagenumber%%", $pagenumber, $title);

 	}

-	if ( strpos( $title, '%%pagetotal%%' ) !== false ) {

+	if (strpos($title, '%%pagetotal%%') !== false) {

 		$pagetotal = geodir_title_meta_pagetotal();

-		$title     = str_replace( "%%pagetotal%%", $pagetotal, $title );

+		$title     = str_replace("%%pagetotal%%", $pagetotal, $title);

 	}

 

-	$title = wptexturize( $title );

-	$title = convert_chars( $title );

-	$title = esc_html( $title );

+	$title = wptexturize($title);

+	$title = convert_chars($title);

+	$title = esc_html($title);

 

 	/**

 	 * Filter the title variables after standard ones have been filtered.

@@ -4905,7 +4905,7 @@ 
 	 * @param string $sep           The separator, default: `|`.

 	 */

 

-	return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep );

+	return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);

 }

 

 /**

@@ -4918,82 +4918,82 @@ 
  *

  * @return array Translation texts.

  */

-function geodir_load_cpt_text_translation( $translation_texts = array() ) {

-	$gd_post_types = geodir_get_posttypes( 'array' );

+function geodir_load_cpt_text_translation($translation_texts = array()) {

+	$gd_post_types = geodir_get_posttypes('array');

 

-	if ( ! empty( $gd_post_types ) ) {

-		foreach ( $gd_post_types as $post_type => $cpt_info ) {

-			$labels      = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : '';

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

-			$seo         = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : '';

+	if (!empty($gd_post_types)) {

+		foreach ($gd_post_types as $post_type => $cpt_info) {

+			$labels      = isset($cpt_info['labels']) ? $cpt_info['labels'] : '';

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

+			$seo         = isset($cpt_info['seo']) ? $cpt_info['seo'] : '';

 

-			if ( ! empty( $labels ) ) {

-				if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {

+			if (!empty($labels)) {

+				if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {

 					$translation_texts[] = $labels['name'];

 				}

-				if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {

+				if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {

 					$translation_texts[] = $labels['singular_name'];

 				}

-				if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {

+				if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {

 					$translation_texts[] = $labels['add_new'];

 				}

-				if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {

+				if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {

 					$translation_texts[] = $labels['add_new_item'];

 				}

-				if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {

+				if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {

 					$translation_texts[] = $labels['edit_item'];

 				}

-				if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {

+				if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {

 					$translation_texts[] = $labels['new_item'];

 				}

-				if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {

+				if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {

 					$translation_texts[] = $labels['view_item'];

 				}

-				if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {

+				if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {

 					$translation_texts[] = $labels['search_items'];

 				}

-				if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {

+				if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {

 					$translation_texts[] = $labels['not_found'];

 				}

-				if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {

+				if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {

 					$translation_texts[] = $labels['not_found_in_trash'];

 				}

-				if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {

+				if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_profile'];

 				}

-				if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {

+				if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_info'];

 				}

-				if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {

+				if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_images'];

 				}

-				if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {

+				if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_map'];

 				}

-				if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {

+				if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {

 					$translation_texts[] = $labels['label_reviews'];

 				}

-				if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {

+				if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {

 					$translation_texts[] = $labels['label_related_listing'];

 				}

 			}

 

-			if ( $description != '' && ! in_array( $description, $translation_texts ) ) {

-				$translation_texts[] = normalize_whitespace( $description );

+			if ($description != '' && !in_array($description, $translation_texts)) {

+				$translation_texts[] = normalize_whitespace($description);

 			}

 

-			if ( ! empty( $seo ) ) {

-				if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {

-					$translation_texts[] = normalize_whitespace( $seo['meta_keyword'] );

+			if (!empty($seo)) {

+				if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {

+					$translation_texts[] = normalize_whitespace($seo['meta_keyword']);

 				}

 

-				if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {

-					$translation_texts[] = normalize_whitespace( $seo['meta_description'] );

+				if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {

+					$translation_texts[] = normalize_whitespace($seo['meta_description']);

 				}

 			}

 		}

 	}

-	$translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts;

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

 	return $translation_texts;

 }

@@ -5008,27 +5008,27 @@ 
  *

  * @return array Location terms.

  */

-function geodir_remove_location_terms( $location_terms = array() ) {

-	$location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false;

+function geodir_remove_location_terms($location_terms = array()) {

+	$location_manager = defined('POST_LOCATION_TABLE') ? true : false;

 

-	if ( ! empty( $location_terms ) && $location_manager ) {

-		$hide_country_part = get_option( 'geodir_location_hide_country_part' );

-		$hide_region_part  = get_option( 'geodir_location_hide_region_part' );

+	if (!empty($location_terms) && $location_manager) {

+		$hide_country_part = get_option('geodir_location_hide_country_part');

+		$hide_region_part  = get_option('geodir_location_hide_region_part');

 

-		if ( $hide_region_part && $hide_country_part ) {

-			if ( isset( $location_terms['gd_country'] ) ) {

-				unset( $location_terms['gd_country'] );

+		if ($hide_region_part && $hide_country_part) {

+			if (isset($location_terms['gd_country'])) {

+				unset($location_terms['gd_country']);

 			}

-			if ( isset( $location_terms['gd_region'] ) ) {

-				unset( $location_terms['gd_region'] );

+			if (isset($location_terms['gd_region'])) {

+				unset($location_terms['gd_region']);

 			}

-		} else if ( $hide_region_part && ! $hide_country_part ) {

-			if ( isset( $location_terms['gd_region'] ) ) {

-				unset( $location_terms['gd_region'] );

+		} else if ($hide_region_part && !$hide_country_part) {

+			if (isset($location_terms['gd_region'])) {

+				unset($location_terms['gd_region']);

 			}

-		} else if ( ! $hide_region_part && $hide_country_part ) {

-			if ( isset( $location_terms['gd_country'] ) ) {

-				unset( $location_terms['gd_country'] );

+		} else if (!$hide_region_part && $hide_country_part) {

+			if (isset($location_terms['gd_country'])) {

+				unset($location_terms['gd_country']);

 			}

 		}

 	}

@@ -5039,7 +5039,7 @@ 
 	 * @since 1.6.22

 	 * @param array $location_terms The array of location terms.

 	 */

-	return apply_filters('geodir_remove_location_terms',$location_terms);

+	return apply_filters('geodir_remove_location_terms', $location_terms);

 }

 

 /**

@@ -5056,32 +5056,32 @@ 
  * @param WP_Post $post Post object.

  * @param bool $update  Whether this is an existing listing being updated or not.

  */

-function geodir_on_wp_insert_post( $post_ID, $post, $update ) {

+function geodir_on_wp_insert_post($post_ID, $post, $update) {

 	global $gd_set_listing_edited;

 	

-	if ( ! $update ) {

+	if (!$update) {

 		return;

 	}

 

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

-	$is_admin    = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false;

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

+	$is_admin    = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;

 	$inline_save = $action == 'inline-save' ? true : false;

 

-	if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {

+	if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {

 		return;

 	}

 

-	if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {

+	if ($action != '' && in_array($action, array('geodir_import_export'))) {

 		return;

 	}

 

 	$user_id = (int) get_current_user_id();

 

-	if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

-		$author_id = ! empty( $post->post_author ) ? $post->post_author : 0;

+	if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {

+		$author_id = !empty($post->post_author) ? $post->post_author : 0;

 

-		if ( $user_id == $author_id && ! is_super_admin() && empty( $gd_set_listing_edited[$post_ID] ) ) {

-			if ( !empty( $gd_set_listing_edited ) ) {

+		if ($user_id == $author_id && !is_super_admin() && empty($gd_set_listing_edited[$post_ID])) {

+			if (!empty($gd_set_listing_edited)) {

 				$gd_set_listing_edited = array();

 			}

 			$gd_set_listing_edited[$post_ID] = true;

@@ -5099,14 +5099,14 @@ 
  *

  * @return string|null The current page start & end numbering.

  */

-function geodir_title_meta_page( $sep ) {

+function geodir_title_meta_page($sep) {

 	$replacement = null;

 

-	$max = geodir_title_meta_pagenumbering( 'max' );

-	$nr  = geodir_title_meta_pagenumbering( 'nr' );

+	$max = geodir_title_meta_pagenumbering('max');

+	$nr  = geodir_title_meta_pagenumbering('nr');

 

-	if ( $max > 1 && $nr > 1 ) {

-		$replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max );

+	if ($max > 1 && $nr > 1) {

+		$replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);

 	}

 

 	return $replacement;

@@ -5123,8 +5123,8 @@ 
 function geodir_title_meta_pagenumber() {

 	$replacement = null;

 

-	$nr = geodir_title_meta_pagenumbering( 'nr' );

-	if ( isset( $nr ) && $nr > 0 ) {

+	$nr = geodir_title_meta_pagenumbering('nr');

+	if (isset($nr) && $nr > 0) {

 		$replacement = (string) $nr;

 	}

 

@@ -5142,8 +5142,8 @@ 
 function geodir_title_meta_pagetotal() {

 	$replacement = null;

 

-	$max = geodir_title_meta_pagenumbering( 'max' );

-	if ( isset( $max ) && $max > 0 ) {

+	$max = geodir_title_meta_pagenumbering('max');

+	if (isset($max) && $max > 0) {

 		$replacement = (string) $max;

 	}

 

@@ -5163,36 +5163,36 @@ 
  *

  * @return int|null The current page numbering.

  */

-function geodir_title_meta_pagenumbering( $request = 'nr' ) {

+function geodir_title_meta_pagenumbering($request = 'nr') {

 	global $wp_query, $post;

 	$max_num_pages = null;

 	$page_number   = null;

 

 	$max_num_pages = 1;

 

-	if ( ! is_singular() ) {

-		$page_number = get_query_var( 'paged' );

-		if ( $page_number === 0 || $page_number === '' ) {

+	if (!is_singular()) {

+		$page_number = get_query_var('paged');

+		if ($page_number === 0 || $page_number === '') {

 			$page_number = 1;

 		}

 

-		if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {

+		if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {

 			$max_num_pages = $wp_query->max_num_pages;

 		}

 	} else {

-		$page_number = get_query_var( 'page' );

-		if ( $page_number === 0 || $page_number === '' ) {

+		$page_number = get_query_var('page');

+		if ($page_number === 0 || $page_number === '') {

 			$page_number = 1;

 		}

 

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

-			$max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 );

+		if (isset($post->post_content)) {

+			$max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1);

 		}

 	}

 

 	$return = null;

 

-	switch ( $request ) {

+	switch ($request) {

 		case 'nr':

 			$return = $page_number;

 			break;

@@ -5213,14 +5213,14 @@ 
  *

  * @return array Terms.

  */

-function geodir_filter_empty_terms( $terms ) {

-	if ( empty( $terms ) ) {

+function geodir_filter_empty_terms($terms) {

+	if (empty($terms)) {

 		return $terms;

 	}

 

 	$return = array();

-	foreach ( $terms as $term ) {

-		if ( isset( $term->count ) && $term->count > 0 ) {

+	foreach ($terms as $term) {

+		if (isset($term->count) && $term->count > 0) {

 			$return[] = $term;

 		} else {

 			/**

@@ -5231,7 +5231,7 @@ 
 			 * @param array $return The array of terms to return.

 			 * @param object $term  The term object.

 			 */

-			$return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term );

+			$return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);

 		}

 	}

 

@@ -5248,15 +5248,15 @@ 
  *

  * @return array

  */

-function geodir_remove_hentry( $class ) {

-	if ( geodir_is_page( 'detail' ) ) {

-		$class = array_diff( $class, array( 'hentry' ) );

+function geodir_remove_hentry($class) {

+	if (geodir_is_page('detail')) {

+		$class = array_diff($class, array('hentry'));

 	}

 

 	return $class;

 }

 

-add_filter( 'post_class', 'geodir_remove_hentry' );

+add_filter('post_class', 'geodir_remove_hentry');

 

 /**

  * Registers a individual text string for WPML translation.

@@ -5268,8 +5268,8 @@ 
  * @param string $domain The plugin domain. Default geodirectory.

  * @param string $name The name of the string which helps to know what's being translated.

  */

-function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {

-    do_action( 'wpml_register_single_string', $domain, $name, $string );

+function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {

+    do_action('wpml_register_single_string', $domain, $name, $string);

 }

 

 /**

@@ -5284,8 +5284,8 @@ 
  * @param string $language_code Return the translation in this language. Default is NULL which returns the current language.

  * @return string The translated string.

  */

-function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {

-    return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code );

+function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {

+    return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);

 }

 

 /**

@@ -5300,19 +5300,19 @@ 
  * @param int $post_ID  Post ID.

  * @param array $data Post data.

  */

-function geodir_send_listing_edited_notification( $post_ID, $data ) {

+function geodir_send_listing_edited_notification($post_ID, $data) {

     global $gd_notified_edited, $gd_set_listing_edited;

     

-    if ( !empty( $gd_set_listing_edited[ $post_ID ] ) && empty( $gd_notified_edited[ $post_ID ] ) ) {

-        if ( !empty( $gd_notified_edited ) ) {

+    if (!empty($gd_set_listing_edited[$post_ID]) && empty($gd_notified_edited[$post_ID])) {

+        if (!empty($gd_notified_edited)) {

             $gd_notified_edited = array();

         }

-        $gd_notified_edited[ $post_ID ] = true;

+        $gd_notified_edited[$post_ID] = true;

         

-        $from_email   = get_option( 'site_email' );

+        $from_email   = get_option('site_email');

         $from_name    = get_site_emailName();

-        $to_email     = get_option( 'admin_email' );

-        $to_name      = get_option( 'name' );

+        $to_email     = get_option('admin_email');

+        $to_name      = get_option('name');

         $message_type = 'listing_edited';

 

         $notify_edited = true;

@@ -5324,11 +5324,11 @@ 
          * @param bool $notify_edited Notify on listing edited by author?

          * @param object $post        The current post object.

          */

-        $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post_ID );

+        $notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post_ID);

 

-        if ( $notify_edited ) {

-            geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID );

+        if ($notify_edited) {

+            geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);

         }

     }

 }

-add_action( 'geodir_after_save_listing', 'geodir_send_listing_edited_notification', 1000, 2 );
\ No newline at end of file
+add_action('geodir_after_save_listing', 'geodir_send_listing_edited_notification', 1000, 2);
\ No newline at end of file

geodirectory-functions/taxonomy_functions.php

Indentation +1272 added lines, -1272 removed lines

@@ -33,265 +33,265 @@ 
  */

 function geodir_add_nav_menu_items()

 {

-    $items = '';

-    // apply filter to add more navigations // -Filter-Location-Manager

-

-    if (get_option('geodir_show_listing_nav')) {

-

-        $menu_class = '';

-        if (geodir_is_page('listing'))

-            $menu_class = 'current-menu-item';

-

-

-        //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

-        $post_types = geodir_get_posttypes('object');

-        $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');

-        if (!empty($post_types)) {

-            foreach ($post_types as $post_type => $args) {

-                if (!empty($show_post_type_main_nav)) {

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

-                        if (get_post_type_archive_link($post_type)) {

-                            $menu_class = '';

-                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                $menu_class = 'current-menu-item';

-                            /**

-                             * Filter the menu li class.

-                             *

-                             * @since 1.0.0

-                             * @param string $menu_class The menu HTML class.

-                             */

-                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                            /**

-                             * Filter the menu a class.

-                             *

-                             * @since 1.0.0

-                             */

-                            $a_class = apply_filters('geodir_menu_a_class', '');

-                            $items .= '<li class="' . $li_class . '">

+	$items = '';

+	// apply filter to add more navigations // -Filter-Location-Manager

+

+	if (get_option('geodir_show_listing_nav')) {

+

+		$menu_class = '';

+		if (geodir_is_page('listing'))

+			$menu_class = 'current-menu-item';

+

+

+		//SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

+		$post_types = geodir_get_posttypes('object');

+		$show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');

+		if (!empty($post_types)) {

+			foreach ($post_types as $post_type => $args) {

+				if (!empty($show_post_type_main_nav)) {

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

+						if (get_post_type_archive_link($post_type)) {

+							$menu_class = '';

+							if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

+								$menu_class = 'current-menu-item';

+							/**

+							 * Filter the menu li class.

+							 *

+							 * @since 1.0.0

+							 * @param string $menu_class The menu HTML class.

+							 */

+							$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+							/**

+							 * Filter the menu a class.

+							 *

+							 * @since 1.0.0

+							 */

+							$a_class = apply_filters('geodir_menu_a_class', '');

+							$items .= '<li class="' . $li_class . '">

 									<a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '">

 										' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '

 									</a>

 								</li>';

-                        }

-                    }

-                }

-            }

-        }

-        //END LISTING OF POST TYPE IN MAIN NAVIGATION

-

-        $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');

-        $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;

-        if ($is_listing_sub_meny_exists) {

-            /**

-             * Filter the menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

-            /**

-             * Filter the sub menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

-            /**

-             * Filter the sub menu ul class.

-             *

-             * @since 1.0.0

-             */

-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

-            /**

-             * Filter the menu a class.

-             *

-             * @since 1.0.0

-             */

-            $a_class = apply_filters('geodir_menu_a_class', '');

-            /**

-             * Filter the sub menu a class.

-             *

-             * @since 1.0.0

-             */

-            $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

-            $items .= '<li class="' . $li_class . '">

+						}

+					}

+				}

+			}

+		}

+		//END LISTING OF POST TYPE IN MAIN NAVIGATION

+

+		$view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');

+		$is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;

+		if ($is_listing_sub_meny_exists) {

+			/**

+			 * Filter the menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

+			/**

+			 * Filter the sub menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+			/**

+			 * Filter the sub menu ul class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

+			/**

+			 * Filter the menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$a_class = apply_filters('geodir_menu_a_class', '');

+			/**

+			 * Filter the sub menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

+			$items .= '<li class="' . $li_class . '">

 					<a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>

 					<ul class="' . $sub_ul_class . '">';

-            $post_types = geodir_get_posttypes('object');

+			$post_types = geodir_get_posttypes('object');

 

-            $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

+			$show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

 

-            if (!empty($post_types)) {

-                global $geodir_add_location_url;

-                $geodir_add_location_url = true;

-                foreach ($post_types as $post_type => $args) {

-                    if (!empty($show_listing_post_types)) {

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

-                            if (get_post_type_archive_link($post_type)) {

+			if (!empty($post_types)) {

+				global $geodir_add_location_url;

+				$geodir_add_location_url = true;

+				foreach ($post_types as $post_type => $args) {

+					if (!empty($show_listing_post_types)) {

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

+							if (get_post_type_archive_link($post_type)) {

 

-                                $menu_class = '';

-                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                    $menu_class = 'current-menu-item';

+								$menu_class = '';

+								if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

+									$menu_class = 'current-menu-item';

 

-                                $items .= '<li class="' . $sub_li_class . '">

+								$items .= '<li class="' . $sub_li_class . '">

 														<a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '">

 															' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '

 														</a>

 													</li>';

-                            }

-                        }

-                    }

-                }

-                $geodir_add_location_url = NULL;

-            }

+							}

+						}

+					}

+				}

+				$geodir_add_location_url = NULL;

+			}

 

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

-            /**

-             * Filter called after the sub menu closing ul tag for dynamic added menu items.

-             *

-             * @since 1.5.9

-             */

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

-            $items .= '</li>';

-        }

-    }

-

-    if (get_option('geodir_show_addlisting_nav')) {

-

-        $menu_class = '';

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

-            $menu_class = 'current-menu-item';

-

-        //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

-        $post_types = geodir_get_posttypes('object');

-        $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');

-        $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

-

-        if (!empty($post_types)) {

-            foreach ($post_types as $post_type => $args) {

-                if (!empty($geodir_allow_posttype_frontend)) {

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

-                        if (!empty($show_add_listing_post_types_main_nav)) {

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

-                                if (geodir_get_addlisting_link($post_type)) {

-

-                                    $menu_class = '';

-                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                        $menu_class = 'current-menu-item';

-                                    /**

-                                     * Filter the menu li class.

-                                     *

-                                     * @since 1.0.0

-                                     * @param string $menu_class The menu HTML class.

-                                     */

-                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                                    /**

-                                     * Filter the menu a class.

-                                     *

-                                     * @since 1.0.0

-                                     */

-                                    $a_class = apply_filters('geodir_menu_a_class', '');

-                                    $cpt_name = __($args->labels->singular_name, 'geodirectory');

-                                    $items .= '<li class="' . $li_class . '">

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

+			/**

+			 * Filter called after the sub menu closing ul tag for dynamic added menu items.

+			 *

+			 * @since 1.5.9

+			 */

+			$items .= apply_filters('geodir_menu_after_sub_ul','');

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

+		}

+	}

+

+	if (get_option('geodir_show_addlisting_nav')) {

+

+		$menu_class = '';

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

+			$menu_class = 'current-menu-item';

+

+		//SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

+		$post_types = geodir_get_posttypes('object');

+		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');

+		$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

+

+		if (!empty($post_types)) {

+			foreach ($post_types as $post_type => $args) {

+				if (!empty($geodir_allow_posttype_frontend)) {

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

+						if (!empty($show_add_listing_post_types_main_nav)) {

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

+								if (geodir_get_addlisting_link($post_type)) {

+

+									$menu_class = '';

+									if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

+										$menu_class = 'current-menu-item';

+									/**

+									 * Filter the menu li class.

+									 *

+									 * @since 1.0.0

+									 * @param string $menu_class The menu HTML class.

+									 */

+									$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+									/**

+									 * Filter the menu a class.

+									 *

+									 * @since 1.0.0

+									 */

+									$a_class = apply_filters('geodir_menu_a_class', '');

+									$cpt_name = __($args->labels->singular_name, 'geodirectory');

+									$items .= '<li class="' . $li_class . '">

 											<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '">

 												' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

 											</a>

 										</li>';

-                                }

-                            }

-                        }

-                    }

-                }

-            }

-        }

-        //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

-    }

-

-    $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');

-    $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;

-    if ($is_add_listing_sub_meny_exists) {

-

-        if (get_option('geodir_show_addlisting_nav')) {

-            /**

-             * Filter the menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

-            /**

-             * Filter the sub menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

-            /**

-             * Filter the sub menu ul class.

-             *

-             * @since 1.0.0

-             */

-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

-            /**

-             * Filter the menu a class.

-             *

-             * @since 1.0.0

-             */

-            $a_class = apply_filters('geodir_menu_a_class', '');

-            /**

-             * Filter the sub menu a class.

-             *

-             * @since 1.0.0

-             */

-            $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

-            $items .= '<li  class="' . $li_class . '">

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		//END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

+	}

+

+	$view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');

+	$is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;

+	if ($is_add_listing_sub_meny_exists) {

+

+		if (get_option('geodir_show_addlisting_nav')) {

+			/**

+			 * Filter the menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

+			/**

+			 * Filter the sub menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+			/**

+			 * Filter the sub menu ul class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

+			/**

+			 * Filter the menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$a_class = apply_filters('geodir_menu_a_class', '');

+			/**

+			 * Filter the sub menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

+			$items .= '<li  class="' . $li_class . '">

 					<a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>

 					<ul class="' . $sub_ul_class . '">';

 

-            $post_types = geodir_get_posttypes('object');

-

-            $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');

-

-            if (!empty($post_types)) {

-                foreach ($post_types as $post_type => $args) {

-                    if (!empty($geodir_allow_posttype_frontend)) {

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

-                            if (!empty($show_add_listing_post_types)) {

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

-                                    if (geodir_get_addlisting_link($post_type)) {

-

-                                        $menu_class = '';

-                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                            $menu_class = 'current-menu-item';

-                                        /**

-                                         * Filter the menu li class.

-                                         *

-                                         * @since 1.0.0

-                                         * @param string $menu_class The menu HTML class.

-                                         */

-                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                                        $cpt_name = __($args->labels->singular_name, 'geodirectory');

-                                        $items .= '<li class="' . $sub_li_class . '">

+			$post_types = geodir_get_posttypes('object');

+

+			$show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');

+

+			if (!empty($post_types)) {

+				foreach ($post_types as $post_type => $args) {

+					if (!empty($geodir_allow_posttype_frontend)) {

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

+							if (!empty($show_add_listing_post_types)) {

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

+									if (geodir_get_addlisting_link($post_type)) {

+

+										$menu_class = '';

+										if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

+											$menu_class = 'current-menu-item';

+										/**

+										 * Filter the menu li class.

+										 *

+										 * @since 1.0.0

+										 * @param string $menu_class The menu HTML class.

+										 */

+										$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+										$cpt_name = __($args->labels->singular_name, 'geodirectory');

+										$items .= '<li class="' . $sub_li_class . '">

 														<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '">

 															' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

 														</a>

 													</li>';

-                                    }

-                                }

-                            }

-                        }

-                    }

-                }

-            }

+									}

+								}

+							}

+						}

+					}

+				}

+			}

 

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

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

-            $items .= '</li>';

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

+			$items .= apply_filters('geodir_menu_after_sub_ul','');

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

 

-        }

-    }

-    // apply filter to add more navigations // -Filter-Location-Manager

-    return $items;

+		}

+	}

+	// apply filter to add more navigations // -Filter-Location-Manager

+	return $items;

 }

 

 

@@ -309,20 +309,20 @@ 
  */

 function geodir_pagemenu_items($menu, $args)

 {

-    $locations = get_nav_menu_locations();

-    $geodir_theme_location = get_option('geodir_theme_location_nav');

-    $geodir_theme_location_nav = array();

-    if (empty($locations) && empty($geodir_theme_location)) {

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

-        $geodir_theme_location_nav[] = $args['theme_location'];

-        update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

-    }

-    //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.

+	$locations = get_nav_menu_locations();

+	$geodir_theme_location = get_option('geodir_theme_location_nav');

+	$geodir_theme_location_nav = array();

+	if (empty($locations) && empty($geodir_theme_location)) {

+		$menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+		$geodir_theme_location_nav[] = $args['theme_location'];

+		update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

+	}

+	//else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.

 //		$menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);

-    else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+	else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))

+		$menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

 

-    return $menu;

+	return $menu;

 

 }

 

@@ -342,18 +342,18 @@ 
 function geodir_menu_items($items, $args)

 {

 

-    $location = $args->theme_location;

+	$location = $args->theme_location;

 

-    $geodir_theme_location = get_option('geodir_theme_location_nav');

+	$geodir_theme_location = get_option('geodir_theme_location_nav');

 

-    if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

+	if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

 

-        $items = $items . geodir_add_nav_menu_items();

-        return $items;

+		$items = $items . geodir_add_nav_menu_items();

+		return $items;

 

-    } else {

-        return $items;

-    }

+	} else {

+		return $items;

+	}

 }

 

 /**

@@ -368,25 +368,25 @@ 
  */

 function geodir_get_category_all_array()

 {

-    global $wpdb;

-    $return_array = array();

-

-    $taxonomies = geodir_get_taxonomies();

-    $taxonomies = implode("','", $taxonomies);

-    $taxonomies = "'" . $taxonomies . "'";

-

-    $pn_categories = $wpdb->get_results(

-        $wpdb->prepare(

-            "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

-            array($wpdb->terms . term_id)

-        )

-    );

-

-    foreach ($pn_categories as $pn_categories_obj) {

-        $return_array[] = array("id" => $pn_categories_obj->cat_ID,

-            "title" => $pn_categories_obj->name,);

-    }

-    return $return_array;

+	global $wpdb;

+	$return_array = array();

+

+	$taxonomies = geodir_get_taxonomies();

+	$taxonomies = implode("','", $taxonomies);

+	$taxonomies = "'" . $taxonomies . "'";

+

+	$pn_categories = $wpdb->get_results(

+		$wpdb->prepare(

+			"SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

+			array($wpdb->terms . term_id)

+		)

+	);

+

+	foreach ($pn_categories as $pn_categories_obj) {

+		$return_array[] = array("id" => $pn_categories_obj->cat_ID,

+			"title" => $pn_categories_obj->name,);

+	}

+	return $return_array;

 }

 

 

@@ -402,49 +402,49 @@ 
  * @return string The post type.

  */

 function geodir_get_current_posttype() {

-    global $wp_query, $post, $geodir_post_type;

+	global $wp_query, $post, $geodir_post_type;

 

-    $geodir_post_type = get_query_var('post_type');

+	$geodir_post_type = get_query_var('post_type');

 

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

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

-            $geodir_post_type = get_post_type((int)$_REQUEST['pid']);

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

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

-    }

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

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

+			$geodir_post_type = get_post_type((int)$_REQUEST['pid']);

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

+			$geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);

+	}

 

-    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))

-        $geodir_post_type = sanitize_text_field($_REQUEST['stype']);

+	if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))

+		$geodir_post_type = sanitize_text_field($_REQUEST['stype']);

 

-    if (is_tax())

-        $geodir_post_type = geodir_get_taxonomy_posttype();

+	if (is_tax())

+		$geodir_post_type = geodir_get_taxonomy_posttype();

 

-    // Retrive post type for map marker html ajax request on preview page.

-    if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {

-        if (!empty($post->post_type)) {

-            $geodir_post_type = $post->post_type;

-        } else if (!empty($post->listing_type)) {

-            $geodir_post_type = $post->listing_type;

-        }

-    }

+	// Retrive post type for map marker html ajax request on preview page.

+	if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {

+		if (!empty($post->post_type)) {

+			$geodir_post_type = $post->post_type;

+		} else if (!empty($post->listing_type)) {

+			$geodir_post_type = $post->listing_type;

+		}

+	}

 

-    $all_postypes = geodir_get_posttypes();

-    $all_postypes = stripslashes_deep($all_postypes);

+	$all_postypes = geodir_get_posttypes();

+	$all_postypes = stripslashes_deep($all_postypes);

 

-    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

-        $geodir_post_type = '';

+	if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

+		$geodir_post_type = '';

 

-    if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

-        $geodir_post_type = sanitize_text_field($_REQUEST['stype']);

-    }

+	if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

+		$geodir_post_type = sanitize_text_field($_REQUEST['stype']);

+	}

 

 

-    /**

-     * Filter the default CPT return.

-     *

-     * @since 1.6.9

-     */

-    return apply_filters('geodir_get_current_posttype',$geodir_post_type);

+	/**

+	 * Filter the default CPT return.

+	 *

+	 * @since 1.6.9

+	 */

+	return apply_filters('geodir_get_current_posttype',$geodir_post_type);

 }

 

 /**

@@ -458,22 +458,22 @@ 
  */

 function geodir_get_default_posttype()

 {

-    $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

-

-    $stype = false;

-    foreach ( $post_types as $post_type => $info ) {

-        global $wpdb;

-        $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-        if ( $has_posts ) {

-            $stype = $post_type; break;

-        }

-    }

-

-    if(!$stype){

-        $stype = 'gd_place';

-    }

-

-    return $stype;

+	$post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

+

+	$stype = false;

+	foreach ( $post_types as $post_type => $info ) {

+		global $wpdb;

+		$has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

+		if ( $has_posts ) {

+			$stype = $post_type; break;

+		}

+	}

+

+	if(!$stype){

+		$stype = 'gd_place';

+	}

+

+	return $stype;

 }

 

 /**

@@ -487,21 +487,21 @@ 
  */

 function geodir_get_posttypes($output = 'names')

 {

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

-    $post_types = stripslashes_deep($post_types);

-    if (!empty($post_types)) {

-        switch ($output):

-            case 'object':

-            case 'Object':

-                $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types;

-                break;

-            case 'array':

-            case 'Array':

-                $post_types = (array)$post_types;

-                break;

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

+	$post_types = stripslashes_deep($post_types);

+	if (!empty($post_types)) {

+		switch ($output):

+			case 'object':

+			case 'Object':

+				$post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types;

+				break;

+			case 'array':

+			case 'Array':

+				$post_types = (array)$post_types;

+				break;

 			case 'options':

-                $post_types = (array)$post_types;

+				$post_types = (array)$post_types;

 				

 				$options = array();

 				if (!empty($post_types)) {

@@ -510,17 +510,17 @@ 
 					}

 				}

 				$post_types = $options;

-                break;

-            default:

-                $post_types = array_keys($post_types);

-                break;

-        endswitch;

-    }

-

-    if (!empty($post_types))

-        return $post_types;

-    else

-        return array();

+				break;

+			default:

+				$post_types = array_keys($post_types);

+				break;

+		endswitch;

+	}

+

+	if (!empty($post_types))

+		return $post_types;

+	else

+		return array();

 }

 

 /**

@@ -533,104 +533,104 @@ 
  */

 function geodir_get_posttype_info($post_type = '')

 {

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

-    $post_types = stripslashes_deep($post_types);

-    if (!empty($post_types) && $post_type != '') {

-        return $post_types[$post_type];

-    } else

-        return false;

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

+	$post_types = stripslashes_deep($post_types);

+	if (!empty($post_types) && $post_type != '') {

+		return $post_types[$post_type];

+	} else

+		return false;

 }

 

 if (!function_exists('geodir_get_taxonomies')) {

-    /**

-     * Get all custom taxonomies.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $post_type The post type.

-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

-     * @return array|bool Taxonomies on success. false on failure.

-     */

-    function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) {

-        $taxonomies = array();

-        $gd_taxonomies = array();

-

-        if ($taxonomies = get_option('geodir_taxonomies')) {

-            $gd_taxonomies = array_keys($taxonomies);

-

-            if ($post_type != '') {

-                $gd_taxonomies = array();

-            }

+	/**

+	 * Get all custom taxonomies.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $post_type The post type.

+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

+	 * @return array|bool Taxonomies on success. false on failure.

+	 */

+	function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) {

+		$taxonomies = array();

+		$gd_taxonomies = array();

+

+		if ($taxonomies = get_option('geodir_taxonomies')) {

+			$gd_taxonomies = array_keys($taxonomies);

+

+			if ($post_type != '') {

+				$gd_taxonomies = array();

+			}

 

-            $i = 0;

-            foreach ($taxonomies as $taxonomy => $args) {

-                if ($post_type != '' && $args['object_type'] == $post_type) {

-                    $gd_taxonomies[] = $taxonomy;

-                }

+			$i = 0;

+			foreach ($taxonomies as $taxonomy => $args) {

+				if ($post_type != '' && $args['object_type'] == $post_type) {

+					$gd_taxonomies[] = $taxonomy;

+				}

 

-                if ($tages_taxonomies === false && substr($taxonomy , -5) == '_tags') {

-                    if (array_search($taxonomy, $gd_taxonomies) !== false) {

-                        unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);

-                    }

-                }

-            }

+				if ($tages_taxonomies === false && substr($taxonomy , -5) == '_tags') {

+					if (array_search($taxonomy, $gd_taxonomies) !== false) {

+						unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);

+					}

+				}

+			}

 

-            $gd_taxonomies = array_values($gd_taxonomies);

-        }

-

-        /**

-         * Filter the taxonomies.

-         *

-         * @since 1.0.0

-         * @param array $gd_taxonomies The taxonomy array.

-         */

-        $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);

-

-        if (!empty($taxonomies)) {

-            return $taxonomies;

-        } else {

-            return false;

-        }

-    }

+			$gd_taxonomies = array_values($gd_taxonomies);

+		}

+

+		/**

+		 * Filter the taxonomies.

+		 *

+		 * @since 1.0.0

+		 * @param array $gd_taxonomies The taxonomy array.

+		 */

+		$taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);

+

+		if (!empty($taxonomies)) {

+			return $taxonomies;

+		} else {

+			return false;

+		}

+	}

 }

 

 if (!function_exists(' geodir_get_categories_dl')) {

-    /**

-     * Get categories dropdown HTML.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $post_type The post type.

-     * @param string $selected The selected value.

-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

-     * @param bool $echo Prints the HTML when set to true. Default: true.

-     * @return void|string Dropdown HTML.

-     */

-    function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)

-    {

-

-        $html = '';

-        $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);

-

-        $categories = get_terms($taxonomies);

-

-        $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

-

-        foreach ($categories as $category_obj) {

-            $select_opt = '';

-            if ($selected == $category_obj->term_id) {

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

-            }

-            $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

-                . geodir_utf8_ucfirst($category_obj->name) . '</option>';

-        }

-

-        if ($echo)

-            echo $html;

-        else

-            return $html;

-    }

+	/**

+	 * Get categories dropdown HTML.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $post_type The post type.

+	 * @param string $selected The selected value.

+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

+	 * @param bool $echo Prints the HTML when set to true. Default: true.

+	 * @return void|string Dropdown HTML.

+	 */

+	function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)

+	{

+

+		$html = '';

+		$taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);

+

+		$categories = get_terms($taxonomies);

+

+		$html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

+

+		foreach ($categories as $category_obj) {

+			$select_opt = '';

+			if ($selected == $category_obj->term_id) {

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

+			}

+			$html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

+				. geodir_utf8_ucfirst($category_obj->name) . '</option>';

+		}

+

+		if ($echo)

+			echo $html;

+		else

+			return $html;

+	}

 }

 

 

@@ -645,28 +645,28 @@ 
 function geodir_get_listing_slug($object_type = '')

 {

 

-    $listing_slug = '';

+	$listing_slug = '';

 

-    $post_types = get_option('geodir_post_types');

-    $taxonomies = get_option('geodir_taxonomies');

+	$post_types = get_option('geodir_post_types');

+	$taxonomies = get_option('geodir_taxonomies');

 

 

-    if ($object_type != '') {

-        if (!empty($post_types) && array_key_exists($object_type, $post_types)) {

+	if ($object_type != '') {

+		if (!empty($post_types) && array_key_exists($object_type, $post_types)) {

 

-            $object_info = $post_types[$object_type];

-            $listing_slug = $object_info['listing_slug'];

-        } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {

-            $object_info = $taxonomies[$object_type];

-            $listing_slug = $object_info['listing_slug'];

-        }

+			$object_info = $post_types[$object_type];

+			$listing_slug = $object_info['listing_slug'];

+		} elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {

+			$object_info = $taxonomies[$object_type];

+			$listing_slug = $object_info['listing_slug'];

+		}

 

-    }

+	}

 

-    if (!empty($listing_slug))

-        return $listing_slug;

-    else

-        return false;

+	if (!empty($listing_slug))

+		return $listing_slug;

+	else

+		return false;

 }

 

 

@@ -681,212 +681,212 @@ 
  */

 function geodir_get_taxonomy_posttype($taxonomy = '')

 {

-    global $wp_query;

-

-    $post_type = array();

-    $taxonomies = array();

-

-    if (!empty($taxonomy)) {

-        $taxonomies[] = $taxonomy;

-    } elseif (isset($wp_query->tax_query->queries)) {

-        $tax_arr = $wp_query->tax_query->queries;

-        //if tax query has 'relation' set then it will break wp_list_pluck so we remove it

-        if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}

-        $taxonomies = wp_list_pluck($tax_arr, 'taxonomy');

-    }

-

-    if (!empty($taxonomies)) {

-        foreach (geodir_get_posttypes() as $pt) {

-            $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);

-            if (array_intersect($taxonomies, $object_taxonomies))

-                $post_type[] = $pt;

-        }

-    }

-

-    if (!empty($post_type))

-        return $post_type[0];

-    else

-        return false;

+	global $wp_query;

+

+	$post_type = array();

+	$taxonomies = array();

+

+	if (!empty($taxonomy)) {

+		$taxonomies[] = $taxonomy;

+	} elseif (isset($wp_query->tax_query->queries)) {

+		$tax_arr = $wp_query->tax_query->queries;

+		//if tax query has 'relation' set then it will break wp_list_pluck so we remove it

+		if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}

+		$taxonomies = wp_list_pluck($tax_arr, 'taxonomy');

+	}

+

+	if (!empty($taxonomies)) {

+		foreach (geodir_get_posttypes() as $pt) {

+			$object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);

+			if (array_intersect($taxonomies, $object_taxonomies))

+				$post_type[] = $pt;

+		}

+	}

+

+	if (!empty($post_type))

+		return $post_type[0];

+	else

+		return false;

 }

 

 if (!function_exists('geodir_custom_taxonomy_walker')) {

-    /**

-     * Custom taxonomy walker function.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $cat_taxonomy The taxonomy name.

-     * @param int $cat_parent The parent term ID.

-     * @param bool $hide_empty Hide empty taxonomies? Default: false.

-     * @param int $pading CSS padding in pixels.

-     * @return string|void taxonomy HTML.

-     */

-    function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)

-    {

-        global $cat_display, $post_cat, $exclude_cats;

-

-        $search_terms = trim($post_cat, ",");

-

-        $search_terms = explode(",", $search_terms);

-

-        $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));

-

-        $display = '';

-        $onchange = '';

-        $term_check = '';

-        $main_list_class = '';

-        $out = '';

-        //If there are terms, start displaying

-        if (count($cat_terms) > 0) {

-            //Displaying as a list

-            $p = $pading * 20;

-            $pading++;

-

-

-            if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

-                if ($cat_parent == 0) {

-                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

-                    $main_list_class = 'class="main_list_selecter"';

-                } else {

-                    //$display = 'display:none';

-                    $list_class = 'sub_list gd-sub-cats-list';

-                }

-            }

+	/**

+	 * Custom taxonomy walker function.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $cat_taxonomy The taxonomy name.

+	 * @param int $cat_parent The parent term ID.

+	 * @param bool $hide_empty Hide empty taxonomies? Default: false.

+	 * @param int $pading CSS padding in pixels.

+	 * @return string|void taxonomy HTML.

+	 */

+	function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)

+	{

+		global $cat_display, $post_cat, $exclude_cats;

+

+		$search_terms = trim($post_cat, ",");

+

+		$search_terms = explode(",", $search_terms);

+

+		$cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));

+

+		$display = '';

+		$onchange = '';

+		$term_check = '';

+		$main_list_class = '';

+		$out = '';

+		//If there are terms, start displaying

+		if (count($cat_terms) > 0) {

+			//Displaying as a list

+			$p = $pading * 20;

+			$pading++;

+

+

+			if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

+				if ($cat_parent == 0) {

+					$list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

+					$main_list_class = 'class="main_list_selecter"';

+				} else {

+					//$display = 'display:none';

+					$list_class = 'sub_list gd-sub-cats-list';

+				}

+			}

 

-            if ($cat_display == 'checkbox' || $cat_display == 'radio') {

-                $p = 0;

-                $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

-            }

+			if ($cat_display == 'checkbox' || $cat_display == 'radio') {

+				$p = 0;

+				$out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+			}

 

-            foreach ($cat_terms as $cat_term) {

+			foreach ($cat_terms as $cat_term) {

 

-                $checked = '';

+				$checked = '';

 

-                if (in_array($cat_term->term_id, $search_terms)) {

-                    if ($cat_display == 'select' || $cat_display == 'multiselect')

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

-                    else

-                        $checked = 'checked="checked"';

-                }

+				if (in_array($cat_term->term_id, $search_terms)) {

+					if ($cat_display == 'select' || $cat_display == 'multiselect')

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

+					else

+						$checked = 'checked="checked"';

+				}

 

-                if ($cat_display == 'radio')

-                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';

-                elseif ($cat_display == 'select' || $cat_display == 'multiselect')

-                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>';

+				if ($cat_display == 'radio')

+					$out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';

+				elseif ($cat_display == 'select' || $cat_display == 'multiselect')

+					$out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>';

 

-                else {

-                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';

-                }

+				else {

+					$out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';

+				}

 

-                // Call recurson to print sub cats

-                $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);

+				// Call recurson to print sub cats

+				$out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);

 

-            }

+			}

 

-            if ($cat_display == 'checkbox' || $cat_display == 'radio')

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

+			if ($cat_display == 'checkbox' || $cat_display == 'radio')

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

 

-            return $out;

-        }

-        return;

-    }

+			return $out;

+		}

+		return;

+	}

 }

 

 if (!function_exists('geodir_custom_taxonomy_walker2')) {

-    /**

-     * Custom taxonomy walker function.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $post WordPress Post object.

-     * @global object $gd_session GeoDirectory Session object.

-     * @param string $cat_taxonomy The taxonomy name.

-     * @param string $cat_limit Number of categories to display.

-     */

-    function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')

-    {

-        $post_category = '';

-        $post_category_str = '';

-        global $exclude_cats, $gd_session;

-

-        $cat_exclude = '';

-        if (is_array($exclude_cats) && !empty($exclude_cats))

-            $cat_exclude = serialize($exclude_cats);

-

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

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

-

-            if (!is_array($post->post_category[$cat_taxonomy]))

-                $post_category = $post->post_category[$cat_taxonomy];

-

-            $post_categories = $post->post_category_str;

-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))

-                $post_category_str = $post_categories[$cat_taxonomy];

-

-        } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {

-            global $post;

-

-            $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);

-            if (empty($post_category) && isset($post->{$cat_taxonomy})) {

-                $post_category = $post->{$cat_taxonomy};

-            }

+	/**

+	 * Custom taxonomy walker function.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $post WordPress Post object.

+	 * @global object $gd_session GeoDirectory Session object.

+	 * @param string $cat_taxonomy The taxonomy name.

+	 * @param string $cat_limit Number of categories to display.

+	 */

+	function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')

+	{

+		$post_category = '';

+		$post_category_str = '';

+		global $exclude_cats, $gd_session;

+

+		$cat_exclude = '';

+		if (is_array($exclude_cats) && !empty($exclude_cats))

+			$cat_exclude = serialize($exclude_cats);

+

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

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

+

+			if (!is_array($post->post_category[$cat_taxonomy]))

+				$post_category = $post->post_category[$cat_taxonomy];

+

+			$post_categories = $post->post_category_str;

+			if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))

+				$post_category_str = $post_categories[$cat_taxonomy];

+

+		} elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {

+			global $post;

+

+			$post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);

+			if (empty($post_category) && isset($post->{$cat_taxonomy})) {

+				$post_category = $post->{$cat_taxonomy};

+			}

 

-            $post_categories = get_post_meta($post->ID, 'post_categories', true);

+			$post_categories = get_post_meta($post->ID, 'post_categories', true);

 

-            if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {

-                foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {

-                    if (is_numeric($cat_part)) {

-                        $cat_part_arr[] = $cat_part;

-                    }

-                }

-                if (is_array($cat_part_arr)) {

-                    $post_category = implode(',', $cat_part_arr);

-                }

-            }

+			if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {

+				foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {

+					if (is_numeric($cat_part)) {

+						$cat_part_arr[] = $cat_part;

+					}

+				}

+				if (is_array($cat_part_arr)) {

+					$post_category = implode(',', $cat_part_arr);

+				}

+			}

 

-            if (!empty($post_category)) {

-                $cat1 = array_filter(explode(',', $post_category));

-                $post_category = ',' . implode(',', $cat1) . ',';

+			if (!empty($post_category)) {

+				$cat1 = array_filter(explode(',', $post_category));

+				$post_category = ',' . implode(',', $cat1) . ',';

 

-            }

+			}

 

-            if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {

+			if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {

 

-                $post_category_upd = explode(',', $post_category);

-                $post_category_change = '';

-                foreach ($post_category_upd as $cat) {

+				$post_category_upd = explode(',', $post_category);

+				$post_category_change = '';

+				foreach ($post_category_upd as $cat) {

 

-                    if (!in_array($cat, $exclude_cats) && $cat != '') {

-                        $post_category_change .= ',' . $cat;

-                    }

-                }

-                $post_category = $post_category_change;

-            }

+					if (!in_array($cat, $exclude_cats) && $cat != '') {

+						$post_category_change .= ',' . $cat;

+					}

+				}

+				$post_category = $post_category_change;

+			}

 

 

-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

-                $post_category_str = $post_categories[$cat_taxonomy];

-            }

-        }

+			if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

+				$post_category_str = $post_categories[$cat_taxonomy];

+			}

+		}

 

-        echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

 

-        echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

 

-        echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

 

 

-        ?>

+		?>

         <div class="cat_sublist">

             <?php

 

-            $post_id = isset($post->ID) ? $post->ID : '';

+			$post_id = isset($post->ID) ? $post->ID : '';

 

-            if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {

+			if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {

 

-                geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);

-            }

-            ?>

+				geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);

+			}

+			?>

         </div>

         <script type="text/javascript">

 

@@ -1009,22 +1009,22 @@ 
 

         </script>

         <?php

-        if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

-            $post_cat_str = $post_categories[$cat_taxonomy];

-            $post_cat_array = explode("#", $post_cat_str);

-            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)

-                $style = "display:none;";

-        }

-        ?>

+		if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

+			$post_cat_str = $post_categories[$cat_taxonomy];

+			$post_cat_array = explode("#", $post_cat_str);

+			if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)

+				$style = "display:none;";

+		}

+		?>

         <div class="main_cat_list" style=" <?php if (isset($style)) {

-            echo $style;

-        }?> ">

+			echo $style;

+		}?> ">

             <?php geodir_get_catlist($cat_taxonomy, 0);  // print main categories list

-            ?>

+			?>

         </div>

     <?php

 

-    }

+	}

 }

 

 /**

@@ -1041,23 +1041,23 @@ 
  */

 function geodir_addpost_categories_html($request_taxonomy, $parrent, $selected = false, $main_selected = true, $default = false, $exclude = '')

 {

-    global $exclude_cats;

+	global $exclude_cats;

 

-    if ($exclude != '') {

-        $exclude_cats = maybe_unserialize(base64_decode($exclude));

+	if ($exclude != '') {

+		$exclude_cats = maybe_unserialize(base64_decode($exclude));

 

-        if(is_array( $exclude_cats)){

-            $exclude_cats = array_map( 'intval', $exclude_cats );

-        }else{

-            $exclude_cats = intval($exclude_cats);

-        }

+		if(is_array( $exclude_cats)){

+			$exclude_cats = array_map( 'intval', $exclude_cats );

+		}else{

+			$exclude_cats = intval($exclude_cats);

+		}

 

-    }

+	}

 

-    if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||

-        (!is_array($exclude_cats) || empty($exclude_cats))

-    ) {

-        ?>

+	if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||

+		(!is_array($exclude_cats) || empty($exclude_cats))

+	) {

+		?>

 

         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>

 

@@ -1086,8 +1086,8 @@ 
 

             <br/>

             <?php

-            $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));

-            if (!empty($cat_terms)) { ?>

+			$cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));

+			if (!empty($cat_terms)) { ?>

                 <span> <?php printf(__('Add listing in category', 'geodirectory')); ?></span>

                 <?php geodir_get_catlist($request_taxonomy, $parrent, $selected) ?>

             <?php } ?>

@@ -1109,53 +1109,53 @@ 
 function geodir_editpost_categories_html($request_taxonomy, $request_postid, $post_categories)

 {

 

-    if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {

-        $post_cat_str = $post_categories[$request_taxonomy];

-        $post_cat_array = explode("#", $post_cat_str);

-        if (is_array($post_cat_array)) {

-            $post_cat_array = array_unique( $post_cat_array );

+	if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {

+		$post_cat_str = $post_categories[$request_taxonomy];

+		$post_cat_array = explode("#", $post_cat_str);

+		if (is_array($post_cat_array)) {

+			$post_cat_array = array_unique( $post_cat_array );

 

 			foreach ($post_cat_array as $post_cat_html) {

 

-                $post_cat_info = explode(":", $post_cat_html);

-                $post_maincat_str = $post_cat_info[0];

+				$post_cat_info = explode(":", $post_cat_html);

+				$post_maincat_str = $post_cat_info[0];

 

-                if (!empty($post_maincat_str)) {

-                    $post_maincat_info = explode(",", $post_maincat_str);

-                    $post_maincat_id = $post_maincat_info[0];

-                    ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

-                    (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

-                }

-                $post_sub_catid = '';

-                if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                    $post_sub_catid = (int)$post_cat_info[1];

-                }

+				if (!empty($post_maincat_str)) {

+					$post_maincat_info = explode(",", $post_maincat_str);

+					$post_maincat_id = $post_maincat_info[0];

+					($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

+					(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

+				}

+				$post_sub_catid = '';

+				if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

+					$post_sub_catid = (int)$post_cat_info[1];

+				}

 

-                geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

+				geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

 

-            }

-        } else {

+			}

+		} else {

 

-            $post_cat_info = explode(":", $post_cat_str);

-            $post_maincat_str = $post_cat_info[0];

+			$post_cat_info = explode(":", $post_cat_str);

+			$post_maincat_str = $post_cat_info[0];

 

-            $post_sub_catid = '';

+			$post_sub_catid = '';

 

-            if (!empty($post_maincat_str)) {

-                $post_maincat_info = explode(",", $post_maincat_str);

-                $post_maincat_id = $post_maincat_info[0];

-                ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

-                (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

-            }

+			if (!empty($post_maincat_str)) {

+				$post_maincat_info = explode(",", $post_maincat_str);

+				$post_maincat_id = $post_maincat_info[0];

+				($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

+				(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

+			}

 

-            if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                $post_sub_catid = (int)$post_cat_info[1];

-            }

+			if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

+				$post_sub_catid = (int)$post_cat_info[1];

+			}

 

-            geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

+			geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

 

-        }

-    }

+		}

+	}

 }

 

 /**

@@ -1169,35 +1169,35 @@ 
  */

 function geodir_get_catlist($cat_taxonomy, $parrent = 0, $selected = false)

 {

-    global $exclude_cats;

+	global $exclude_cats;

 

-    $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));

+	$cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));

 

-    if (!empty($cat_terms)) {

-        $onchange = '';

-        $onchange = ' onchange="show_subcatlist(this.value, this)" ';

+	if (!empty($cat_terms)) {

+		$onchange = '';

+		$onchange = ' onchange="show_subcatlist(this.value, this)" ';

 

-        $option_selected = '';

-        if (!$selected)

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

+		$option_selected = '';

+		if (!$selected)

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

 

-        echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';

+		echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';

 

-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

+		echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

 

-        foreach ($cat_terms as $cat_term) {

-            $option_selected = '';

-            if ($selected == $cat_term->term_id)

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

+		foreach ($cat_terms as $cat_term) {

+			$option_selected = '';

+			if ($selected == $cat_term->term_id)

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

 

-            // Count child terms

-            $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

-            $has_child = !empty( $child_terms ) ? 't' : 'f';

+			// Count child terms

+			$child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

+			$has_child = !empty( $child_terms ) ? 't' : 'f';

 

-            echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>';

-        }

-        echo '</select>';

-    }

+			echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>';

+		}

+		echo '</select>';

+	}

 }

 

 /**

@@ -1213,28 +1213,28 @@ 
  */

 function geodir_custom_update_messages($messages)

 {

-    global $post, $post_ID;

-

-    $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');

-

-    foreach ($post_types as $post_type => $post_object) {

-

-        $messages[$post_type] = array(

-            0 => '', // Unused. Messages start at index 1.

-            1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

-            2 => __('Custom field updated.', 'geodirectory'),

-            3 => __('Custom field deleted.', 'geodirectory'),

-            4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),

-            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,

-            6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

-            7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),

-            8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

-            9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

-            10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

-        );

-    }

-

-    return $messages;

+	global $post, $post_ID;

+

+	$post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');

+

+	foreach ($post_types as $post_type => $post_object) {

+

+		$messages[$post_type] = array(

+			0 => '', // Unused. Messages start at index 1.

+			1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

+			2 => __('Custom field updated.', 'geodirectory'),

+			3 => __('Custom field deleted.', 'geodirectory'),

+			4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),

+			5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,

+			6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

+			7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),

+			8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

+			9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

+			10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

+		);

+	}

+

+	return $messages;

 }

 

 

@@ -1249,182 +1249,182 @@ 
 function geodir_register_defaults()

 {

 

-    global $wpdb;

-

-    $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';

-

-    if (!$listing_slug = get_option('geodir_listing_prefix'))

-        $listing_slug = 'places';

-

-    /**

-     * Taxonomies

-     **/

-    //if ( ! taxonomy_exists('gd_place_tags') )

-    {

-

-        $gd_placetags = array();

-        $gd_placetags['object_type'] = 'gd_place';

-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';

-        $gd_placetags['args'] = array(

-            'public' => true,

-            'hierarchical' => false,

-            'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),

-            'query_var' => true,

-

-            'labels' => array(

-                'name' => __('Place Tags', 'geodirectory'),

-                'singular_name' => __('Place Tag', 'geodirectory'),

-                'search_items' => __('Search Place Tags', 'geodirectory'),

-                'popular_items' => __('Popular Place Tags', 'geodirectory'),

-                'all_items' => __('All Place Tags', 'geodirectory'),

-                'edit_item' => __('Edit Place Tag', 'geodirectory'),

-                'update_item' => __('Update Place Tag', 'geodirectory'),

-                'add_new_item' => __('Add New Place Tag', 'geodirectory'),

-                'new_item_name' => __('New Place Tag Name', 'geodirectory'),

-                'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),

-                'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),

-                'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),

-            ),

-        );

-

-

-        $geodir_taxonomies = get_option('geodir_taxonomies');

-        $geodir_taxonomies['gd_place_tags'] = $gd_placetags;

-        update_option('geodir_taxonomies', $geodir_taxonomies);

-

-

-        // Update post types and delete tmp options

-        flush_rewrite_rules();

-

-    }

-

-    //if ( ! taxonomy_exists('gd_placecategory') )

-    {

-

-        $gd_placecategory = array();

-        $gd_placecategory['object_type'] = 'gd_place';

-        $gd_placecategory['listing_slug'] = $listing_slug;

-        $gd_placecategory['args'] = array(

-            'public' => true,

-            'hierarchical' => true,

-            'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),

-            'query_var' => true,

-            'labels' => array(

-                'name' => __('Place Categories', 'geodirectory'),

-                'singular_name' => __('Place Category', 'geodirectory'),

-                'search_items' => __('Search Place Categories', 'geodirectory'),

-                'popular_items' => __('Popular Place Categories', 'geodirectory'),

-                'all_items' => __('All Place Categories', 'geodirectory'),

-                'edit_item' => __('Edit Place Category', 'geodirectory'),

-                'update_item' => __('Update Place Category', 'geodirectory'),

-                'add_new_item' => __('Add New Place Category', 'geodirectory'),

-                'new_item_name' => __('New Place Category', 'geodirectory'),

-                'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),

-            ),

-        );

-

-

-        $geodir_taxonomies = get_option('geodir_taxonomies');

-        $geodir_taxonomies['gd_placecategory'] = $gd_placecategory;

-        update_option('geodir_taxonomies', $geodir_taxonomies);

-

-

-        flush_rewrite_rules();

-    }

-

-    /**

-     * Post Types

-     **/

-

-    //if ( ! post_type_exists('gd_place') )

-    {

-

-        $labels = array(

-            'name' => __('Places', 'geodirectory'),

-            'singular_name' => __('Place', 'geodirectory'),

-            'add_new' => __('Add New', 'geodirectory'),

-            'add_new_item' => __('Add New Place', 'geodirectory'),

-            'edit_item' => __('Edit Place', 'geodirectory'),

-            'new_item' => __('New Place', 'geodirectory'),

-            'view_item' => __('View Place', 'geodirectory'),

-            'search_items' => __('Search Places', 'geodirectory'),

-            'not_found' => __('No Place Found', 'geodirectory'),

-            'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));

-

-        $place_default = array(

-            'labels' => $labels,

-            'can_export' => true,

-            'capability_type' => 'post',

-            'description' => 'Place post type.',

-            'has_archive' => $listing_slug,

-            'hierarchical' => false,

-            'map_meta_cap' => true,

-            'menu_icon' => $menu_icon,

-            'public' => true,

-            'query_var' => true,

-            'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

-            'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),

-            'taxonomies' => array('gd_placecategory', 'gd_place_tags'));

-

-        //Update custom post types

-        $geodir_post_types = get_option('geodir_post_types');

-        $geodir_post_types['gd_place'] = $place_default;

-        update_option('geodir_post_types', $geodir_post_types);

-

-        // Update post types and delete tmp options

-        flush_rewrite_rules();

-    }

-

-

-    geodir_register_taxonomies();

-    geodir_register_post_types();

-

-    //die;

+	global $wpdb;

+

+	$menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';

+

+	if (!$listing_slug = get_option('geodir_listing_prefix'))

+		$listing_slug = 'places';

+

+	/**

+	 * Taxonomies

+	 **/

+	//if ( ! taxonomy_exists('gd_place_tags') )

+	{

+

+		$gd_placetags = array();

+		$gd_placetags['object_type'] = 'gd_place';

+		$gd_placetags['listing_slug'] = $listing_slug . '/tags';

+		$gd_placetags['args'] = array(

+			'public' => true,

+			'hierarchical' => false,

+			'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),

+			'query_var' => true,

+

+			'labels' => array(

+				'name' => __('Place Tags', 'geodirectory'),

+				'singular_name' => __('Place Tag', 'geodirectory'),

+				'search_items' => __('Search Place Tags', 'geodirectory'),

+				'popular_items' => __('Popular Place Tags', 'geodirectory'),

+				'all_items' => __('All Place Tags', 'geodirectory'),

+				'edit_item' => __('Edit Place Tag', 'geodirectory'),

+				'update_item' => __('Update Place Tag', 'geodirectory'),

+				'add_new_item' => __('Add New Place Tag', 'geodirectory'),

+				'new_item_name' => __('New Place Tag Name', 'geodirectory'),

+				'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),

+				'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),

+				'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),

+			),

+		);

+

+

+		$geodir_taxonomies = get_option('geodir_taxonomies');

+		$geodir_taxonomies['gd_place_tags'] = $gd_placetags;

+		update_option('geodir_taxonomies', $geodir_taxonomies);

+

+

+		// Update post types and delete tmp options

+		flush_rewrite_rules();

+

+	}

+

+	//if ( ! taxonomy_exists('gd_placecategory') )

+	{

+

+		$gd_placecategory = array();

+		$gd_placecategory['object_type'] = 'gd_place';

+		$gd_placecategory['listing_slug'] = $listing_slug;

+		$gd_placecategory['args'] = array(

+			'public' => true,

+			'hierarchical' => true,

+			'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),

+			'query_var' => true,

+			'labels' => array(

+				'name' => __('Place Categories', 'geodirectory'),

+				'singular_name' => __('Place Category', 'geodirectory'),

+				'search_items' => __('Search Place Categories', 'geodirectory'),

+				'popular_items' => __('Popular Place Categories', 'geodirectory'),

+				'all_items' => __('All Place Categories', 'geodirectory'),

+				'edit_item' => __('Edit Place Category', 'geodirectory'),

+				'update_item' => __('Update Place Category', 'geodirectory'),

+				'add_new_item' => __('Add New Place Category', 'geodirectory'),

+				'new_item_name' => __('New Place Category', 'geodirectory'),

+				'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),

+			),

+		);

+

+

+		$geodir_taxonomies = get_option('geodir_taxonomies');

+		$geodir_taxonomies['gd_placecategory'] = $gd_placecategory;

+		update_option('geodir_taxonomies', $geodir_taxonomies);

+

+

+		flush_rewrite_rules();

+	}

+

+	/**

+	 * Post Types

+	 **/

+

+	//if ( ! post_type_exists('gd_place') )

+	{

+

+		$labels = array(

+			'name' => __('Places', 'geodirectory'),

+			'singular_name' => __('Place', 'geodirectory'),

+			'add_new' => __('Add New', 'geodirectory'),

+			'add_new_item' => __('Add New Place', 'geodirectory'),

+			'edit_item' => __('Edit Place', 'geodirectory'),

+			'new_item' => __('New Place', 'geodirectory'),

+			'view_item' => __('View Place', 'geodirectory'),

+			'search_items' => __('Search Places', 'geodirectory'),

+			'not_found' => __('No Place Found', 'geodirectory'),

+			'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));

+

+		$place_default = array(

+			'labels' => $labels,

+			'can_export' => true,

+			'capability_type' => 'post',

+			'description' => 'Place post type.',

+			'has_archive' => $listing_slug,

+			'hierarchical' => false,

+			'map_meta_cap' => true,

+			'menu_icon' => $menu_icon,

+			'public' => true,

+			'query_var' => true,

+			'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

+			'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),

+			'taxonomies' => array('gd_placecategory', 'gd_place_tags'));

+

+		//Update custom post types

+		$geodir_post_types = get_option('geodir_post_types');

+		$geodir_post_types['gd_place'] = $place_default;

+		update_option('geodir_post_types', $geodir_post_types);

+

+		// Update post types and delete tmp options

+		flush_rewrite_rules();

+	}

+

+

+	geodir_register_taxonomies();

+	geodir_register_post_types();

+

+	//die;

 

 }

 

 $gd_wpml_get_languages = "";

 function gd_wpml_get_lang_from_url($url) {

-    global $sitepress, $gd_wpml_get_languages;

+	global $sitepress, $gd_wpml_get_languages;

     

-    if (geodir_is_wpml()) {

-        return $sitepress->get_language_from_url($url);

-    }

+	if (geodir_is_wpml()) {

+		return $sitepress->get_language_from_url($url);

+	}

     

-    if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {

-        return $_REQUEST['lang'];

-    }

+	if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {

+		return $_REQUEST['lang'];

+	}

 

-    $url = str_replace(array("http://","https://"),"",$url);

+	$url = str_replace(array("http://","https://"),"",$url);

 

-    // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

-    $site_url = str_replace(array("http://","https://"),"",site_url());

+	// site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

+	$site_url = str_replace(array("http://","https://"),"",site_url());

 

-    $url = str_replace($site_url,"",$url);

+	$url = str_replace($site_url,"",$url);

 

-    $segments = explode('/', trim($url, '/'));

+	$segments = explode('/', trim($url, '/'));

 

-    if ($gd_wpml_get_languages) {

-        $langs = $gd_wpml_get_languages;

-    } else {

-        $gd_wpml_get_languages = $sitepress->get_active_languages();

-    }

+	if ($gd_wpml_get_languages) {

+		$langs = $gd_wpml_get_languages;

+	} else {

+		$gd_wpml_get_languages = $sitepress->get_active_languages();

+	}

 

-    if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {

-        return $segments[0];

-    }

+	if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {

+		return $segments[0];

+	}

 

-    return false;

+	return false;

 }

 

 function gd_wpml_slug_translation_turned_on($post_type) {

 

-    global $sitepress;

-    $settings = $sitepress->get_settings();

-    return isset($settings['posts_slug_translation']['types'][$post_type])

-    && $settings['posts_slug_translation']['types'][$post_type]

-    && isset($settings['posts_slug_translation']['on'])

-    && $settings['posts_slug_translation']['on'];

+	global $sitepress;

+	$settings = $sitepress->get_settings();

+	return isset($settings['posts_slug_translation']['types'][$post_type])

+	&& $settings['posts_slug_translation']['types'][$post_type]

+	&& isset($settings['posts_slug_translation']['on'])

+	&& $settings['posts_slug_translation']['on'];

 }

 

 

@@ -1451,162 +1451,162 @@ 
  */

 function geodir_listing_permalink_structure($post_link, $post_obj, $leavename, $sample)

 {

-    //echo $post_link."<br />".$sample ;

+	//echo $post_link."<br />".$sample ;

 

 

-    global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache, $gd_cache_post;

-    if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

-        if($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending'){return $post_link;}

-    } elseif (isset($post_obj->post_status) && ($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending')) {

-        return $post_link;

-    } else {

-        $orig_post = $post;

-        $post = $post_obj;

-    }

+	global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache, $gd_cache_post;

+	if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

+		if($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending'){return $post_link;}

+	} elseif (isset($post_obj->post_status) && ($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending')) {

+		return $post_link;

+	} else {

+		$orig_post = $post;

+		$post = $post_obj;

+	}

 

 

 

-    if (in_array($post->post_type, geodir_get_posttypes())) {//print_r($post );exit;

+	if (in_array($post->post_type, geodir_get_posttypes())) {//print_r($post );exit;

 

 

-        // if we dont have a GD post then try to grab it

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

-            $gd_post = geodir_get_post_info($post->ID);

-            if(!empty($gd_post)){

-                $post = $gd_post;

-            }

-        }

+		// if we dont have a GD post then try to grab it

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

+			$gd_post = geodir_get_post_info($post->ID);

+			if(!empty($gd_post)){

+				$post = $gd_post;

+			}

+		}

 

 

-        $post_types = get_option('geodir_post_types');

-        $slug = $post_types[$post->post_type]['rewrite']['slug'];

+		$post_types = get_option('geodir_post_types');

+		$slug = $post_types[$post->post_type]['rewrite']['slug'];

 

-        // Alter the CPT slug if WPML is set to do so

-        if(geodir_wpml_is_post_type_translated($post->post_type)){

-            if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

+		// Alter the CPT slug if WPML is set to do so

+		if(geodir_wpml_is_post_type_translated($post->post_type)){

+			if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

 

-                $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

-                    $slug,

-                    'WordPress',

-                    'URL slug: ' . $slug,

-                    $language_code);

+				$org_slug = $slug;

+				$slug = apply_filters( 'wpml_translate_single_string',

+					$slug,

+					'WordPress',

+					'URL slug: ' . $slug,

+					$language_code);

 

-                if(!$slug){$slug = $org_slug;}

+				if(!$slug){$slug = $org_slug;}

 

-            }

-        }

+			}

+		}

 

-        if (function_exists('geodir_location_geo_home_link')) {

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

-        }

+		if (function_exists('geodir_location_geo_home_link')) {

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

+		}

         

-        // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.

-        $site_url = trailingslashit(get_bloginfo('url'));

+		// Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.

+		$site_url = trailingslashit(get_bloginfo('url'));

         

-        if (function_exists('geodir_location_geo_home_link')) {

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

-        }

-

-        $fix_url = strpos($post_link, $site_url) === 0 ? true : false;

-        if ($fix_url) {

-            $post_link = str_replace($site_url, '', $post_link);

-        }

-

-        $post_link = trailingslashit(

-            preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

-        );

-

-        if ($fix_url) {

-            $post_link = $site_url . $post_link;

-        }

-

-        if (isset($comment_post_cache[$post->ID])) {

-            $post = $comment_post_cache[$post->ID];

-        }

-        if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {

-            $post_id = $post->ID;

-            if (isset($orig_post)) {

-                $post = $orig_post;

-            }

-            return $gd_permalink_cache[$post_id];

-        }

+		if (function_exists('geodir_location_geo_home_link')) {

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

+		}

+

+		$fix_url = strpos($post_link, $site_url) === 0 ? true : false;

+		if ($fix_url) {

+			$post_link = str_replace($site_url, '', $post_link);

+		}

 

-        if (!isset($post->post_locations)) {

-            $post_type = $post->post_type;

-            $ID = $post->ID;

-            $post2 = $wpdb->get_row(

-                $wpdb->prepare(

-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

-                    array($post->ID)

-                )

-            );

+		$post_link = trailingslashit(

+			preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

+		);

 

-            $post = (object)array_merge((array)$post, (array)$post2);

+		if ($fix_url) {

+			$post_link = $site_url . $post_link;

+		}

 

-            $comment_post_cache[$post->ID] = $post;

-        }

+		if (isset($comment_post_cache[$post->ID])) {

+			$post = $comment_post_cache[$post->ID];

+		}

+		if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {

+			$post_id = $post->ID;

+			if (isset($orig_post)) {

+				$post = $orig_post;

+			}

+			return $gd_permalink_cache[$post_id];

+		}

 

+		if (!isset($post->post_locations)) {

+			$post_type = $post->post_type;

+			$ID = $post->ID;

+			$post2 = $wpdb->get_row(

+				$wpdb->prepare(

+					"SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+					array($post->ID)

+				)

+			);

 

+			$post = (object)array_merge((array)$post, (array)$post2);

 

-        if (false !== strpos($post_link, '%gd_taxonomy%')) {

+			$comment_post_cache[$post->ID] = $post;

+		}

 

-            if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {

-                $location_request = '';

 

 

-                if (!empty($post->post_locations)) {

-                    $geodir_arr_locations = explode(',', $post->post_locations);

-                    if (count($geodir_arr_locations) == 3) {

-                        $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

-                        $post->city_slug = str_replace(']', '', $post->city_slug);

-                        $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

-                        $post->region_slug = str_replace(']', '', $post->region_slug);

-                        $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

-                        $post->country_slug = str_replace(']', '', $post->country_slug);

+		if (false !== strpos($post_link, '%gd_taxonomy%')) {

 

-                        $post_location = (object)array('country_slug' => $post->country_slug,

-                            'region_slug' => $post->region_slug,

-                            'city_slug' => $post->city_slug

-                        );

+			if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {

+				$location_request = '';

 

-                    } else

-                        $post_location = geodir_get_location();

 

+				if (!empty($post->post_locations)) {

+					$geodir_arr_locations = explode(',', $post->post_locations);

+					if (count($geodir_arr_locations) == 3) {

+						$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

+						$post->city_slug = str_replace(']', '', $post->city_slug);

+						$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

+						$post->region_slug = str_replace(']', '', $post->region_slug);

+						$post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

+						$post->country_slug = str_replace(']', '', $post->country_slug);

 

-                } else {

+						$post_location = (object)array('country_slug' => $post->country_slug,

+							'region_slug' => $post->region_slug,

+							'city_slug' => $post->city_slug

+						);

 

-                    $post_location_sql = $wpdb->get_results(

-                        $wpdb->prepare(

-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

-                            array($post->ID)

-                        )

-                    );

-

-                    if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {

-

-                        $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);

-                        if (count($geodir_arr_locations) == 3) {

-                            $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

-                            $post->city_slug = str_replace(']', '', $post->city_slug);

-                            $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

-                            $post->region_slug = str_replace(']', '', $post->region_slug);

-                            $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

-                            $post->country_slug = str_replace(']', '', $post->country_slug);

-

-                            $post_location = (object)array('country_slug' => $post->country_slug,

-                                'region_slug' => $post->region_slug,

-                                'city_slug' => $post->city_slug

-                            );

+					} else

+						$post_location = geodir_get_location();

 

-                        }

-                    } else

-                        $post_location = geodir_get_location();

-                }

+

+				} else {

+

+					$post_location_sql = $wpdb->get_results(

+						$wpdb->prepare(

+							"SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+							array($post->ID)

+						)

+					);

+

+					if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {

+

+						$geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);

+						if (count($geodir_arr_locations) == 3) {

+							$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

+							$post->city_slug = str_replace(']', '', $post->city_slug);

+							$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

+							$post->region_slug = str_replace(']', '', $post->region_slug);

+							$post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

+							$post->country_slug = str_replace(']', '', $post->country_slug);

+

+							$post_location = (object)array('country_slug' => $post->country_slug,

+								'region_slug' => $post->region_slug,

+								'city_slug' => $post->city_slug

+							);

+

+						}

+					} else

+						$post_location = geodir_get_location();

+				}

 

 

-                if (!empty($post_location)) {

-                    $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : '';

+				if (!empty($post_location)) {

+					$country_slug = isset($post_location->country_slug) ? $post_location->country_slug : '';

 					$region_slug = isset($post_location->region_slug) ? $post_location->region_slug : '';

 					$city_slug = isset($post_location->city_slug) ? $post_location->city_slug : '';

 					

@@ -1624,89 +1624,89 @@ 
 					$location_slug[] = $city_slug;

 					

 					$location_request .= implode('/', $location_slug) . '/';

-                }

-            }

+				}

+			}

 

-            if (get_option('geodir_add_categories_url')) {

+			if (get_option('geodir_add_categories_url')) {

 

-                $term_request = '';

-                $taxonomies = geodir_get_taxonomies($post->post_type);

-                $taxonomies = !empty($taxonomies) && is_array($taxonomies) ? end($taxonomies) : '';

+				$term_request = '';

+				$taxonomies = geodir_get_taxonomies($post->post_type);

+				$taxonomies = !empty($taxonomies) && is_array($taxonomies) ? end($taxonomies) : '';

 

-                if (!empty($post->default_category)) {

-                    $post_terms = $post->default_category;

-                } else {

-                    $post_terms = '';

-

-                    if(isset($_POST['post_default_category']) && $_POST['post_default_category']){

-                        $post_terms = absint($_POST['post_default_category']);

-                    }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {

-                        $post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));

-                        $post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0;

-                    }elseif (isset($post->{$taxonomies})) {

-                        $post_terms = explode(",", trim($post->{$taxonomies}, ","));

-                        $post_terms = $post_terms[0];

-                    }

+				if (!empty($post->default_category)) {

+					$post_terms = $post->default_category;

+				} else {

+					$post_terms = '';

+

+					if(isset($_POST['post_default_category']) && $_POST['post_default_category']){

+						$post_terms = absint($_POST['post_default_category']);

+					}elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {

+						$post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));

+						$post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0;

+					}elseif (isset($post->{$taxonomies})) {

+						$post_terms = explode(",", trim($post->{$taxonomies}, ","));

+						$post_terms = $post_terms[0];

+					}

 

-                    if (!$post_terms)

-                        $post_terms = geodir_get_post_meta($post->ID, 'default_category', true);

+					if (!$post_terms)

+						$post_terms = geodir_get_post_meta($post->ID, 'default_category', true);

 

-                    if (!$post_terms) {

-                        $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);

+					if (!$post_terms) {

+						$post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);

 

-                        if ($post_terms) {

-                            $post_terms = explode(",", trim($post_terms, ","));

-                            $post_terms = $post_terms[0];

-                        }

-                    }

-                }

+						if ($post_terms) {

+							$post_terms = explode(",", trim($post_terms, ","));

+							$post_terms = $post_terms[0];

+						}

+					}

+				}

 

-                $term = get_term_by('id', $post_terms, $taxonomies);

+				$term = get_term_by('id', $post_terms, $taxonomies);

 

-                if (!empty($term))

-                    $term_request = $term->slug;

-                //$term_request = $term->slug.'/';

-            }

+				if (!empty($term))

+					$term_request = $term->slug;

+				//$term_request = $term->slug.'/';

+			}

 

-            $request_term = '';

-            $listingurl_separator = '';

-            //$detailurl_separator = get_option('geodir_detailurl_separator');

-            $detailurl_separator = '';

-            if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {

-                $request_term = $location_request;

-                //$listingurl_separator = get_option('geodir_listingurl_separator');

-                //$request_term .= $listingurl_separator.'/'.$term_request;

-                $request_term .= $term_request;

+			$request_term = '';

+			$listingurl_separator = '';

+			//$detailurl_separator = get_option('geodir_detailurl_separator');

+			$detailurl_separator = '';

+			if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {

+				$request_term = $location_request;

+				//$listingurl_separator = get_option('geodir_listingurl_separator');

+				//$request_term .= $listingurl_separator.'/'.$term_request;

+				$request_term .= $term_request;

 

-            } else {

-                if (isset($location_request) && $location_request != '') $request_term = $location_request;

+			} else {

+				if (isset($location_request) && $location_request != '') $request_term = $location_request;

 

-                if (isset($term_request) && $term_request != '') $request_term .= $term_request;

-            }

-            $request_term = trim($request_term, '/');

+				if (isset($term_request) && $term_request != '') $request_term .= $term_request;

+			}

+			$request_term = trim($request_term, '/');

             

-            // Fix with WPML the location terms added twice when CPT slug is translated.

-            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {

-                $post_link = str_replace('%gd_taxonomy%/', '', $post_link);

-            }

+			// Fix with WPML the location terms added twice when CPT slug is translated.

+			if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {

+				$post_link = str_replace('%gd_taxonomy%/', '', $post_link);

+			}

             

-            if (!empty($request_term))

-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

-            else

-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

-            //echo $post_link ;

-        }

-        // temp cache the permalink

-        if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {

-            $gd_permalink_cache[$post->ID] = $post_link;

-        }

-    }

-    if (isset($orig_post)) {

-        $post = $orig_post;

-    }

+			if (!empty($request_term))

+				$post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+			else

+				$post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+			//echo $post_link ;

+		}

+		// temp cache the permalink

+		if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {

+			$gd_permalink_cache[$post->ID] = $post_link;

+		}

+	}

+	if (isset($orig_post)) {

+		$post = $orig_post;

+	}

 	$gd_cache_post = $post;

 

-    return $post_link;

+	return $post_link;

 }

 

 /**

@@ -1722,117 +1722,117 @@ 
  * @return string The term link.

  */

 function geodir_term_link($termlink, $term, $taxonomy) {

-    $geodir_taxonomies = geodir_get_taxonomies('', true);

+	$geodir_taxonomies = geodir_get_taxonomies('', true);

 

-    if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {

-        global $geodir_add_location_url, $gd_session;

-        $include_location = false;

-        $request_term = array();

-        $add_location_url = get_option('geodir_add_location_url');

-        $location_manager = defined('POST_LOCATION_TABLE') ? true : false;

+	if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {

+		global $geodir_add_location_url, $gd_session;

+		$include_location = false;

+		$request_term = array();

+		$add_location_url = get_option('geodir_add_location_url');

+		$location_manager = defined('POST_LOCATION_TABLE') ? true : false;

 

-        $listing_slug = geodir_get_listing_slug($taxonomy);

+		$listing_slug = geodir_get_listing_slug($taxonomy);

 

-        if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {

-            if ($geodir_add_location_url && $add_location_url) {

-                $include_location = true;

-            }

-        } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {

-            $include_location = true;

-        } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {

-            $include_location = true;

-        }

-

-        if ($include_location) {

-            global $post;

-            $location_terms = array();

+		if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {

+			if ($geodir_add_location_url && $add_location_url) {

+				$include_location = true;

+			}

+		} elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {

+			$include_location = true;

+		} elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {

+			$include_location = true;

+		}

+

+		if ($include_location) {

+			global $post;

+			$location_terms = array();

             

-            $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

+			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

             

-            if (geodir_is_page('detail')) {

-                if (!isset($post->country_slug) && !empty($post->post_locations)) {

-                    $post_locations = explode(',', $post->post_locations);

-

-                    if (count($post_locations) == 3) {

-                        $post->city_slug = str_replace('[', '', $post_locations[0]);

-                        $post->city_slug = str_replace(']', '', $post->city_slug);

-                        $post->region_slug = str_replace('[', '', $post_locations[1]);

-                        $post->region_slug = str_replace(']', '', $post->region_slug);

-                        $post->country_slug = str_replace('[', '', $post_locations[2]);

-                        $post->country_slug = str_replace(']', '', $post->country_slug);

-                    }

-                }

+			if (geodir_is_page('detail')) {

+				if (!isset($post->country_slug) && !empty($post->post_locations)) {

+					$post_locations = explode(',', $post->post_locations);

+

+					if (count($post_locations) == 3) {

+						$post->city_slug = str_replace('[', '', $post_locations[0]);

+						$post->city_slug = str_replace(']', '', $post->city_slug);

+						$post->region_slug = str_replace('[', '', $post_locations[1]);

+						$post->region_slug = str_replace(']', '', $post->region_slug);

+						$post->country_slug = str_replace('[', '', $post_locations[2]);

+						$post->country_slug = str_replace(']', '', $post->country_slug);

+					}

+				}

 

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

-                    $location_terms = array(

-                        'gd_country' => $post->country_slug,

-                        'gd_region' => $post->region_slug,

-                        'gd_city' => $post->city_slug

-                    );

+				if (isset($post->country_slug)) {

+					$location_terms = array(

+						'gd_country' => $post->country_slug,

+						'gd_region' => $post->region_slug,

+						'gd_city' => $post->city_slug

+					);

 

-                    if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {

-                        $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

-                    }

-                }

-            }

+					if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {

+						$location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

+					}

+				}

+			}

             

-            if (empty($location_terms)) {

-                $location_terms = geodir_get_current_location_terms('query_vars');

-            }

+			if (empty($location_terms)) {

+				$location_terms = geodir_get_current_location_terms('query_vars');

+			}

 

-            $geodir_show_location_url = get_option('geodir_show_location_url');

-            $location_terms = geodir_remove_location_terms($location_terms);

+			$geodir_show_location_url = get_option('geodir_show_location_url');

+			$location_terms = geodir_remove_location_terms($location_terms);

 

-            if (!empty($location_terms)) {

-                $url_separator = '';

+			if (!empty($location_terms)) {

+				$url_separator = '';

 

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

-                    $old_listing_slug = '/' . $listing_slug . '/';

-                    $request_term = implode("/", $location_terms);

-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

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

+					$old_listing_slug = '/' . $listing_slug . '/';

+					$request_term = implode("/", $location_terms);

+					$new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

 

-                    $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

-                } else {

-                    $termlink = geodir_getlink($termlink, $request_term);

-                }

-            }

-        }

+					$termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

+				} else {

+					$termlink = geodir_getlink($termlink, $request_term);

+				}

+			}

+		}

 

-        // Alter the CPT slug is WPML is set to do so

-        /* we can replace this with the below function

+		// Alter the CPT slug is WPML is set to do so

+		/* we can replace this with the below function

         if(geodir_is_wpml()){

             global $sitepress;

             $post_type = str_replace("category","",$taxonomy);

             $termlink = $sitepress->post_type_archive_link_filter( $termlink, $post_type);

         }*/

 

-        // Alter the CPT slug if WPML is set to do so

-        if (geodir_is_wpml()) {

-            $post_types = get_option('geodir_post_types');

-            $post_type = str_replace("category","",$taxonomy);

-            $post_type = str_replace("_tags","",$post_type);

-            $slug = $post_types[$post_type]['rewrite']['slug'];

-            if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {

-                global $sitepress;

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

-                $language_code = gd_wpml_get_lang_from_url($termlink);

-                if (!$language_code ) {

-                    $language_code  = $default_lang;

-                }

+		// Alter the CPT slug if WPML is set to do so

+		if (geodir_is_wpml()) {

+			$post_types = get_option('geodir_post_types');

+			$post_type = str_replace("category","",$taxonomy);

+			$post_type = str_replace("_tags","",$post_type);

+			$slug = $post_types[$post_type]['rewrite']['slug'];

+			if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {

+				global $sitepress;

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

+				$language_code = gd_wpml_get_lang_from_url($termlink);

+				if (!$language_code ) {

+					$language_code  = $default_lang;

+				}

 

-                $org_slug = $slug;

-                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);

+				$org_slug = $slug;

+				$slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);

 

-                if (!$slug) {

-                    $slug = $org_slug;

-                }

+				if (!$slug) {

+					$slug = $org_slug;

+				}

 

-                $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug  ,$termlink, 1));

-            }

-        }

-    }

+				$termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug  ,$termlink, 1));

+			}

+		}

+	}

     

-    return $termlink;

+	return $termlink;

 }

 

 /**

@@ -1858,14 +1858,14 @@ 
 	if (in_array($post_type, geodir_get_posttypes())) {

 		if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {

 			if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

-                $location_terms = array(

-                    'gd_country' => $post->country_slug,

-                    'gd_region' => $post->region_slug,

-                    'gd_city' => $post->city_slug

-                );

-            } else {

-                $location_terms = geodir_get_current_location_terms('query_vars');

-            }

+				$location_terms = array(

+					'gd_country' => $post->country_slug,

+					'gd_region' => $post->region_slug,

+					'gd_city' => $post->city_slug

+				);

+			} else {

+				$location_terms = geodir_get_current_location_terms('query_vars');

+			}

 			

 			$location_terms = geodir_remove_location_terms($location_terms);

 			

@@ -1897,17 +1897,17 @@ 
  * @return void|string Label.

  */

 function get_post_type_singular_label($post_type, $echo = false, $translate = false) {

-    $obj_post_type = get_post_type_object($post_type);

-    if (!is_object($obj_post_type)) {

-        return;

-    }

+	$obj_post_type = get_post_type_object($post_type);

+	if (!is_object($obj_post_type)) {

+		return;

+	}

     

-    $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;

+	$label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

+	if ($echo)

+		echo $label;

+	else

+		return $label;

 }

 

 /**

@@ -1922,19 +1922,19 @@ 
  * @return void|string Label.

  */

 function get_post_type_plural_label($post_type, $echo = false, $translate = false) {

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!in_array($post_type, $all_postypes))

-        return false;

+	if (!in_array($post_type, $all_postypes))

+		return false;

 

-    $obj_post_type = get_post_type_object($post_type);

+	$obj_post_type = get_post_type_object($post_type);

     

-    $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;

+	$label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

+	if ($echo)

+		echo $label;

+	else

+		return $label;

 }

 

 /**

@@ -1952,51 +1952,51 @@ 
  */

 function geodir_term_exists($term, $taxonomy = '', $parent = 0)

 {

-    global $wpdb;

-

-    $select = "SELECT term_id FROM $wpdb->terms as t WHERE ";

-    $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";

-

-    if (is_int($term)) {

-        if (0 == $term)

-            return 0;

-        $where = 't.term_id = %d';

-        if (!empty($taxonomy))

-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

-        else

-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));

-    }

+	global $wpdb;

+

+	$select = "SELECT term_id FROM $wpdb->terms as t WHERE ";

+	$tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";

+

+	if (is_int($term)) {

+		if (0 == $term)

+			return 0;

+		$where = 't.term_id = %d';

+		if (!empty($taxonomy))

+			return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

+		else

+			return $wpdb->get_var($wpdb->prepare($select . $where, $term));

+	}

 

-    $term = trim(wp_unslash($term));

+	$term = trim(wp_unslash($term));

 

-    if ('' === $slug = sanitize_title($term))

-        return 0;

+	if ('' === $slug = sanitize_title($term))

+		return 0;

 

-    $where = 't.slug = %s';

+	$where = 't.slug = %s';

 

-    $where_fields = array($slug);

-    if (!empty($taxonomy)) {

-        $parent = (int)$parent;

-        if ($parent > 0) {

-            $where_fields[] = $parent;

-            $else_where_fields[] = $parent;

-            $where .= ' AND tt.parent = %d';

+	$where_fields = array($slug);

+	if (!empty($taxonomy)) {

+		$parent = (int)$parent;

+		if ($parent > 0) {

+			$where_fields[] = $parent;

+			$else_where_fields[] = $parent;

+			$where .= ' AND tt.parent = %d';

 

-        }

+		}

 

-        $where_fields[] = $taxonomy;

+		$where_fields[] = $taxonomy;

 

 

-        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))

-            return $result;

+		if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))

+			return $result;

 

-        return false;

-    }

+		return false;

+	}

 

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))

-        return $result;

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))

+		return $result;

 

-    return false;

+	return false;

 }

 

 /**

@@ -2008,7 +2008,7 @@ 
 function geodir_get_term_icon_rebuild()

 {

 

-    update_option('gd_term_icons', '');

+	update_option('gd_term_icons', '');

 

 }

 

@@ -2026,61 +2026,61 @@ 
  */

 function geodir_get_term_icon($term_id = false, $rebuild = false)

 {

-    global $wpdb;

-    if (!$rebuild) {

-        $terms_icons = get_option('gd_term_icons');

-    } else {

-        $terms_icons = array();

-    }

-

-    if (empty($terms_icons)) {

-        $terms_icons = array();

-        $default_icon_url = get_option('geodir_default_marker_icon');

-        $taxonomy = geodir_get_taxonomies();

-        $post_types = geodir_get_posttypes();

-        $tax_arr = array();

-        foreach ($post_types as $post_type) {

-            $tax_arr[] = "'" . $post_type . "category'";

-        }

-        $tax_c = implode(',', $tax_arr);

-        $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

-        //$terms = get_terms( $taxonomy );

-

-        if($terms) {

-            foreach ($terms as $term) {

-                $post_type = str_replace("category", "", $term->taxonomy);

-                $a_terms[$post_type][] = $term;

+	global $wpdb;

+	if (!$rebuild) {

+		$terms_icons = get_option('gd_term_icons');

+	} else {

+		$terms_icons = array();

+	}

 

-            }

-        }

+	if (empty($terms_icons)) {

+		$terms_icons = array();

+		$default_icon_url = get_option('geodir_default_marker_icon');

+		$taxonomy = geodir_get_taxonomies();

+		$post_types = geodir_get_posttypes();

+		$tax_arr = array();

+		foreach ($post_types as $post_type) {

+			$tax_arr[] = "'" . $post_type . "category'";

+		}

+		$tax_c = implode(',', $tax_arr);

+		$terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

+		//$terms = get_terms( $taxonomy );

 

-        if($a_terms) {

-            foreach ($a_terms as $pt => $t2) {

+		if($terms) {

+			foreach ($terms as $term) {

+				$post_type = str_replace("category", "", $term->taxonomy);

+				$a_terms[$post_type][] = $term;

 

-                foreach ($t2 as $term) {

-                    $term_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);

-                    if ($term_icon) {

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

-                    } else {

-                        $term_icon_url = $default_icon_url;

-                    }

-                    $terms_icons[$term->term_id] = $term_icon_url;

-                }

-            }

-        }

+			}

+		}

+

+		if($a_terms) {

+			foreach ($a_terms as $pt => $t2) {

 

-        update_option('gd_term_icons', $terms_icons);

-    }

+				foreach ($t2 as $term) {

+					$term_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);

+					if ($term_icon) {

+						$term_icon_url = $term_icon["src"];

+					} else {

+						$term_icon_url = $default_icon_url;

+					}

+					$terms_icons[$term->term_id] = $term_icon_url;

+				}

+			}

+		}

 

-    if ($term_id && isset($terms_icons[$term_id])) {

-        return $terms_icons[$term_id];

-    } elseif ($term_id && !isset($terms_icons[$term_id])) {

-        return get_option('geodir_default_marker_icon');

-    }

+		update_option('gd_term_icons', $terms_icons);

+	}

+

+	if ($term_id && isset($terms_icons[$term_id])) {

+		return $terms_icons[$term_id];

+	} elseif ($term_id && !isset($terms_icons[$term_id])) {

+		return get_option('geodir_default_marker_icon');

+	}

 

-    if (is_ssl()) {

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

-    }

+	if (is_ssl()) {

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

+	}

 

-    return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

+	return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

 }
\ No newline at end of file

Spacing +130 added lines, -130 removed lines

@@ -60,16 +60,16 @@ 
                              * @since 1.0.0

                              * @param string $menu_class The menu HTML class.

                              */

-                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                             /**

                              * Filter the menu a class.

                              *

                              * @since 1.0.0

                              */

                             $a_class = apply_filters('geodir_menu_a_class', '');

-                            $items .= '<li class="' . $li_class . '">

-									<a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '">

-										' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '

+                            $items .= '<li class="'.$li_class.'">

+									<a href="' . get_post_type_archive_link($post_type).'" class="'.$a_class.'">

+										' . __(geodir_utf8_ucfirst($args->labels->name), 'geodirectory').'

 									</a>

 								</li>';

                         }

@@ -88,14 +88,14 @@ 
              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings '.$menu_class);

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);

             /**

              * Filter the sub menu ul class.

              *

@@ -114,9 +114,9 @@ 
              * @since 1.0.0

              */

             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

-            $items .= '<li class="' . $li_class . '">

-					<a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>

-					<ul class="' . $sub_ul_class . '">';

+            $items .= '<li class="'.$li_class.'">

+					<a href="#" class="' . $a_class.'">'.__('Listing', 'geodirectory').'</a>

+					<ul class="' . $sub_ul_class.'">';

             $post_types = geodir_get_posttypes('object');

 

             $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

@@ -133,9 +133,9 @@ 
                                 if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

                                     $menu_class = 'current-menu-item';

 

-                                $items .= '<li class="' . $sub_li_class . '">

-														<a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '">

-															' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '

+                                $items .= '<li class="'.$sub_li_class.'">

+														<a href="' . get_post_type_archive_link($post_type).'" class="'.$sub_a_class.'">

+															' . __(geodir_utf8_ucfirst($args->labels->name), 'geodirectory').'

 														</a>

 													</li>';

                             }

@@ -151,7 +151,7 @@ 
              *

              * @since 1.5.9

              */

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

+            $items .= apply_filters('geodir_menu_after_sub_ul', '');

             $items .= '</li>';

         }

     }

@@ -184,7 +184,7 @@ 
                                      * @since 1.0.0

                                      * @param string $menu_class The menu HTML class.

                                      */

-                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                                     /**

                                      * Filter the menu a class.

                                      *

@@ -192,9 +192,9 @@ 
                                      */

                                     $a_class = apply_filters('geodir_menu_a_class', '');

                                     $cpt_name = __($args->labels->singular_name, 'geodirectory');

-                                    $items .= '<li class="' . $li_class . '">

-											<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '">

-												' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

+                                    $items .= '<li class="'.$li_class.'">

+											<a href="' . geodir_get_addlisting_link($post_type).'" class="'.$a_class.'">

+												' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'

 											</a>

 										</li>';

                                 }

@@ -218,14 +218,14 @@ 
              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing '.$menu_class);

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);

             /**

              * Filter the sub menu ul class.

              *

@@ -244,9 +244,9 @@ 
              * @since 1.0.0

              */

             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

-            $items .= '<li  class="' . $li_class . '">

-					<a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>

-					<ul class="' . $sub_ul_class . '">';

+            $items .= '<li  class="'.$li_class.'">

+					<a href="#" class="' . $a_class.'">'.__('Add Listing', 'geodirectory').'</a>

+					<ul class="' . $sub_ul_class.'">';

 

             $post_types = geodir_get_posttypes('object');

 

@@ -269,11 +269,11 @@ 
                                          * @since 1.0.0

                                          * @param string $menu_class The menu HTML class.

                                          */

-                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                                         $cpt_name = __($args->labels->singular_name, 'geodirectory');

-                                        $items .= '<li class="' . $sub_li_class . '">

-														<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '">

-															' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

+                                        $items .= '<li class="'.$sub_li_class.'">

+														<a href="' . geodir_get_addlisting_link($post_type).'" class="'.$sub_a_class.'">

+															' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'

 														</a>

 													</li>';

                                     }

@@ -285,7 +285,7 @@ 
             }

 

             $items .= '	</ul> ';

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

+            $items .= apply_filters('geodir_menu_after_sub_ul', '');

             $items .= '</li>';

 

         }

@@ -313,14 +313,14 @@ 
     $geodir_theme_location = get_option('geodir_theme_location_nav');

     $geodir_theme_location_nav = array();

     if (empty($locations) && empty($geodir_theme_location)) {

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);

         $geodir_theme_location_nav[] = $args['theme_location'];

         update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

     }

     //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.

 //		$menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);

     else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);

 

     return $menu;

 

@@ -348,7 +348,7 @@ 
 

     if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

 

-        $items = $items . geodir_add_nav_menu_items();

+        $items = $items.geodir_add_nav_menu_items();

         return $items;

 

     } else {

@@ -373,12 +373,12 @@ 
 

     $taxonomies = geodir_get_taxonomies();

     $taxonomies = implode("','", $taxonomies);

-    $taxonomies = "'" . $taxonomies . "'";

+    $taxonomies = "'".$taxonomies."'";

 

     $pn_categories = $wpdb->get_results(

         $wpdb->prepare(

             "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

-            array($wpdb->terms . term_id)

+            array($wpdb->terms.term_id)

         )

     );

 

@@ -408,7 +408,7 @@ 
 

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

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

-            $geodir_post_type = get_post_type((int)$_REQUEST['pid']);

+            $geodir_post_type = get_post_type((int) $_REQUEST['pid']);

         elseif (isset($_REQUEST['listing_type']))

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

     }

@@ -434,7 +434,7 @@ 
     if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

         $geodir_post_type = '';

 

-    if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

+    if (defined('DOING_AJAX') && isset($_REQUEST['stype'])) {

         $geodir_post_type = sanitize_text_field($_REQUEST['stype']);

     }

 

@@ -444,7 +444,7 @@ 
      *

      * @since 1.6.9

      */

-    return apply_filters('geodir_get_current_posttype',$geodir_post_type);

+    return apply_filters('geodir_get_current_posttype', $geodir_post_type);

 }

 

 /**

@@ -458,18 +458,18 @@ 
  */

 function geodir_get_default_posttype()

 {

-    $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

+    $post_types = apply_filters('geodir_get_default_posttype', geodir_get_posttypes('object'));

 

     $stype = false;

-    foreach ( $post_types as $post_type => $info ) {

+    foreach ($post_types as $post_type => $info) {

         global $wpdb;

-        $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-        if ( $has_posts ) {

+        $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));

+        if ($has_posts) {

             $stype = $post_type; break;

         }

     }

 

-    if(!$stype){

+    if (!$stype) {

         $stype = 'gd_place';

     }

 

@@ -494,14 +494,14 @@ 
         switch ($output):

             case 'object':

             case 'Object':

-                $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types;

+                $post_types = json_decode(json_encode($post_types), FALSE); //(object)$post_types;

                 break;

             case 'array':

             case 'Array':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

                 break;

 			case 'options':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

 				

 				$options = array();

 				if (!empty($post_types)) {

@@ -569,7 +569,7 @@ 
                     $gd_taxonomies[] = $taxonomy;

                 }

 

-                if ($tages_taxonomies === false && substr($taxonomy , -5) == '_tags') {

+                if ($tages_taxonomies === false && substr($taxonomy, -5) == '_tags') {

                     if (array_search($taxonomy, $gd_taxonomies) !== false) {

                         unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);

                     }

@@ -615,15 +615,15 @@ 
 

         $categories = get_terms($taxonomies);

 

-        $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

+        $html .= '<option value="0">'.__('All', 'geodirectory').'</option>';

 

         foreach ($categories as $category_obj) {

             $select_opt = '';

             if ($selected == $category_obj->term_id) {

                 $select_opt = 'selected="selected"';

             }

-            $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

-                . geodir_utf8_ucfirst($category_obj->name) . '</option>';

+            $html .= '<option '.$select_opt.' value="'.$category_obj->term_id.'">'

+                . geodir_utf8_ucfirst($category_obj->name).'</option>';

         }

 

         if ($echo)

@@ -691,7 +691,7 @@ 
     } elseif (isset($wp_query->tax_query->queries)) {

         $tax_arr = $wp_query->tax_query->queries;

         //if tax query has 'relation' set then it will break wp_list_pluck so we remove it

-        if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}

+        if (isset($tax_arr['relation'])) {unset($tax_arr['relation']); }

         $taxonomies = wp_list_pluck($tax_arr, 'taxonomy');

     }

 

@@ -745,7 +745,7 @@ 
 

             if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

                 if ($cat_parent == 0) {

-                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

+                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-'.$cat_display;

                     $main_list_class = 'class="main_list_selecter"';

                 } else {

                     //$display = 'display:none';

@@ -755,7 +755,7 @@ 
 

             if ($cat_display == 'checkbox' || $cat_display == 'radio') {

                 $p = 0;

-                $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+                $out = '<div class="'.$list_class.' gd-cat-row-'.$cat_parent.'" style="margin-left:'.$p.'px;'.$display.';">';

             }

 

             foreach ($cat_terms as $cat_term) {

@@ -770,12 +770,12 @@ 
                 }

 

                 if ($cat_display == 'radio')

-                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';

+                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category['.$cat_term->taxonomy.'][]" '.$main_list_class.' alt="'.$cat_term->taxonomy.'" title="'.geodir_utf8_ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.geodir_utf8_ucfirst($cat_term->name).'</span>';

                 elseif ($cat_display == 'select' || $cat_display == 'multiselect')

-                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>';

+                    $out .= '<option '.$main_list_class.' style="margin-left:'.$p.'px;" alt="'.$cat_term->taxonomy.'" title="'.geodir_utf8_ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' >'.$term_check.geodir_utf8_ucfirst($cat_term->name).'</option>';

 

                 else {

-                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';

+                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category['.$cat_term->taxonomy.'][]" '.$main_list_class.' alt="'.$cat_term->taxonomy.'" title="'.geodir_utf8_ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.geodir_utf8_ucfirst($cat_term->name).'</span>';

                 }

 

                 // Call recurson to print sub cats

@@ -814,7 +814,7 @@ 
             $cat_exclude = serialize($exclude_cats);

 

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

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

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

 

             if (!is_array($post->post_category[$cat_taxonomy]))

                 $post_category = $post->post_category[$cat_taxonomy];

@@ -846,7 +846,7 @@ 
 

             if (!empty($post_category)) {

                 $cat1 = array_filter(explode(',', $post_category));

-                $post_category = ',' . implode(',', $cat1) . ',';

+                $post_category = ','.implode(',', $cat1).',';

 

             }

 

@@ -857,7 +857,7 @@ 
                 foreach ($post_category_upd as $cat) {

 

                     if (!in_array($cat, $exclude_cats) && $cat != '') {

-                        $post_category_change .= ',' . $cat;

+                        $post_category_change .= ','.$cat;

                     }

                 }

                 $post_category = $post_category_change;

@@ -869,11 +869,11 @@ 
             }

         }

 

-        echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="cat_limit" value="'.$cat_limit.'" name="cat_limit['.$cat_taxonomy.']"  />';

 

-        echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="post_category" value="'.$post_category.'" name="post_category['.$cat_taxonomy.']"  />';

 

-        echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="post_category_str" value="'.$post_category_str.'" name="post_category_str['.$cat_taxonomy.']"  />';

 

 

         ?>

@@ -892,14 +892,14 @@ 
 

             function show_subcatlist(main_cat, catObj) {

                 if (main_cat != '') {

-					var url = '<?php echo geodir_get_ajax_url();?>';

-                    var cat_taxonomy = '<?php echo $cat_taxonomy;?>';

-                    var cat_exclude = '<?php echo base64_encode($cat_exclude);?>';

+					var url = '<?php echo geodir_get_ajax_url(); ?>';

+                    var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';

+                    var cat_exclude = '<?php echo base64_encode($cat_exclude); ?>';

                     var cat_limit = jQuery('#' + cat_taxonomy).find('#cat_limit').val();

-					<?php if ((int)$cat_limit > 0) { ?>

+					<?php if ((int) $cat_limit > 0) { ?>

 					var selected = parseInt(jQuery('#' + cat_taxonomy).find('.cat_sublist > div.post_catlist_item').length);

 					if (cat_limit != '' && selected > 0 && selected >= cat_limit && cat_limit != 0) {

-						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int)$cat_limit));?>");

+						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int) $cat_limit)); ?>");

 						return false;

 					}

 					<?php } ?>

@@ -938,7 +938,7 @@ 
             }

 

             function update_listing_cat(el) {

-                var cat_taxonomy = '<?php echo $cat_taxonomy;?>';

+                var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';

                 var cat_ids = '';

                 var main_cat = '';

                 var sub_cat = '';

@@ -1019,7 +1019,7 @@ 
         <div class="main_cat_list" style=" <?php if (isset($style)) {

             echo $style;

         }?> ">

-            <?php geodir_get_catlist($cat_taxonomy, 0);  // print main categories list

+            <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list

             ?>

         </div>

     <?php

@@ -1046,9 +1046,9 @@ 
     if ($exclude != '') {

         $exclude_cats = maybe_unserialize(base64_decode($exclude));

 

-        if(is_array( $exclude_cats)){

-            $exclude_cats = array_map( 'intval', $exclude_cats );

-        }else{

+        if (is_array($exclude_cats)) {

+            $exclude_cats = array_map('intval', $exclude_cats);

+        } else {

             $exclude_cats = intval($exclude_cats);

         }

 

@@ -1062,25 +1062,25 @@ 
         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>

 

         <div class="post_catlist_item" style="border:1px solid #CCCCCC; margin:5px auto; padding:5px;">

-            <img alt="move icon" src="<?php echo geodir_plugin_url() . '/geodirectory-assets/images/move.png';?>"

+            <img alt="move icon" src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png'; ?>"

                  onclick="jQuery(this).closest('div').remove();update_listing_cat(this);" align="right"/>

             <?php /* ?>

 		<img src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png';?>" onclick="jQuery(this).closest('div').remove();show_subcatlist();" align="right" /> 

 		<?php */ ?>

 

-            <input type="checkbox" value="<?php echo $main_cat->term_id;?>" class="listing_main_cat"

+            <input type="checkbox" value="<?php echo $main_cat->term_id; ?>" class="listing_main_cat"

                    onchange="if(jQuery(this).is(':checked')){jQuery(this).closest('div').find('.post_default_category').prop('checked',false).show();}else{jQuery(this).closest('div').find('.post_default_category').prop('checked',false).hide();};update_listing_cat()"

                    checked="checked" disabled="disabled"/>

        <span> 

-        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

+        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>

         </span>

             <br/>

 

             <div class="post_default_category">

-                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>"

-                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?>   />

+                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id; ?>"

+                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" '; ?>   />

         <span> 

-        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

+        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>

         </span>

             </div>

 

@@ -1113,7 +1113,7 @@ 
         $post_cat_str = $post_categories[$request_taxonomy];

         $post_cat_array = explode("#", $post_cat_str);

         if (is_array($post_cat_array)) {

-            $post_cat_array = array_unique( $post_cat_array );

+            $post_cat_array = array_unique($post_cat_array);

 

 			foreach ($post_cat_array as $post_cat_html) {

 

@@ -1128,7 +1128,7 @@ 
                 }

                 $post_sub_catid = '';

                 if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                    $post_sub_catid = (int)$post_cat_info[1];

+                    $post_sub_catid = (int) $post_cat_info[1];

                 }

 

                 geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1149,7 +1149,7 @@ 
             }

 

             if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                $post_sub_catid = (int)$post_cat_info[1];

+                $post_sub_catid = (int) $post_cat_info[1];

             }

 

             geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1181,9 +1181,9 @@ 
         if (!$selected)

             $option_slected = ' selected="selected" ';

 

-        echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';

+        echo '<select field_type="select" id="'.sanitize_text_field($cat_taxonomy).'" class="chosen_select" '.$onchange.' option-ajaxChosen="false" >';

 

-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

+        echo '<option value="" '.$option_selected.' >'.__('Select Category', 'geodirectory').'</option>';

 

         foreach ($cat_terms as $cat_term) {

             $option_selected = '';

@@ -1191,10 +1191,10 @@ 
                 $option_selected = ' selected="selected" ';

 

             // Count child terms

-            $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

-            $has_child = !empty( $child_terms ) ? 't' : 'f';

+            $child_terms = get_terms($cat_taxonomy, array('parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1));

+            $has_child = !empty($child_terms) ? 't' : 'f';

 

-            echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>';

+            echo '<option  '.$option_selected.' alt="'.$cat_term->taxonomy.'" title="'.geodir_utf8_ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" _hc="'.$has_child.'" >'.geodir_utf8_ucfirst($cat_term->name).'</option>';

         }

         echo '</select>';

     }

@@ -1225,7 +1225,7 @@ 
             2 => __('Custom field updated.', 'geodirectory'),

             3 => __('Custom field deleted.', 'geodirectory'),

             4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),

-            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,

+            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int) $_GET['revision'], false)) : false,

             6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

             7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),

             8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

@@ -1251,7 +1251,7 @@ 
 

     global $wpdb;

 

-    $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';

+    $menu_icon = geodir_plugin_url().'/geodirectory-assets/images/favicon.ico';

 

     if (!$listing_slug = get_option('geodir_listing_prefix'))

         $listing_slug = 'places';

@@ -1264,11 +1264,11 @@ 
 

         $gd_placetags = array();

         $gd_placetags['object_type'] = 'gd_place';

-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';

+        $gd_placetags['listing_slug'] = $listing_slug.'/tags';

         $gd_placetags['args'] = array(

             'public' => true,

             'hierarchical' => false,

-            'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),

+            'rewrite' => array('slug' => $listing_slug.'/tags', 'with_front' => false, 'hierarchical' => true),

             'query_var' => true,

 

             'labels' => array(

@@ -1362,7 +1362,7 @@ 
             'menu_icon' => $menu_icon,

             'public' => true,

             'query_var' => true,

-            'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

+            'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

             'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),

             'taxonomies' => array('gd_placecategory', 'gd_place_tags'));

 

@@ -1395,12 +1395,12 @@ 
         return $_REQUEST['lang'];

     }

 

-    $url = str_replace(array("http://","https://"),"",$url);

+    $url = str_replace(array("http://", "https://"), "", $url);

 

     // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

-    $site_url = str_replace(array("http://","https://"),"",site_url());

+    $site_url = str_replace(array("http://", "https://"), "", site_url());

 

-    $url = str_replace($site_url,"",$url);

+    $url = str_replace($site_url, "", $url);

 

     $segments = explode('/', trim($url, '/'));

 

@@ -1456,7 +1456,7 @@ 
 

     global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache, $gd_cache_post;

     if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

-        if($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending'){return $post_link;}

+        if ($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending') {return $post_link; }

     } elseif (isset($post_obj->post_status) && ($post_obj->post_status == 'auto-draft' || $post_obj->post_status == 'draft' || $post_obj->post_status == 'pending')) {

         return $post_link;

     } else {

@@ -1470,9 +1470,9 @@ 
 

 

         // if we dont have a GD post then try to grab it

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

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

             $gd_post = geodir_get_post_info($post->ID);

-            if(!empty($gd_post)){

+            if (!empty($gd_post)) {

                 $post = $gd_post;

             }

         }

@@ -1482,17 +1482,17 @@ 
         $slug = $post_types[$post->post_type]['rewrite']['slug'];

 

         // Alter the CPT slug if WPML is set to do so

-        if(geodir_wpml_is_post_type_translated($post->post_type)){

-            if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

+        if (geodir_wpml_is_post_type_translated($post->post_type)) {

+            if (gd_wpml_slug_translation_turned_on($post->post_type) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

 

                 $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

+                $slug = apply_filters('wpml_translate_single_string',

                     $slug,

                     'WordPress',

-                    'URL slug: ' . $slug,

+                    'URL slug: '.$slug,

                     $language_code);

 

-                if(!$slug){$slug = $org_slug;}

+                if (!$slug) {$slug = $org_slug; }

 

             }

         }

@@ -1514,11 +1514,11 @@ 
         }

 

         $post_link = trailingslashit(

-            preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

+            preg_replace("/".preg_quote($slug, "/")."/", $slug."/%gd_taxonomy%", $post_link, 1)

         );

 

         if ($fix_url) {

-            $post_link = $site_url . $post_link;

+            $post_link = $site_url.$post_link;

         }

 

         if (isset($comment_post_cache[$post->ID])) {

@@ -1537,12 +1537,12 @@ 
             $ID = $post->ID;

             $post2 = $wpdb->get_row(

                 $wpdb->prepare(

-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                    "SELECT * from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                     array($post->ID)

                 )

             );

 

-            $post = (object)array_merge((array)$post, (array)$post2);

+            $post = (object) array_merge((array) $post, (array) $post2);

 

             $comment_post_cache[$post->ID] = $post;

         }

@@ -1551,7 +1551,7 @@ 
 

         if (false !== strpos($post_link, '%gd_taxonomy%')) {

 

-            if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {

+            if (apply_filters("geodir_add_location_url_to_url", get_option('geodir_add_location_url'), $post->post_type, $post)) {

                 $location_request = '';

 

 

@@ -1565,7 +1565,7 @@ 
                         $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                         $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                        $post_location = (object)array('country_slug' => $post->country_slug,

+                        $post_location = (object) array('country_slug' => $post->country_slug,

                             'region_slug' => $post->region_slug,

                             'city_slug' => $post->city_slug

                         );

@@ -1578,7 +1578,7 @@ 
 

                     $post_location_sql = $wpdb->get_results(

                         $wpdb->prepare(

-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                            "SELECT post_locations from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                             array($post->ID)

                         )

                     );

@@ -1594,7 +1594,7 @@ 
                             $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                             $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                            $post_location = (object)array('country_slug' => $post->country_slug,

+                            $post_location = (object) array('country_slug' => $post->country_slug,

                                 'region_slug' => $post->region_slug,

                                 'city_slug' => $post->city_slug

                             );

@@ -1623,7 +1623,7 @@ 
 					}

 					$location_slug[] = $city_slug;

 					

-					$location_request .= implode('/', $location_slug) . '/';

+					$location_request .= implode('/', $location_slug).'/';

                 }

             }

 

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

                     $post_terms = '';

 

-                    if(isset($_POST['post_default_category']) && $_POST['post_default_category']){

+                    if (isset($_POST['post_default_category']) && $_POST['post_default_category']) {

                         $post_terms = absint($_POST['post_default_category']);

-                    }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {

+                    }elseif (isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {

                         $post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));

                         $post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0;

                     }elseif (isset($post->{$taxonomies})) {

@@ -1686,14 +1686,14 @@ 
             $request_term = trim($request_term, '/');

             

             // Fix with WPML the location terms added twice when CPT slug is translated.

-            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {

+            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/'.$request_term.$detailurl_separator) !== false) {

                 $post_link = str_replace('%gd_taxonomy%/', '', $post_link);

             }

             

             if (!empty($request_term))

-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+                $post_link = str_replace('%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);

             else

-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+                $post_link = str_replace('/%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);

             //echo $post_link ;

         }

         // temp cache the permalink

@@ -1787,9 +1787,9 @@ 
                 $url_separator = '';

 

                 if (get_option('permalink_structure') != '') {

-                    $old_listing_slug = '/' . $listing_slug . '/';

+                    $old_listing_slug = '/'.$listing_slug.'/';

                     $request_term = implode("/", $location_terms);

-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

+                    $new_listing_slug = '/'.$listing_slug.'/'.$request_term.'/';

 

                     $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

                 } else {

@@ -1809,25 +1809,25 @@ 
         // Alter the CPT slug if WPML is set to do so

         if (geodir_is_wpml()) {

             $post_types = get_option('geodir_post_types');

-            $post_type = str_replace("category","",$taxonomy);

-            $post_type = str_replace("_tags","",$post_type);

+            $post_type = str_replace("category", "", $taxonomy);

+            $post_type = str_replace("_tags", "", $post_type);

             $slug = $post_types[$post_type]['rewrite']['slug'];

             if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {

                 global $sitepress;

                 $default_lang = $sitepress->get_default_language();

                 $language_code = gd_wpml_get_lang_from_url($termlink);

-                if (!$language_code ) {

-                    $language_code  = $default_lang;

+                if (!$language_code) {

+                    $language_code = $default_lang;

                 }

 

                 $org_slug = $slug;

-                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);

+                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: '.$slug, $language_code);

 

                 if (!$slug) {

                     $slug = $org_slug;

                 }

 

-                $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug  ,$termlink, 1));

+                $termlink = trailingslashit(preg_replace("/".preg_quote($org_slug, "/")."/", $slug, $termlink, 1));

             }

         }

     }

@@ -1857,7 +1857,7 @@ 
 	

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

 		if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {

-			if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

+			if (geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

@@ -1874,7 +1874,7 @@ 
 					$location_terms = implode("/", $location_terms);

 					$location_terms = rtrim($location_terms, '/');

 					

-					$link .= urldecode($location_terms) . '/';

+					$link .= urldecode($location_terms).'/';

 				} else {

 					$link = geodir_getlink($link, $location_terms);

 				}

@@ -1962,9 +1962,9 @@ 
             return 0;

         $where = 't.term_id = %d';

         if (!empty($taxonomy))

-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

+            return $wpdb->get_row($wpdb->prepare($tax_select.$where." AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

         else

-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));

+            return $wpdb->get_var($wpdb->prepare($select.$where, $term));

     }

 

     $term = trim(wp_unslash($term));

@@ -1976,7 +1976,7 @@ 
 

     $where_fields = array($slug);

     if (!empty($taxonomy)) {

-        $parent = (int)$parent;

+        $parent = (int) $parent;

         if ($parent > 0) {

             $where_fields[] = $parent;

             $else_where_fields[] = $parent;

@@ -2040,13 +2040,13 @@ 
         $post_types = geodir_get_posttypes();

         $tax_arr = array();

         foreach ($post_types as $post_type) {

-            $tax_arr[] = "'" . $post_type . "category'";

+            $tax_arr[] = "'".$post_type."category'";

         }

         $tax_c = implode(',', $tax_arr);

         $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

         //$terms = get_terms( $taxonomy );

 

-        if($terms) {

+        if ($terms) {

             foreach ($terms as $term) {

                 $post_type = str_replace("category", "", $term->taxonomy);

                 $a_terms[$post_type][] = $term;

@@ -2054,7 +2054,7 @@ 
             }

         }

 

-        if($a_terms) {

+        if ($a_terms) {

             foreach ($a_terms as $pt => $t2) {

 

                 foreach ($t2 as $term) {

@@ -2079,7 +2079,7 @@ 
     }

 

     if (is_ssl()) {

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

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

     }

 

     return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

geodirectory-functions/map-functions/get_markers.php

Indentation +438 added lines, -438 removed lines

@@ -8,8 +8,8 @@ 
 

 // Enable map cache if set

 if(get_option('geodir_enable_map_cache')){

-    add_filter('geodir_get_markers_cache','geodir_get_map_cache');

-    add_filter('geodir_markers_json','geodir_save_map_cache',10);

+	add_filter('geodir_get_markers_cache','geodir_get_map_cache');

+	add_filter('geodir_markers_json','geodir_save_map_cache',10);

 }

 

 

@@ -23,59 +23,59 @@ 
  */

 function geodir_get_map_cache($cache){

 

-    // if a search is going on then dont even try to check for cache.

-    if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

-        return $cache;

-    }

+	// if a search is going on then dont even try to check for cache.

+	if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

+		return $cache;

+	}

 

-    $url_params = array();

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

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

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

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

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

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

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

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

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

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

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

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

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

+	$url_params = array();

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

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

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

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

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

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

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

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

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

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

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

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

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

 

-    $file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

+	$file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

 

-    $blog_id = get_current_blog_id();

-    if($blog_id>1){

-        $file_name = $blog_id."_".$file_name;

-    }

+	$blog_id = get_current_blog_id();

+	if($blog_id>1){

+		$file_name = $blog_id."_".$file_name;

+	}

 

-    $file_path = realpath(dirname(__FILE__))."/map-cache/";

+	$file_path = realpath(dirname(__FILE__))."/map-cache/";

 

 

-    if(file_exists($file_path.$file_name.".json")){

+	if(file_exists($file_path.$file_name.".json")){

 

 

-        ob_start();

-        readfile($file_path.$file_name.".json"); // readfile is quicker then file get contents

-        $content = ob_get_clean();

+		ob_start();

+		readfile($file_path.$file_name.".json"); // readfile is quicker then file get contents

+		$content = ob_get_clean();

 

-        // do the cache delete stuff

-        $cache_time = get_option('geodir_map_cache');

-        if(!$cache_time){

-            $cache_time = time();

-            update_option('geodir_map_cache', $cache_time);

-        }

+		// do the cache delete stuff

+		$cache_time = get_option('geodir_map_cache');

+		if(!$cache_time){

+			$cache_time = time();

+			update_option('geodir_map_cache', $cache_time);

+		}

 

-        if((time() - $cache_time) > 86400){ // delete the cache every 24 hours

-            geodir_delete_map_cache();

-        }

+		if((time() - $cache_time) > 86400){ // delete the cache every 24 hours

+			geodir_delete_map_cache();

+		}

 

-        return $content;

+		return $content;

 

-    }

+	}

 

-    return $cache;

+	return $cache;

 }

 

 

@@ -88,101 +88,101 @@ 
  */

 function geodir_save_map_cache($map_json){

 

-    // if a search is going on then dont even try to check for cache.

-    if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

-        return $map_json;

-    }

-

-    $url_params = array();

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

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

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

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

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

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

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

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

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

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

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

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

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

-

-    $file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

-

-    $blog_id = get_current_blog_id();

-    if($blog_id>1){

-        $file_name = $blog_id."_".$file_name;

-    }

-

-    $file_path = realpath(dirname(__FILE__))."/map-cache/";

-

-

-    global $wp_filesystem;

-    if (empty($wp_filesystem)) {

-        require_once (ABSPATH . '/wp-admin/includes/file.php');

-        WP_Filesystem();

-    }

-    $wp_filesystem->put_contents(

-        $file_path.$file_name.".json",

-        $map_json,

-        FS_CHMOD_FILE // predefined mode settings for WP files

-    );

-

-

-    return $map_json;

+	// if a search is going on then dont even try to check for cache.

+	if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

+		return $map_json;

+	}

+

+	$url_params = array();

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

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

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

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

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

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

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

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

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

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

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

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

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

+

+	$file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

+

+	$blog_id = get_current_blog_id();

+	if($blog_id>1){

+		$file_name = $blog_id."_".$file_name;

+	}

+

+	$file_path = realpath(dirname(__FILE__))."/map-cache/";

+

+

+	global $wp_filesystem;

+	if (empty($wp_filesystem)) {

+		require_once (ABSPATH . '/wp-admin/includes/file.php');

+		WP_Filesystem();

+	}

+	$wp_filesystem->put_contents(

+		$file_path.$file_name.".json",

+		$map_json,

+		FS_CHMOD_FILE // predefined mode settings for WP files

+	);

+

+

+	return $map_json;

 

 }

 

 

 if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'homemap_catlist') {

-    global $gd_session;

-    $gd_post_type = sanitize_text_field($_REQUEST['post_type']);

-    $gd_session->set('homemap_catlist_ptype', $gd_post_type);

-    $post_taxonomy = geodir_get_taxonomies($gd_post_type);

-    $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']);

-    $child_collapse = (bool)$_REQUEST['child_collapse'];

-    echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true);

-    die;

+	global $gd_session;

+	$gd_post_type = sanitize_text_field($_REQUEST['post_type']);

+	$gd_session->set('homemap_catlist_ptype', $gd_post_type);

+	$post_taxonomy = geodir_get_taxonomies($gd_post_type);

+	$map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']);

+	$child_collapse = (bool)$_REQUEST['child_collapse'];

+	echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true);

+	die;

 }

 

 // Send the content-type header with correct encoding

 header("Content-type: text/javascript; charset=utf-8");

 

 if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'cat') { // Retrives markers data for categories

-    echo get_markers();

-    exit;

+	echo get_markers();

+	exit;

 } else if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'info') { // Retrives marker info window html

-    /**

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @global object $gd_session GeoDirectory Session object.

-     */

-    global $wpdb, $plugin_prefix, $gd_session, $sitepress;

+	/**

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @global object $gd_session GeoDirectory Session object.

+	 */

+	global $wpdb, $plugin_prefix, $gd_session, $sitepress;

 

-    if ($_REQUEST['m_id'] != '') {

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

-    } else {

-        echo __('No marker data found', 'geodirectory');

-        exit;

-    }

+	if ($_REQUEST['m_id'] != '') {

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

+	} else {

+		echo __('No marker data found', 'geodirectory');

+		exit;

+	}

 

-    if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {

-        $post = (object)$gd_ses_listing;

-        echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']);

-    } else {

-        $geodir_post_type = get_post_type($pid);

+	if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {

+		$post = (object)$gd_ses_listing;

+		echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']);

+	} else {

+		$geodir_post_type = get_post_type($pid);

 

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

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

 

-        $sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));

+		$sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));

 

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

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

 

-        $data_arr = array();

+		$data_arr = array();

 

-        if ($postinfo) {

-            $switch_lang = false;

+		if ($postinfo) {

+			$switch_lang = false;

 			if ( geodir_is_wpml() && is_post_type_translated( $geodir_post_type ) ) {

 				$post_lang = $sitepress->get_language_for_element( $pid, 'post_' . $geodir_post_type );

 				$current_lang = $sitepress->get_current_language();

@@ -193,18 +193,18 @@ 
 			}

 

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

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

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

 

-            foreach ($postinfo as $postinfo_obj) {

-                echo geodir_get_infowindow_html($postinfo_obj);

-            }

+			foreach ($postinfo as $postinfo_obj) {

+				echo geodir_get_infowindow_html($postinfo_obj);

+			}

 

 			if ( $switch_lang !== false ) {

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

 			}

-        }

-    }

-    exit;

+		}

+	}

+	exit;

 }

 

 /**

@@ -223,93 +223,93 @@ 
  */

 function get_markers() {

     

-    global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session;

+	global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session;

 

 

-    /**

-     * Filter to allow for any map caching to be output before queries.

-     *

-     * @since 1.6.22

-     */

-    $map_cache = apply_filters('geodir_get_markers_cache','');

-    if($map_cache){

-        return $map_cache;

-        wp_die();

-    }

+	/**

+	 * Filter to allow for any map caching to be output before queries.

+	 *

+	 * @since 1.6.22

+	 */

+	$map_cache = apply_filters('geodir_get_markers_cache','');

+	if($map_cache){

+		return $map_cache;

+		wp_die();

+	}

 

 

 

-    $search = '';

+	$search = '';

 

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

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

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

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

 

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

+	$post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place';

 

-    $map_cat_ids_array = array('0');

-    $cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");

+	$map_cat_ids_array = array('0');

+	$cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");

 

 

-    $field_default_cat = '';

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

-        $map_cat_arr = trim($_REQUEST['cat_id'], ',');

+	$field_default_cat = '';

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

+		$map_cat_arr = trim($_REQUEST['cat_id'], ',');

 

-        if (!empty($map_cat_arr)) {

-            $field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";

+		if (!empty($map_cat_arr)) {

+			$field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";

 

-            $map_cat_ids_array = explode(',', $map_cat_arr);

-            $cat_find_array = array();

-            foreach ($map_cat_ids_array as $cat_id) {

-                $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id ";

-                $cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)";

-                $main_query_array[] = $cat_id;

-            }

+			$map_cat_ids_array = explode(',', $map_cat_arr);

+			$cat_find_array = array();

+			foreach ($map_cat_ids_array as $cat_id) {

+				$field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id ";

+				$cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)";

+				$main_query_array[] = $cat_id;

+			}

 

-        }

-    }

+		}

+	}

 

-    if (!empty($field_default_cat))

-        $field_default_cat = '';

+	if (!empty($field_default_cat))

+		$field_default_cat = '';

 

-    if (!empty($cat_find_array))

-        $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";

+	if (!empty($cat_find_array))

+		$search .= "AND (" . implode(' OR ', $cat_find_array) . ")";

 

-    $main_query_array = $map_cat_ids_array;

+	$main_query_array = $map_cat_ids_array;

   

-    if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {

-        $search .= " AND p.post_title LIKE %s";

-        $main_query_array[] = "%" . $_REQUEST['search'] . "%";

-    }

-

-    /**

-     * Filter the marker query search SQL, values are replaces with %s or %d.

-     *

-     * @since 1.5.3

-     *

-     * @param string $search The SQL query for search/where.

-     */

-    $search = apply_filters('geodir_marker_search', $search);

-    /**

-     * Filter the marker query search SQL values %s and %d, this is an array of values.

-     *

-     * @since 1.5.3

-     *

-     * @param array $main_query_array The SQL query values for search/where.

-     */

-    $main_query_array = apply_filters('geodir_marker_main_query_array', $main_query_array);

-

-    $gd_posttype = '';

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

-        $table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail';

-        $gd_posttype = " AND p.post_type = %s";

-        $main_query_array[] = $_REQUEST['gd_posttype'];

-

-    } else

-        $table = $plugin_prefix . 'gd_place_detail';

-

-    $join = ", " . $table . " AS pd ";

-

-    /**

+	if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {

+		$search .= " AND p.post_title LIKE %s";

+		$main_query_array[] = "%" . $_REQUEST['search'] . "%";

+	}

+

+	/**

+	 * Filter the marker query search SQL, values are replaces with %s or %d.

+	 *

+	 * @since 1.5.3

+	 *

+	 * @param string $search The SQL query for search/where.

+	 */

+	$search = apply_filters('geodir_marker_search', $search);

+	/**

+	 * Filter the marker query search SQL values %s and %d, this is an array of values.

+	 *

+	 * @since 1.5.3

+	 *

+	 * @param array $main_query_array The SQL query values for search/where.

+	 */

+	$main_query_array = apply_filters('geodir_marker_main_query_array', $main_query_array);

+

+	$gd_posttype = '';

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

+		$table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail';

+		$gd_posttype = " AND p.post_type = %s";

+		$main_query_array[] = $_REQUEST['gd_posttype'];

+

+	} else

+		$table = $plugin_prefix . 'gd_place_detail';

+

+	$join = ", " . $table . " AS pd ";

+

+	/**

 	 * Filter the SQL JOIN clause for the markers data

 	 *

 	 * @since 1.0.0

@@ -326,16 +326,16 @@ 
 	 * @param string $search Row of searched fields to use in WHERE clause.

 	 */

 	$search = apply_filters('geodir_home_map_listing_where', $search);

-    $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);

-    $cat_type = $post_type . 'category';

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

-        $event_select = ", pd.recurring_dates, pd.is_recurring";

-    } else {

-        $event_select = "";

-    }

-

-    $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select;

-    /**

+	$search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);

+	$cat_type = $post_type . 'category';

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

+		$event_select = ", pd.recurring_dates, pd.is_recurring";

+	} else {

+		$event_select = "";

+	}

+

+	$sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select;

+	/**

 	 * Filter the SQL SELECT clause to retrive fields data

 	 *

 	 * @since 1.0.0

@@ -354,7 +354,7 @@ 
 	 */

 	$groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);

 

-    $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);

+	$catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);

     

 	/**

 	 * Filter the SQL query to retrive markers data

@@ -370,276 +370,276 @@ 
 //    print_r($gd_session);

 //    print_r($_SESSION);

 

-    $catinfo = $wpdb->get_results($catsql);

+	$catinfo = $wpdb->get_results($catsql);

 	

-    $cat_content_info = array();

-    $content_data = array();

-    $post_ids = array();

-

-    /**

-     * Called before marker data is processed into JSON.

-     *

-     * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

-     *

-     * @since 1.5.3

-     * @param object $catinfo The posts object containing all marker data.

-     * @see 'geodir_after_marker_post_process'

-     */

-    $catinfo = apply_filters('geodir_before_marker_post_process', $catinfo);

-

-    /**

-     * Called before marker data is processed into JSON.

-     *

-     * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

-     *

-     * @since 1.4.9

-     * @param object $catinfo The posts object containing all marker data.

-     * @see 'geodir_after_marker_post_process'

-     */

-    do_action('geodir_before_marker_post_process_action', $catinfo);

-

-    // Sort any posts into a ajax array

-    if (!empty($catinfo)) {

-        $geodir_cat_icons = geodir_get_term_icon();

-        global $geodir_date_time_format, $geodir_date_format, $geodir_time_format;

-

-        $today = strtotime(date_i18n('Y-m-d'));

-        $show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;

+	$cat_content_info = array();

+	$content_data = array();

+	$post_ids = array();

+

+	/**

+	 * Called before marker data is processed into JSON.

+	 *

+	 * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

+	 *

+	 * @since 1.5.3

+	 * @param object $catinfo The posts object containing all marker data.

+	 * @see 'geodir_after_marker_post_process'

+	 */

+	$catinfo = apply_filters('geodir_before_marker_post_process', $catinfo);

+

+	/**

+	 * Called before marker data is processed into JSON.

+	 *

+	 * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers.

+	 *

+	 * @since 1.4.9

+	 * @param object $catinfo The posts object containing all marker data.

+	 * @see 'geodir_after_marker_post_process'

+	 */

+	do_action('geodir_before_marker_post_process_action', $catinfo);

+

+	// Sort any posts into a ajax array

+	if (!empty($catinfo)) {

+		$geodir_cat_icons = geodir_get_term_icon();

+		global $geodir_date_time_format, $geodir_date_format, $geodir_time_format;

+

+		$today = strtotime(date_i18n('Y-m-d'));

+		$show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;

         

-        foreach ($catinfo as $catinfo_obj) {

-            $post_title = $catinfo_obj->post_title;

+		foreach ($catinfo as $catinfo_obj) {

+			$post_title = $catinfo_obj->post_title;

             

-            if ($post_type == 'gd_event' && !empty($catinfo_obj->recurring_dates) && $show_dates > 0) {

-                $event_dates = '';

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

+			if ($post_type == 'gd_event' && !empty($catinfo_obj->recurring_dates) && $show_dates > 0) {

+				$event_dates = '';

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

 

-                $post_info = geodir_get_post_info($catinfo_obj->post_id);

+				$post_info = geodir_get_post_info($catinfo_obj->post_id);

                 

-                if (!empty($catinfo_obj->is_recurring) && !empty($recurring_data) && !empty($recurring_data['is_recurring']) && geodir_event_recurring_pkg($post_info)) {

-                    $starttimes = '';

-                    $endtimes = '';

-                    $astarttimes = array();

-                    $aendtimes = array();

-                    if ( !isset( $recurring_data['repeat_type'] ) ) {

-                        $recurring_data['repeat_type'] = 'custom';

-                    }

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

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

+				if (!empty($catinfo_obj->is_recurring) && !empty($recurring_data) && !empty($recurring_data['is_recurring']) && geodir_event_recurring_pkg($post_info)) {

+					$starttimes = '';

+					$endtimes = '';

+					$astarttimes = array();

+					$aendtimes = array();

+					if ( !isset( $recurring_data['repeat_type'] ) ) {

+						$recurring_data['repeat_type'] = 'custom';

+					}

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

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

         

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

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

                     

-                    if ( !empty( $recurring_dates ) ) {

-                        if ( empty( $recurring_data['all_day'] ) ) {

-                            if ( $repeat_type == 'custom' && $different_times ) {

-                                $astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

-                                $aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

-                            } else {

-                                $starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

-                                $endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

-                            }

-                        }

+					if ( !empty( $recurring_dates ) ) {

+						if ( empty( $recurring_data['all_day'] ) ) {

+							if ( $repeat_type == 'custom' && $different_times ) {

+								$astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

+								$aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

+							} else {

+								$starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

+								$endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

+							}

+						}

                         

-                        $e = 0;

-                        foreach( $recurring_dates as $key => $date ) {

-                            if ( $repeat_type == 'custom' && $different_times ) {

-                                if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {

-                                    $starttimes = $astarttimes[$key];

-                                    $endtimes = $aendtimes[$key];

-                                } else {

-                                    $starttimes = '';

-                                    $endtimes = '';

-                                }

-                            }

+						$e = 0;

+						foreach( $recurring_dates as $key => $date ) {

+							if ( $repeat_type == 'custom' && $different_times ) {

+								if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {

+									$starttimes = $astarttimes[$key];

+									$endtimes = $aendtimes[$key];

+								} else {

+									$starttimes = '';

+									$endtimes = '';

+								}

+							}

                             

-                            $duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1;

-                            $duration--;

-                            $enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) );

+							$duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1;

+							$duration--;

+							$enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) );

                             

-                            // Hide past dates

-                            if ( strtotime( $enddate ) < $today ) {

-                                continue;

-                            }

+							// Hide past dates

+							if ( strtotime( $enddate ) < $today ) {

+								continue;

+							}

                                     

-                            $sdate = strtotime( $date . ' ' . $starttimes );

-                            $edate = strtotime( $enddate . ' ' . $endtimes );

+							$sdate = strtotime( $date . ' ' . $starttimes );

+							$edate = strtotime( $enddate . ' ' . $endtimes );

                                         

-                            $start_date = date_i18n( $geodir_date_time_format, $sdate );

-                            $end_date = date_i18n( $geodir_date_time_format, $edate );

+							$start_date = date_i18n( $geodir_date_time_format, $sdate );

+							$end_date = date_i18n( $geodir_date_time_format, $edate );

                             

-                            $same_day = false;

-                            $full_day = false;

-                            $same_datetime = false;

+							$same_day = false;

+							$full_day = false;

+							$same_datetime = false;

                             

-                            if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {

-                                $full_day = true;

-                            }

+							if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {

+								$full_day = true;

+							}

                             

-                            if ( $start_date == $end_date && $full_day ) {

-                                $same_datetime = true;

-                            }

-

-                            $link_date = date_i18n( 'Y-m-d', $sdate );

-                            $title_date = date_i18n( $geodir_date_format, $sdate );

-                            if ( $full_day ) {

-                                $start_date = $title_date;

-                                $end_date = date_i18n( $geodir_date_format, $edate );

-                            }

+							if ( $start_date == $end_date && $full_day ) {

+								$same_datetime = true;

+							}

+

+							$link_date = date_i18n( 'Y-m-d', $sdate );

+							$title_date = date_i18n( $geodir_date_format, $sdate );

+							if ( $full_day ) {

+								$start_date = $title_date;

+								$end_date = date_i18n( $geodir_date_format, $edate );

+							}

                             

-                            if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {

-                                $same_day = true;

+							if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {

+								$same_day = true;

                                 

-                                $start_date .= ' - ' . date_i18n( $geodir_time_format, $edate );

-                            }

+								$start_date .= ' - ' . date_i18n( $geodir_time_format, $edate );

+							}

                             

-                            $event_dates .= ' :: ' . $start_date;

+							$event_dates .= ' :: ' . $start_date;

                         

-                            if ( !$same_day && !$same_datetime ) {

-                                $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

-                            }

+							if ( !$same_day && !$same_datetime ) {

+								$event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

+							}

                             

-                            $e++;

+							$e++;

                             

-                            if ($show_dates > 0 && $e == $show_dates) { // only show 3 event dates

-                                break;

-                            }

-                        }

-                    }

-                } else {

-                    $start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : '';

-                    $end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date;

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

-                    $starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

-                    $endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

+							if ($show_dates > 0 && $e == $show_dates) { // only show 3 event dates

+								break;

+							}

+						}

+					}

+				} else {

+					$start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : '';

+					$end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date;

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

+					$starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

+					$endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

                 

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

-                    $starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

-                    $endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

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

+					$starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

+					$endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

                     

-                    if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {

-                        $start_date = $event_recurring_dates[0];

-                    }

+					if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {

+						$start_date = $event_recurring_dates[0];

+					}

                                 

-                    if ( strtotime( $end_date ) < strtotime( $start_date ) ) {

-                        $end_date = $start_date;

-                    }

+					if ( strtotime( $end_date ) < strtotime( $start_date ) ) {

+						$end_date = $start_date;

+					}

                     

-                    if ($end_date != '' && strtotime($end_date) >= $today) {

-                        if ( $starttime == '' && !empty( $starttimes ) ) {

-                            $starttime = $starttimes[0];

-                            $endtime = $endtimes[0];

-                        }

+					if ($end_date != '' && strtotime($end_date) >= $today) {

+						if ( $starttime == '' && !empty( $starttimes ) ) {

+							$starttime = $starttimes[0];

+							$endtime = $endtimes[0];

+						}

                         

-                        $same_day = false;

-                        $one_day = false;

-                        if ( $start_date == $end_date && $all_day ) {

-                            $one_day = true;

-                        }

-

-                        if ( $all_day ) {

-                            $start_datetime = strtotime( $start_date );

-                            $end_datetime = strtotime( $end_date );

+						$same_day = false;

+						$one_day = false;

+						if ( $start_date == $end_date && $all_day ) {

+							$one_day = true;

+						}

+

+						if ( $all_day ) {

+							$start_datetime = strtotime( $start_date );

+							$end_datetime = strtotime( $end_date );

                             

-                            $start_date = date_i18n( $geodir_date_format, $start_datetime );

-                            $end_date = date_i18n( $geodir_date_format, $end_datetime );

-                            if ( $start_date == $end_date ) {

-                                $one_day = true;

-                            }

-                        } else {

-                            if ( $start_date == $end_date && $starttime == $endtime ) {

-                                $end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) );

-                                $one_day = false;

-                            }

-                            $start_datetime = strtotime( $start_date . ' ' . $starttime );

-                            $end_datetime = strtotime( $end_date . ' ' . $endtime );

+							$start_date = date_i18n( $geodir_date_format, $start_datetime );

+							$end_date = date_i18n( $geodir_date_format, $end_datetime );

+							if ( $start_date == $end_date ) {

+								$one_day = true;

+							}

+						} else {

+							if ( $start_date == $end_date && $starttime == $endtime ) {

+								$end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) );

+								$one_day = false;

+							}

+							$start_datetime = strtotime( $start_date . ' ' . $starttime );

+							$end_datetime = strtotime( $end_date . ' ' . $endtime );

                             

-                            $start_date = date_i18n( $geodir_date_time_format, $start_datetime );

-                            $end_date = date_i18n( $geodir_date_time_format, $end_datetime );

-                        }

+							$start_date = date_i18n( $geodir_date_time_format, $start_datetime );

+							$end_date = date_i18n( $geodir_date_time_format, $end_datetime );

+						}

 

-                        if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {

-                            $same_day = true;

+						if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {

+							$same_day = true;

                             

-                            $start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime );

-                        }

+							$start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime );

+						}

                         

-                        $event_dates .= ' :: ' . $start_date;

+						$event_dates .= ' :: ' . $start_date;

                         

-                        if ( !$same_day && !$one_day ) {

-                            $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

-                        }

-                    }

-                }

-

-                if (empty($event_dates)) {

-                    continue;

-                }

+						if ( !$same_day && !$one_day ) {

+							$event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

+						}

+					}

+				}

+

+				if (empty($event_dates)) {

+					continue;

+				}

                 

-                $post_title .= $event_dates;

-            }

+				$post_title .= $event_dates;

+			}

 

-            $map_cat_ids_array;

-            $default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : '';

+			$map_cat_ids_array;

+			$default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : '';

 

-            // if single cat lets just show that icon

-            if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){

-                $default_cat = (int)$map_cat_ids_array[0];

-            }

+			// if single cat lets just show that icon

+			if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){

+				$default_cat = (int)$map_cat_ids_array[0];

+			}

 

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

-            $mark_extra = (isset($catinfo_obj->marker_extra)) ? $catinfo_obj->marker_extra : '';

-            $title = str_replace($srcharr, $replarr, $post_title);

+			$icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : '';

+			$mark_extra = (isset($catinfo_obj->marker_extra)) ? $catinfo_obj->marker_extra : '';

+			$title = str_replace($srcharr, $replarr, $post_title);

             

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

-            }

-

-            $content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';

-            $post_ids[] = $catinfo_obj->post_id;

-        }

-    }

-

-    /**

-     * Called after marker data is processed into JSON.

-     *

-     * Called after marker data is processed into JSON, this action can be used to change the format or add/remove markers.

-     *

-     * @since 1.4.9

-     * @param array $content_data The array containing all markers in JSON format.

-     * @param object $catinfo The posts object containing all marker data.

-     * @see 'geodir_before_marker_post_process'

-     */

-    do_action('geodir_after_marker_post_process', $content_data, $catinfo);

-

-    if (!empty($content_data)) {

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

-    }

-

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

-

-    if (!empty($cat_content_info)) {

-        $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';

-    }

-    else {

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

-    }

-

-

-    /**

-     * Filter the marker json return.

-     *

-     * @since 1.6.22

-     * @param string $map_json The JSON string of the map markers results.

-     */

-    return apply_filters('geodir_markers_json',$map_json);

+				if (isset($gd_marker_sizes[$icon])) {

+					$icon_size = $gd_marker_sizes[$icon];

+				} else {

+					$icon_size = geodir_get_marker_size($icon);

+					$gd_marker_sizes[$icon] = $icon_size;

+				}               

+			} else {

+				$icon_size = array('w' => 36, 'h' => 45);

+			}

+

+			$content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';

+			$post_ids[] = $catinfo_obj->post_id;

+		}

+	}

+

+	/**

+	 * Called after marker data is processed into JSON.

+	 *

+	 * Called after marker data is processed into JSON, this action can be used to change the format or add/remove markers.

+	 *

+	 * @since 1.4.9

+	 * @param array $content_data The array containing all markers in JSON format.

+	 * @param object $catinfo The posts object containing all marker data.

+	 * @see 'geodir_before_marker_post_process'

+	 */

+	do_action('geodir_after_marker_post_process', $content_data, $catinfo);

+

+	if (!empty($content_data)) {

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

+	}

+

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

+

+	if (!empty($cat_content_info)) {

+		$map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';

+	}

+	else {

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

+	}

+

+

+	/**

+	 * Filter the marker json return.

+	 *

+	 * @since 1.6.22

+	 * @param string $map_json The JSON string of the map markers results.

+	 */

+	return apply_filters('geodir_markers_json',$map_json);

 }

 

 

Spacing +108 added lines, -108 removed lines

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

 

 // Enable map cache if set

-if(get_option('geodir_enable_map_cache')){

-    add_filter('geodir_get_markers_cache','geodir_get_map_cache');

-    add_filter('geodir_markers_json','geodir_save_map_cache',10);

+if (get_option('geodir_enable_map_cache')) {

+    add_filter('geodir_get_markers_cache', 'geodir_get_map_cache');

+    add_filter('geodir_markers_json', 'geodir_save_map_cache', 10);

 }

 

 

@@ -21,10 +21,10 @@ 
  * @since 1.6.22

  * @return string

  */

-function geodir_get_map_cache($cache){

+function geodir_get_map_cache($cache) {

 

     // if a search is going on then dont even try to check for cache.

-    if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

+    if (isset($_REQUEST['search']) && !empty($_REQUEST['search'])) {

         return $cache;

     }

 

@@ -43,17 +43,17 @@ 
     $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : '';

     $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : '';

 

-    $file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

+    $file_name = sanitize_file_name(md5(implode("-", $url_params)));

 

     $blog_id = get_current_blog_id();

-    if($blog_id>1){

+    if ($blog_id > 1) {

         $file_name = $blog_id."_".$file_name;

     }

 

     $file_path = realpath(dirname(__FILE__))."/map-cache/";

 

 

-    if(file_exists($file_path.$file_name.".json")){

+    if (file_exists($file_path.$file_name.".json")) {

 

 

         ob_start();

@@ -62,12 +62,12 @@ 
 

         // do the cache delete stuff

         $cache_time = get_option('geodir_map_cache');

-        if(!$cache_time){

+        if (!$cache_time) {

             $cache_time = time();

             update_option('geodir_map_cache', $cache_time);

         }

 

-        if((time() - $cache_time) > 86400){ // delete the cache every 24 hours

+        if ((time() - $cache_time) > 86400) { // delete the cache every 24 hours

             geodir_delete_map_cache();

         }

 

@@ -86,10 +86,10 @@ 
  * @since 1.6.22

  * @return mixed

  */

-function geodir_save_map_cache($map_json){

+function geodir_save_map_cache($map_json) {

 

     // if a search is going on then dont even try to check for cache.

-    if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){

+    if (isset($_REQUEST['search']) && !empty($_REQUEST['search'])) {

         return $map_json;

     }

 

@@ -108,10 +108,10 @@ 
     $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : '';

     $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : '';

 

-    $file_name = sanitize_file_name( md5( implode("-",$url_params) )  );

+    $file_name = sanitize_file_name(md5(implode("-", $url_params)));

 

     $blog_id = get_current_blog_id();

-    if($blog_id>1){

+    if ($blog_id > 1) {

         $file_name = $blog_id."_".$file_name;

     }

 

@@ -120,7 +120,7 @@ 
 

     global $wp_filesystem;

     if (empty($wp_filesystem)) {

-        require_once (ABSPATH . '/wp-admin/includes/file.php');

+        require_once (ABSPATH.'/wp-admin/includes/file.php');

         WP_Filesystem();

     }

     $wp_filesystem->put_contents(

@@ -141,7 +141,7 @@ 
     $gd_session->set('homemap_catlist_ptype', $gd_post_type);

     $post_taxonomy = geodir_get_taxonomies($gd_post_type);

     $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']);

-    $child_collapse = (bool)$_REQUEST['child_collapse'];

+    $child_collapse = (bool) $_REQUEST['child_collapse'];

     echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true);

     die;

 }

@@ -161,21 +161,21 @@ 
     global $wpdb, $plugin_prefix, $gd_session, $sitepress;

 

     if ($_REQUEST['m_id'] != '') {

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

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

     } else {

         echo __('No marker data found', 'geodirectory');

         exit;

     }

 

     if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {

-        $post = (object)$gd_ses_listing;

+        $post = (object) $gd_ses_listing;

         echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']);

     } else {

         $geodir_post_type = get_post_type($pid);

 

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

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

 

-        $sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));

+        $sql = $wpdb->prepare("SELECT * FROM ".$table." WHERE post_id = %d", array($pid));

 

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

 

@@ -183,11 +183,11 @@ 
 

         if ($postinfo) {

             $switch_lang = false;

-			if ( geodir_is_wpml() && is_post_type_translated( $geodir_post_type ) ) {

-				$post_lang = $sitepress->get_language_for_element( $pid, 'post_' . $geodir_post_type );

+			if (geodir_is_wpml() && is_post_type_translated($geodir_post_type)) {

+				$post_lang = $sitepress->get_language_for_element($pid, 'post_'.$geodir_post_type);

 				$current_lang = $sitepress->get_current_language();

-				if ( $post_lang !== $current_lang ) {

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

+				if ($post_lang !== $current_lang) {

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

 					$switch_lang = $current_lang;

 				}

 			}

@@ -199,8 +199,8 @@ 
                 echo geodir_get_infowindow_html($postinfo_obj);

             }

 

-			if ( $switch_lang !== false ) {

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

+			if ($switch_lang !== false) {

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

 			}

         }

     }

@@ -223,7 +223,7 @@ 
  */

 function get_markers() {

     

-    global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session;

+    global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes, $gd_session;

 

 

     /**

@@ -231,8 +231,8 @@ 
      *

      * @since 1.6.22

      */

-    $map_cache = apply_filters('geodir_get_markers_cache','');

-    if($map_cache){

+    $map_cache = apply_filters('geodir_get_markers_cache', '');

+    if ($map_cache) {

         return $map_cache;

         wp_die();

     }

@@ -247,7 +247,7 @@ 
     $post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place';

 

     $map_cat_ids_array = array('0');

-    $cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");

+    $cat_find_array = array(" FIND_IN_SET(%d, pd.".$post_type."category)");

 

 

     $field_default_cat = '';

@@ -255,13 +255,13 @@ 
         $map_cat_arr = trim($_REQUEST['cat_id'], ',');

 

         if (!empty($map_cat_arr)) {

-            $field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";

+            $field_default_cat .= "WHEN (default_category IN (".$map_cat_arr.")) THEN default_category ";

 

             $map_cat_ids_array = explode(',', $map_cat_arr);

             $cat_find_array = array();

             foreach ($map_cat_ids_array as $cat_id) {

-                $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id ";

-                $cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)";

+                $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `".$post_type."category`) > 0) THEN $cat_id ";

+                $cat_find_array[] = " FIND_IN_SET(%d, pd.".$post_type."category)";

                 $main_query_array[] = $cat_id;

             }

 

@@ -272,13 +272,13 @@ 
         $field_default_cat = '';

 

     if (!empty($cat_find_array))

-        $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";

+        $search .= "AND (".implode(' OR ', $cat_find_array).")";

 

     $main_query_array = $map_cat_ids_array;

   

     if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {

         $search .= " AND p.post_title LIKE %s";

-        $main_query_array[] = "%" . $_REQUEST['search'] . "%";

+        $main_query_array[] = "%".$_REQUEST['search']."%";

     }

 

     /**

@@ -300,14 +300,14 @@ 
 

     $gd_posttype = '';

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

-        $table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail';

+        $table = $plugin_prefix.$_REQUEST['gd_posttype'].'_detail';

         $gd_posttype = " AND p.post_type = %s";

         $main_query_array[] = $_REQUEST['gd_posttype'];

 

     } else

-        $table = $plugin_prefix . 'gd_place_detail';

+        $table = $plugin_prefix.'gd_place_detail';

 

-    $join = ", " . $table . " AS pd ";

+    $join = ", ".$table." AS pd ";

 

     /**

 	 * Filter the SQL JOIN clause for the markers data

@@ -327,14 +327,14 @@ 
 	 */

 	$search = apply_filters('geodir_home_map_listing_where', $search);

     $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);

-    $cat_type = $post_type . 'category';

+    $cat_type = $post_type.'category';

     if ($post_type == 'gd_event') {

         $event_select = ", pd.recurring_dates, pd.is_recurring";

     } else {

         $event_select = "";

     }

 

-    $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select;

+    $sql_select = 'SELECT pd.default_category, pd.'.$cat_type.', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude'.$event_select;

     /**

 	 * Filter the SQL SELECT clause to retrive fields data

 	 *

@@ -354,7 +354,7 @@ 
 	 */

 	$groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);

 

-    $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);

+    $catsql = $wpdb->prepare("$select $field_default_cat FROM ".$wpdb->posts." as p".$join." WHERE p.ID = pd.post_id AND p.post_status = 'publish' ".$search.$gd_posttype.$groupby, $main_query_array);

     

 	/**

 	 * Filter the SQL query to retrive markers data

@@ -404,7 +404,7 @@ 
         global $geodir_date_time_format, $geodir_date_format, $geodir_time_format;

 

         $today = strtotime(date_i18n('Y-m-d'));

-        $show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;

+        $show_dates = $post_type == 'gd_event' ? (int) get_option('geodir_event_infowindow_dates_count', 1) : 0;

         

         foreach ($catinfo as $catinfo_obj) {

             $post_title = $catinfo_obj->post_title;

@@ -420,29 +420,29 @@ 
                     $endtimes = '';

                     $astarttimes = array();

                     $aendtimes = array();

-                    if ( !isset( $recurring_data['repeat_type'] ) ) {

+                    if (!isset($recurring_data['repeat_type'])) {

                         $recurring_data['repeat_type'] = 'custom';

                     }

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

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

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

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

         

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

                     

-                    if ( !empty( $recurring_dates ) ) {

-                        if ( empty( $recurring_data['all_day'] ) ) {

-                            if ( $repeat_type == 'custom' && $different_times ) {

-                                $astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

-                                $aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

+                    if (!empty($recurring_dates)) {

+                        if (empty($recurring_data['all_day'])) {

+                            if ($repeat_type == 'custom' && $different_times) {

+                                $astarttimes = isset($recurring_data['starttimes']) ? $recurring_data['starttimes'] : array();

+                                $aendtimes = isset($recurring_data['endtimes']) ? $recurring_data['endtimes'] : array();

                             } else {

-                                $starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

-                                $endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

+                                $starttimes = isset($recurring_data['starttime']) ? $recurring_data['starttime'] : '';

+                                $endtimes = isset($recurring_data['endtime']) ? $recurring_data['endtime'] : '';

                             }

                         }

                         

                         $e = 0;

-                        foreach( $recurring_dates as $key => $date ) {

-                            if ( $repeat_type == 'custom' && $different_times ) {

-                                if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {

+                        foreach ($recurring_dates as $key => $date) {

+                            if ($repeat_type == 'custom' && $different_times) {

+                                if (!empty($astarttimes) && isset($astarttimes[$key])) {

                                     $starttimes = $astarttimes[$key];

                                     $endtimes = $aendtimes[$key];

                                 } else {

@@ -451,50 +451,50 @@ 
                                 }

                             }

                             

-                            $duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1;

+                            $duration = isset($recurring_data['duration_x']) && (int) $recurring_data['duration_x'] > 0 ? (int) $recurring_data['duration_x'] : 1;

                             $duration--;

-                            $enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) );

+                            $enddate = date_i18n('Y-m-d', strtotime($date.' + '.$duration.' day'));

                             

                             // Hide past dates

-                            if ( strtotime( $enddate ) < $today ) {

+                            if (strtotime($enddate) < $today) {

                                 continue;

                             }

                                     

-                            $sdate = strtotime( $date . ' ' . $starttimes );

-                            $edate = strtotime( $enddate . ' ' . $endtimes );

+                            $sdate = strtotime($date.' '.$starttimes);

+                            $edate = strtotime($enddate.' '.$endtimes);

                                         

-                            $start_date = date_i18n( $geodir_date_time_format, $sdate );

-                            $end_date = date_i18n( $geodir_date_time_format, $edate );

+                            $start_date = date_i18n($geodir_date_time_format, $sdate);

+                            $end_date = date_i18n($geodir_date_time_format, $edate);

                             

                             $same_day = false;

                             $full_day = false;

                             $same_datetime = false;

                             

-                            if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {

+                            if ($starttimes == $endtimes && ($starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00')) {

                                 $full_day = true;

                             }

                             

-                            if ( $start_date == $end_date && $full_day ) {

+                            if ($start_date == $end_date && $full_day) {

                                 $same_datetime = true;

                             }

 

-                            $link_date = date_i18n( 'Y-m-d', $sdate );

-                            $title_date = date_i18n( $geodir_date_format, $sdate );

-                            if ( $full_day ) {

+                            $link_date = date_i18n('Y-m-d', $sdate);

+                            $title_date = date_i18n($geodir_date_format, $sdate);

+                            if ($full_day) {

                                 $start_date = $title_date;

-                                $end_date = date_i18n( $geodir_date_format, $edate );

+                                $end_date = date_i18n($geodir_date_format, $edate);

                             }

                             

-                            if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {

+                            if (!$same_datetime && !$full_day && date_i18n('Y-m-d', $sdate) == date_i18n('Y-m-d', $edate)) {

                                 $same_day = true;

                                 

-                                $start_date .= ' - ' . date_i18n( $geodir_time_format, $edate );

+                                $start_date .= ' - '.date_i18n($geodir_time_format, $edate);

                             }

                             

-                            $event_dates .= ' :: ' . $start_date;

+                            $event_dates .= ' :: '.$start_date;

                         

-                            if ( !$same_day && !$same_datetime ) {

-                                $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

+                            if (!$same_day && !$same_datetime) {

+                                $event_dates .= ' '.__('to', 'geodirectory').' '.$end_date;

                             }

                             

                             $e++;

@@ -505,67 +505,67 @@ 
                         }

                     }

                 } else {

-                    $start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : '';

-                    $end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date;

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

-                    $starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : '';

-                    $endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : '';

+                    $start_date = isset($recurring_data['event_start']) ? $recurring_data['event_start'] : '';

+                    $end_date = isset($recurring_data['event_end']) ? $recurring_data['event_end'] : $start_date;

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

+                    $starttime = isset($recurring_data['starttime']) ? $recurring_data['starttime'] : '';

+                    $endtime = isset($recurring_data['endtime']) ? $recurring_data['endtime'] : '';

                 

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

-                    $starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array();

-                    $endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array();

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

+                    $starttimes = isset($recurring_data['starttimes']) && !empty($recurring_data['starttimes']) ? $recurring_data['starttimes'] : array();

+                    $endtimes = isset($recurring_data['endtimes']) && !empty($recurring_data['endtimes']) ? $recurring_data['endtimes'] : array();

                     

-                    if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {

+                    if (!geodir_event_is_date($start_date) && !empty($event_recurring_dates)) {

                         $start_date = $event_recurring_dates[0];

                     }

                                 

-                    if ( strtotime( $end_date ) < strtotime( $start_date ) ) {

+                    if (strtotime($end_date) < strtotime($start_date)) {

                         $end_date = $start_date;

                     }

                     

                     if ($end_date != '' && strtotime($end_date) >= $today) {

-                        if ( $starttime == '' && !empty( $starttimes ) ) {

+                        if ($starttime == '' && !empty($starttimes)) {

                             $starttime = $starttimes[0];

                             $endtime = $endtimes[0];

                         }

                         

                         $same_day = false;

                         $one_day = false;

-                        if ( $start_date == $end_date && $all_day ) {

+                        if ($start_date == $end_date && $all_day) {

                             $one_day = true;

                         }

 

-                        if ( $all_day ) {

-                            $start_datetime = strtotime( $start_date );

-                            $end_datetime = strtotime( $end_date );

+                        if ($all_day) {

+                            $start_datetime = strtotime($start_date);

+                            $end_datetime = strtotime($end_date);

                             

-                            $start_date = date_i18n( $geodir_date_format, $start_datetime );

-                            $end_date = date_i18n( $geodir_date_format, $end_datetime );

-                            if ( $start_date == $end_date ) {

+                            $start_date = date_i18n($geodir_date_format, $start_datetime);

+                            $end_date = date_i18n($geodir_date_format, $end_datetime);

+                            if ($start_date == $end_date) {

                                 $one_day = true;

                             }

                         } else {

-                            if ( $start_date == $end_date && $starttime == $endtime ) {

-                                $end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) );

+                            if ($start_date == $end_date && $starttime == $endtime) {

+                                $end_date = date_i18n('Y-m-d', strtotime($start_date.' '.$starttime.' +1 day'));

                                 $one_day = false;

                             }

-                            $start_datetime = strtotime( $start_date . ' ' . $starttime );

-                            $end_datetime = strtotime( $end_date . ' ' . $endtime );

+                            $start_datetime = strtotime($start_date.' '.$starttime);

+                            $end_datetime = strtotime($end_date.' '.$endtime);

                             

-                            $start_date = date_i18n( $geodir_date_time_format, $start_datetime );

-                            $end_date = date_i18n( $geodir_date_time_format, $end_datetime );

+                            $start_date = date_i18n($geodir_date_time_format, $start_datetime);

+                            $end_date = date_i18n($geodir_date_time_format, $end_datetime);

                         }

 

-                        if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {

+                        if (!$one_day && date_i18n('Y-m-d', $start_datetime) == date_i18n('Y-m-d', $end_datetime)) {

                             $same_day = true;

                             

-                            $start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime );

+                            $start_date .= ' - '.date_i18n($geodir_time_format, $end_datetime);

                         }

                         

-                        $event_dates .= ' :: ' . $start_date;

+                        $event_dates .= ' :: '.$start_date;

                         

-                        if ( !$same_day && !$one_day ) {

-                            $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date;

+                        if (!$same_day && !$one_day) {

+                            $event_dates .= ' '.__('to', 'geodirectory').' '.$end_date;

                         }

                     }

                 }

@@ -581,8 +581,8 @@ 
             $default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : '';

 

             // if single cat lets just show that icon

-            if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){

-                $default_cat = (int)$map_cat_ids_array[0];

+            if (is_array($map_cat_ids_array) && count($map_cat_ids_array) == 1) {

+                $default_cat = (int) $map_cat_ids_array[0];

             }

 

             $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : '';

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

             }

 

-            $content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';

+            $content_data[] = '{"id":"'.$catinfo_obj->post_id.'","t": "'.$title.'","lt": "'.$catinfo_obj->post_latitude.'","ln": "'.$catinfo_obj->post_longitude.'","mk_id":"'.$catinfo_obj->post_id.'_'.$default_cat.'","i":"'.$icon.'","w":"'.$icon_size['w'].'","h":"'.$icon_size['h'].'"'.$mark_extra.'}';

             $post_ids[] = $catinfo_obj->post_id;

         }

     }

@@ -626,10 +626,10 @@ 
     $totalcount = count(array_unique($post_ids));

 

     if (!empty($cat_content_info)) {

-        $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';

+        $map_json = '[{"totalcount":"'.$totalcount.'",'.substr(implode(',', $cat_content_info), 1).']';

     }

     else {

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

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

     }

 

 

@@ -639,7 +639,7 @@ 
      * @since 1.6.22

      * @param string $map_json The JSON string of the map markers results.

      */

-    return apply_filters('geodir_markers_json',$map_json);

+    return apply_filters('geodir_markers_json', $map_json);

 }

 

 

geodirectory-functions/helper_functions.php

Spacing +177 added lines, -177 removed lines

@@ -13,11 +13,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_add_listing_page_id(){
+function geodir_add_listing_page_id() {
     $gd_page_id = get_option('geodir_add_listing_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -30,11 +30,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_preview_page_id(){
+function geodir_preview_page_id() {
     $gd_page_id = get_option('geodir_preview_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -47,11 +47,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_success_page_id(){
+function geodir_success_page_id() {
     $gd_page_id = get_option('geodir_success_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -64,11 +64,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_location_page_id(){
+function geodir_location_page_id() {
     $gd_page_id = get_option('geodir_location_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -81,11 +81,11 @@ 
  * @since 1.5.4
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_home_page_id(){
+function geodir_home_page_id() {
     $gd_page_id = get_option('geodir_home_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -98,11 +98,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_info_page_id(){
+function geodir_info_page_id() {
     $gd_page_id = get_option('geodir_info_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -115,11 +115,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_page_id(){
+function geodir_login_page_id() {
     $gd_page_id = get_option('geodir_login_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -133,20 +133,20 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_url($args=array()){
+function geodir_login_url($args = array()) {
     $gd_page_id = get_option('geodir_login_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
     }
 
-    if (geodir_is_wpml()){
+    if (geodir_is_wpml()) {
         $home_url = icl_get_home_url();
-    }else{
+    } else {
         $home_url = home_url();
     }
 
@@ -154,17 +154,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $login_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $login_url = trailingslashit($home_url)."?geodir_signup=true";
     }
 
-    if($args){
-        $login_url = add_query_arg($args,$login_url );
+    if ($args) {
+        $login_url = add_query_arg($args, $login_url);
     }
 
     /**
@@ -178,7 +178,7 @@ 
      * @param array $args The array of query args used.
      * @param int $gd_page_id The page id of the GD login page.
      */
-	    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
+	    return apply_filters('geodir_login_url', $login_url, $args, $gd_page_id);
 }
 
 /**
@@ -189,20 +189,20 @@ 
  * @since 1.5.16 Added WPML lang code to url.
  * @return string Info page url.
  */
-function geodir_info_url($args=array()){
+function geodir_info_url($args = array()) {
     $gd_page_id = get_option('geodir_info_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
     }
 
-    if (geodir_is_wpml()){
+    if (geodir_is_wpml()) {
         $home_url = icl_get_home_url();
-    }else{
+    } else {
         $home_url = home_url();
     }
 
@@ -210,17 +210,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $info_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $info_url = trailingslashit($home_url);
     }
 
-    if($args){
-        $info_url = add_query_arg($args,$info_url );
+    if ($args) {
+        $info_url = add_query_arg($args, $info_url);
     }
 
     return $info_url;
@@ -238,7 +238,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_ucwords($string, $charset='UTF-8') {
+function geodir_ucwords($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_TITLE, $charset);
     } else {
@@ -258,7 +258,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtolower($string, $charset='UTF-8') {
+function geodir_strtolower($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_LOWER, $charset);
     } else {
@@ -278,7 +278,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtoupper($string, $charset='UTF-8') {
+function geodir_strtoupper($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_UPPER, $charset);
     } else {
@@ -309,7 +309,7 @@ 
 	
 	$url = trim($parts[0]);
 	if ($formatted && $url != '') {
-		$url = str_replace( ' ', '%20', $url );
+		$url = str_replace(' ', '%20', $url);
 		$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 		
 		if (0 !== stripos($url, 'mailto:')) {
@@ -319,8 +319,8 @@ 
 		
 		$url = str_replace(';//', '://', $url);
 		
-		if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
-			$url = 'http://' . $url;
+		if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
+			$url = 'http://'.$url;
 		}
 		
 		$url = wp_kses_normalize_entities($url);
@@ -462,7 +462,7 @@ 
  * @package GeoDirectory
  */
 function _gd_die_handler() {
-    if ( defined( 'GD_TESTING_MODE' ) ) {
+    if (defined('GD_TESTING_MODE')) {
         return '_gd_die_handler';
     } else {
         die();
@@ -480,10 +480,10 @@ 
  * @param string $title   Optional. Error title.
  * @param int $status     Optional. Status code.
  */
-function gd_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+function gd_die($message = '', $title = '', $status = 400) {
+    add_filter('wp_die_ajax_handler', '_gd_die_handler', 10, 3);
+    add_filter('wp_die_handler', '_gd_die_handler', 10, 3);
+    wp_die($message, $title, array('response' => $status));
 }
 
 /*
@@ -493,7 +493,7 @@ 
  * @param string $php_format The PHP date format.
  * @return string The jQuery format date string.
  */
-function geodir_date_format_php_to_jqueryui( $php_format ) {
+function geodir_date_format_php_to_jqueryui($php_format) {
 	$symbols = array(
 		// Day
 		'd' => 'dd',
@@ -533,27 +533,27 @@ 
 	$jqueryui_format = "";
 	$escaping = false;
 
-	for ( $i = 0; $i < strlen( $php_format ); $i++ ) {
+	for ($i = 0; $i < strlen($php_format); $i++) {
 		$char = $php_format[$i];
 
 		// PHP date format escaping character
-		if ( $char === '\\' ) {
+		if ($char === '\\') {
 			$i++;
 
-			if ( $escaping ) {
+			if ($escaping) {
 				$jqueryui_format .= $php_format[$i];
 			} else {
-				$jqueryui_format .= '\'' . $php_format[$i];
+				$jqueryui_format .= '\''.$php_format[$i];
 			}
 
 			$escaping = true;
 		} else {
-			if ( $escaping ) {
+			if ($escaping) {
 				$jqueryui_format .= "'";
 				$escaping = false;
 			}
 
-			if ( isset( $symbols[$char] ) ) {
+			if (isset($symbols[$char])) {
 				$jqueryui_format .= $symbols[$char];
 			} else {
 				$jqueryui_format .= $char;
@@ -574,81 +574,81 @@ 
  * @since 1.6.22 Genitive month added.
  * @since 1.6.26 Date translation issue in German language - FIXED.
  */
-function geodir_maybe_untranslate_date( $date ) {
-	$date_formated = ' '. $date;
+function geodir_maybe_untranslate_date($date) {
+	$date_formated = ' '.$date;
 
 	$names = array(
 		// The Weekdays
-		'Sunday' => __( 'Sunday' ),
-		'Monday' => __( 'Monday' ),
-		'Tuesday' => __( 'Tuesday' ),
-		'Wednesday' => __( 'Wednesday' ),
-		'Thursday' => __( 'Thursday' ),
-		'Friday' => __( 'Friday' ),
-		'Saturday' => __( 'Saturday' ),
+		'Sunday' => __('Sunday'),
+		'Monday' => __('Monday'),
+		'Tuesday' => __('Tuesday'),
+		'Wednesday' => __('Wednesday'),
+		'Thursday' => __('Thursday'),
+		'Friday' => __('Friday'),
+		'Saturday' => __('Saturday'),
 
 		// The Months
-		'January' => __( 'January' ),
-		'February' => __( 'February' ),
-		'March' => __( 'March' ),
-		'April' => __( 'April' ),
-		'May' => __( 'May' ),
-		'June' => __( 'June' ),
-		'July' => __( 'July' ),
-		'August' => __( 'August' ),
-		'September' => __( 'September' ),
-		'October' => __( 'October' ),
-		'November' => __( 'November' ),
-		'December' => __( 'December' ),
+		'January' => __('January'),
+		'February' => __('February'),
+		'March' => __('March'),
+		'April' => __('April'),
+		'May' => __('May'),
+		'June' => __('June'),
+		'July' => __('July'),
+		'August' => __('August'),
+		'September' => __('September'),
+		'October' => __('October'),
+		'November' => __('November'),
+		'December' => __('December'),
 
 		// Abbreviations for each month.
-		'Jan' => _x( 'Jan', 'January abbreviation' ),
-		'Feb' => _x( 'Feb', 'February abbreviation' ),
-		'Mar' => _x( 'Mar', 'March abbreviation' ),
-		'Apr' => _x( 'Apr', 'April abbreviation' ),
-		'May' => _x( 'May', 'May abbreviation' ),
-		'Jun' => _x( 'Jun', 'June abbreviation' ),
-		'Jul' => _x( 'Jul', 'July abbreviation' ),
-		'Aug' => _x( 'Aug', 'August abbreviation' ),
-		'Sep' => _x( 'Sep', 'September abbreviation' ),
-		'Oct' => _x( 'Oct', 'October abbreviation' ),
-		'Nov' => _x( 'Nov', 'November abbreviation' ),
-		'Dec' => _x( 'Dec', 'December abbreviation' ),
+		'Jan' => _x('Jan', 'January abbreviation'),
+		'Feb' => _x('Feb', 'February abbreviation'),
+		'Mar' => _x('Mar', 'March abbreviation'),
+		'Apr' => _x('Apr', 'April abbreviation'),
+		'May' => _x('May', 'May abbreviation'),
+		'Jun' => _x('Jun', 'June abbreviation'),
+		'Jul' => _x('Jul', 'July abbreviation'),
+		'Aug' => _x('Aug', 'August abbreviation'),
+		'Sep' => _x('Sep', 'September abbreviation'),
+		'Oct' => _x('Oct', 'October abbreviation'),
+		'Nov' => _x('Nov', 'November abbreviation'),
+		'Dec' => _x('Dec', 'December abbreviation'),
 
 		// Abbreviations for each day.
-		'Sun' => __( 'Sun' ),
-		'Mon' => __( 'Mon' ),
-		'Tue' => __( 'Tue' ),
-		'Wed' => __( 'Wed' ),
-		'Thu' => __( 'Thu' ),
-		'Fri' => __( 'Fri' ),
-		'Sat' => __( 'Sat' ),
+		'Sun' => __('Sun'),
+		'Mon' => __('Mon'),
+		'Tue' => __('Tue'),
+		'Wed' => __('Wed'),
+		'Thu' => __('Thu'),
+		'Fri' => __('Fri'),
+		'Sat' => __('Sat'),
 
 		// The first letter of each day.
-		'S' => _x( 'S', 'Sunday initial' ),
-		'M' => _x( 'M', 'Monday initial' ),
-		'T' => _x( 'T', 'Tuesday initial' ),
-		'W' => _x( 'W', 'Wednesday initial' ),
-		'T' => _x( 'T', 'Thursday initial' ),
-		'F' => _x( 'F', 'Friday initial' ),
-		'S' => _x( 'S', 'Saturday initial' ),
+		'S' => _x('S', 'Sunday initial'),
+		'M' => _x('M', 'Monday initial'),
+		'T' => _x('T', 'Tuesday initial'),
+		'W' => _x('W', 'Wednesday initial'),
+		'T' => _x('T', 'Thursday initial'),
+		'F' => _x('F', 'Friday initial'),
+		'S' => _x('S', 'Saturday initial'),
 
 		// The Meridiems
-		'am' => __( 'am' ),
-		'pm' => __( 'pm' ),
-		'AM' => __( 'AM' ),
-		'PM' => __( 'PM' )
+		'am' => __('am'),
+		'pm' => __('pm'),
+		'AM' => __('AM'),
+		'PM' => __('PM')
 	);
 
-	foreach ( $names as $name => $translation ) {
-		if ( $translation && trim( $translation ) != '' ) {
-			$date_formated = preg_replace( "/([^\\\])" . $name . "/", "\\1" . backslashit( $name ), $date_formated );
-			$date_formated = preg_replace( "/([^\\\])" . $translation . "/", "\\1" . backslashit( $name ), $date_formated );
+	foreach ($names as $name => $translation) {
+		if ($translation && trim($translation) != '') {
+			$date_formated = preg_replace("/([^\\\])".$name."/", "\\1".backslashit($name), $date_formated);
+			$date_formated = preg_replace("/([^\\\])".$translation."/", "\\1".backslashit($name), $date_formated);
 		}
 	}
 
-	$date_formated = substr( $date_formated, 1, strlen( $date_formated ) -1 );
-	$date = stripslashes( $date_formated );
+	$date_formated = substr($date_formated, 1, strlen($date_formated) - 1);
+	$date = stripslashes($date_formated);
 
 	return $date;
 }
@@ -665,30 +665,30 @@ 
  * @param bool $locale True to retrieve the date in localized format. Default false.
  * @return string The formatted date.
  */
-function geodir_date( $date_input, $date_to, $date_from = '', $locale = false ) {
-    if ( empty( $date_input ) || empty( $date_to ) ) {
+function geodir_date($date_input, $date_to, $date_from = '', $locale = false) {
+    if (empty($date_input) || empty($date_to)) {
         return NULL;
     }
     
-    $date_input = geodir_maybe_untranslate_date( $date_input );
+    $date_input = geodir_maybe_untranslate_date($date_input);
     
     $timestamp = 0;
-    if (!empty( $date_from ) && function_exists( 'date_create_from_format' ) ) {
-        $datetime = date_create_from_format( $date_from, $date_input );
-        if ( !empty( $datetime ) ) {
+    if (!empty($date_from) && function_exists('date_create_from_format')) {
+        $datetime = date_create_from_format($date_from, $date_input);
+        if (!empty($datetime)) {
             $timestamp = $datetime->getTimestamp();
         }
     }
     
-    if ( empty( $timestamp ) ) {
-        $date = strpos( $date_input, '/' ) !== false ? str_replace( '/', '-', $date_input ) : $date_input;
-        $timestamp = strtotime( $date );
+    if (empty($timestamp)) {
+        $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input;
+        $timestamp = strtotime($date);
     }
     
-    $date = date_i18n( $date_to, $timestamp );
+    $date = date_i18n($date_to, $timestamp);
     
-    if ( !$locale ) {
-        $date = geodir_maybe_untranslate_date( $date );
+    if (!$locale) {
+        $date = geodir_maybe_untranslate_date($date);
     }
     
     /**
@@ -703,7 +703,7 @@ 
      * @param string $date_from The source date format.
      * @param bool $locale True to retrieve the date in localized format.
      */
-    return apply_filters( 'geodir_date', $date, $date_input, $date_to, $date_from, $locale );
+    return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from, $locale);
 }
 
 /**
@@ -728,7 +728,7 @@ 
  * @return string Trimmed string.
  */
 function geodir_excerpt($text, $length = 100, $options = array()) {
-    if (!(int)$length > 0) {
+    if (!(int) $length > 0) {
         return $text;
     }
     $default = array(
@@ -790,7 +790,7 @@ 
         $length = $truncateLength;
 
         foreach ($openTags as $tag) {
-            $suffix .= '</' . $tag . '>';
+            $suffix .= '</'.$tag.'>';
         }
     } else {
         if (geodir_strlen($text, $options) <= $length) {
@@ -812,7 +812,7 @@ 
         }
     }
 
-    return $prefix . $result . $suffix;
+    return $prefix.$result.$suffix;
 }
 
 /**
@@ -849,7 +849,7 @@ 
     $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
     $replace = preg_replace_callback(
         $pattern,
-        function ($match) use ($strlen) {
+        function($match) use ($strlen) {
             $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
 
             return str_repeat(' ', $strlen($utf8, 'UTF-8'));
@@ -910,7 +910,7 @@ 
     }
 
     if (empty($options['html'])) {
-        return (string)$substr($text, $start, $length);
+        return (string) $substr($text, $start, $length);
     }
 
     $totalOffset = 0;
@@ -935,7 +935,7 @@ 
 
         $len = geodir_strlen($part, $options);
         if ($offset !== 0 || $totalLength + $len > $length) {
-            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
+            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8')) {
                 // Entities cannot be passed substr.
                 continue;
             }
@@ -981,39 +981,39 @@ 
     return '';
 }
 
-function geodir_tool_restore_cpt_from_taxonomies(){
+function geodir_tool_restore_cpt_from_taxonomies() {
 
 	$cpts = get_option('geodir_post_types');
 
-	if(!empty($cpts)){return;}
+	if (!empty($cpts)) {return; }
 
 	$taxonomies = get_option('geodir_taxonomies');
 
-	if(empty($taxonomies)){return;}
+	if (empty($taxonomies)) {return; }
 
 	$cpts = array();
 
-	foreach($taxonomies as $key => $val){
+	foreach ($taxonomies as $key => $val) {
 
-		if(strpos($val['listing_slug'], '/') === false) {
-			$cpts[$val['object_type']] = array('cpt'=>$val['object_type'],'slug'=>$val['listing_slug']);
+		if (strpos($val['listing_slug'], '/') === false) {
+			$cpts[$val['object_type']] = array('cpt'=>$val['object_type'], 'slug'=>$val['listing_slug']);
 		}
 
 	}
 
-	if(empty($cpts)){return;}
+	if (empty($cpts)) {return; }
 
 
 	$cpts_restore = $cpts;
 
-	foreach($cpts as $cpt){
+	foreach ($cpts as $cpt) {
 
 
-		$is_custom = $cpt['cpt']=='gd_place' ? 0 : 1;
+		$is_custom = $cpt['cpt'] == 'gd_place' ? 0 : 1;
 
-		$cpts_restore[$cpt['cpt']] = array (
+		$cpts_restore[$cpt['cpt']] = array(
 				'labels' =>
-					array (
+					array(
 						'name' => $cpt['slug'],
 						'singular_name' => $cpt['slug'],
 						'add_new' => 'Add New',
@@ -1041,14 +1041,14 @@ 
 				'public' => true,
 				'query_var' => true,
 				'rewrite' =>
-					array (
+					array(
 						'slug' => $cpt['slug'],
 						'with_front' => false,
 						'hierarchical' => true,
 						'feeds' => true,
 					),
 				'supports' =>
-					array (
+					array(
 						0 => 'title',
 						1 => 'editor',
 						2 => 'author',
@@ -1058,14 +1058,14 @@ 
 						6 => 'comments',
 					),
 				'taxonomies' =>
-					array (
+					array(
 						0 => $cpt['cpt'].'category',
 						1 => $cpt['cpt'].'_tags',
 					),
 				'is_custom' => $is_custom,
 				'listing_order' => '1',
 				'seo' =>
-					array (
+					array(
 						'meta_keyword' => '',
 						'meta_description' => '',
 					),
@@ -1077,7 +1077,7 @@ 
 	}
 
 
-	update_option('geodir_post_types',$cpts_restore);
+	update_option('geodir_post_types', $cpts_restore);
 
 }
 
@@ -1095,12 +1095,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function geodir_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strimwidth' ) ) {
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
+function geodir_utf8_strimwidth($str, $start, $width, $trimmaker = '', $encoding = 'UTF-8') {
+    if (function_exists('mb_strimwidth')) {
+        return mb_strimwidth($str, $start, $width, $trimmaker, $encoding);
     }
     
-    return geodir_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
+    return geodir_utf8_substr($str, $start, $width, $encoding).$trimmaker;
 }
 
 /**
@@ -1113,12 +1113,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the number of characters in string.
  */
-function geodir_utf8_strlen( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        return mb_strlen( $str, $encoding );
+function geodir_utf8_strlen($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        return mb_strlen($str, $encoding);
     }
         
-    return strlen( $str );
+    return strlen($str);
 }
 
 /**
@@ -1133,12 +1133,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the first occurrence of search in the string.
  */
-function geodir_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strpos' ) ) {
-        return mb_strpos( $str, $find, $offset, $encoding );
+function geodir_utf8_strpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strpos')) {
+        return mb_strpos($str, $find, $offset, $encoding);
     }
         
-    return strpos( $str, $find, $offset );
+    return strpos($str, $find, $offset);
 }
 
 /**
@@ -1153,12 +1153,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the last occurrence of search.
  */
-function geodir_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strrpos' ) ) {
-        return mb_strrpos( $str, $find, $offset, $encoding );
+function geodir_utf8_strrpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strrpos')) {
+        return mb_strrpos($str, $find, $offset, $encoding);
     }
         
-    return strrpos( $str, $find, $offset );
+    return strrpos($str, $find, $offset);
 }
 
 /**
@@ -1174,16 +1174,16 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function geodir_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_substr' ) ) {
-        if ( $length === null ) {
-            return mb_substr( $str, $start, geodir_utf8_strlen( $str, $encoding ), $encoding );
+function geodir_utf8_substr($str, $start, $length = null, $encoding = 'UTF-8') {
+    if (function_exists('mb_substr')) {
+        if ($length === null) {
+            return mb_substr($str, $start, geodir_utf8_strlen($str, $encoding), $encoding);
         } else {
-            return mb_substr( $str, $start, $length, $encoding );
+            return mb_substr($str, $start, $length, $encoding);
         }
     }
         
-    return substr( $str, $start, $length );
+    return substr($str, $start, $length);
 }
 
 /**
@@ -1196,12 +1196,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The width of string.
  */
-function geodir_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
-	if ( function_exists( 'mb_strwidth' ) ) {
-		return mb_strwidth( $str, $encoding );
+function geodir_utf8_strwidth($str, $encoding = 'UTF-8') {
+	if (function_exists('mb_strwidth')) {
+		return mb_strwidth($str, $encoding);
 	}
 
-	return geodir_utf8_strlen( $str, $encoding );
+	return geodir_utf8_strlen($str, $encoding);
 }
 
 /**
@@ -1215,21 +1215,21 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The resulting string.
  */
-function geodir_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        $first_letter = geodir_strtoupper( geodir_utf8_substr( $str, 0, 1, $encoding ), $encoding );
+function geodir_utf8_ucfirst($str, $lower_str_end = false, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        $first_letter = geodir_strtoupper(geodir_utf8_substr($str, 0, 1, $encoding), $encoding);
         $str_end = "";
         
-        if ( $lower_str_end ) {
-            $str_end = geodir_strtolower( geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
+        if ($lower_str_end) {
+            $str_end = geodir_strtolower(geodir_utf8_substr($str, 1, geodir_utf8_strlen($str, $encoding), $encoding), $encoding);
         } else {
-            $str_end = geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding );
+            $str_end = geodir_utf8_substr($str, 1, geodir_utf8_strlen($str, $encoding), $encoding);
         }
         
-        return $first_letter . $str_end;
+        return $first_letter.$str_end;
     }
 
-    return ucfirst( $str );
+    return ucfirst($str);
 }
 
 function geodir_total_listings_count($post_type = false)
@@ -1239,13 +1239,13 @@ 
 	$count = 0;
 	
 	if ($post_type) {
-		$count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $post_type . "_detail");
+		$count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$post_type."_detail");
 	} else {
 		$all_postypes = geodir_get_posttypes();
 
 		if (!empty($all_postypes)) {
 			foreach ($all_postypes as $key) {
-				$count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $key . "_detail");
+				$count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$key."_detail");
 			}
 		}	
 	}