GeoDirectory / geodirectory

geodirectory-functions/custom_fields_output_functions.php

Indentation +1565 added lines, -1565 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_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_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,155 +1062,155 @@ 
  */
 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 | Send To Friend from listings page
-        }
-
-        $package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
-
-        if ($cf['htmlvar_name'] == 'geodir_email' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
-            global $send_to_friend;
-            $send_to_friend = true;
-            $b_send_inquiry = '';
-            $b_sendtofriend = '';
-
-            $html = '';
-            if (!$preview) {
-                $b_send_inquiry = 'b_send_inquiry';
-                $b_sendtofriend = 'b_sendtofriend';
-                $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>';
-                $seperator = ' | ';
-            }
-
-            if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
-                $b_sendtofriend_url = apply_filters('b_sendtofriend_url', 'javascript:void(0);');
-                $html .= $seperator . '<a href="'.$b_sendtofriend_url.'" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</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['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_FRIEND_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);
-                    $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 | Send To Friend from listings page
+		}
+
+		$package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
+
+		if ($cf['htmlvar_name'] == 'geodir_email' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
+			global $send_to_friend;
+			$send_to_friend = true;
+			$b_send_inquiry = '';
+			$b_sendtofriend = '';
+
+			$html = '';
+			if (!$preview) {
+				$b_send_inquiry = 'b_send_inquiry';
+				$b_sendtofriend = 'b_sendtofriend';
+				$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>';
+				$seperator = ' | ';
+			}
+
+			if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
+				$b_sendtofriend_url = apply_filters('b_sendtofriend_url', 'javascript:void(0);');
+				$html .= $seperator . '<a href="'.$b_sendtofriend_url.'" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</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['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
+				$html .= '<p class="sucess_msg">' . SEND_FRIEND_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);
+					$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);
 
@@ -1227,136 +1227,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);
 
@@ -1374,80 +1374,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);
 
@@ -1465,79 +1465,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);
 
@@ -1555,113 +1555,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);
 
@@ -1679,176 +1679,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 +303 added lines, -303 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_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 | Send To Friend 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' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
             global $send_to_friend;
@@ -1131,7 +1131,7 @@ 
             if (!$preview) {
                 $b_send_inquiry = 'b_send_inquiry';
                 $b_sendtofriend = 'b_sendtofriend';
-                $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);
@@ -1144,28 +1144,28 @@ 
                 $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>';
                 $seperator = ' | ';
             }
 
             if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
                 $b_sendtofriend_url = apply_filters('b_sendtofriend_url', 'javascript:void(0);');
-                $html .= $seperator . '<a href="'.$b_sendtofriend_url.'" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
+                $html .= $seperator.'<a href="'.$b_sendtofriend_url.'" class="'.$b_sendtofriend.'">'.SEND_TO_FRIEND.'</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['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';
+                $html .= '<p class="sucess_msg">'.SEND_FRIEND_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');}*/
@@ -1185,11 +1185,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.
                      *
@@ -1198,10 +1198,10 @@ 
                      * @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);
-                    $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
-                }else{
-                    $html .=  $email;
+                    $email_name = apply_filters('geodir_email_field_name_output', $email, $cf);
+                    $html .= "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
+                } else {
+                    $html .= $email;
                 }
                 $html .= '</span></div>';
             }
@@ -1212,7 +1212,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);
 
 
 /**
@@ -1225,21 +1225,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.
          *
@@ -1247,11 +1247,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.
          *
@@ -1260,11 +1260,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.
          *
@@ -1273,11 +1273,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']})):
 
@@ -1285,7 +1285,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) {
@@ -1323,14 +1323,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>';
                         }
                     }
                 }
@@ -1345,11 +1345,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;
@@ -1358,7 +1358,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);
 
 
 
@@ -1372,21 +1372,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.
          *
@@ -1394,11 +1394,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.
          *
@@ -1407,11 +1407,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.
          *
@@ -1420,11 +1420,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']})) {
 
@@ -1439,9 +1439,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>';
 
         }
 
@@ -1449,7 +1449,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);
 
 
 
@@ -1463,21 +1463,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.
          *
@@ -1485,11 +1485,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.
          *
@@ -1498,11 +1498,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.
          *
@@ -1511,11 +1511,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']})) {
 
@@ -1529,9 +1529,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>';
 
         }
 
@@ -1539,7 +1539,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);
 
 
 
@@ -1553,21 +1553,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.
          *
@@ -1575,11 +1575,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.
          *
@@ -1588,11 +1588,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.
          *
@@ -1601,14 +1601,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();
@@ -1626,7 +1626,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;
                         }
                     }
@@ -1640,7 +1640,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);
@@ -1653,9 +1653,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>';
             }
         }
 
@@ -1663,7 +1663,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);
 
 
 /**
@@ -1677,21 +1677,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.
          *
@@ -1699,11 +1699,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.
          *
@@ -1712,11 +1712,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.
          *
@@ -1725,14 +1725,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']) {
 
@@ -1795,37 +1795,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>';
             }
             
             /**
@@ -1851,4 +1851,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