GeoDirectory / geodirectory

geodirectory-functions/custom_fields_output_functions.php

Indentation +1525 added lines, -1525 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 = 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 = 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,84 +617,84 @@ 
  */
 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>' . $post->{$cf['htmlvar_name']} . '</div>';
+			$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>' . $post->{$cf['htmlvar_name']} . '</div>';
 
-        endif;
+		endif;
 
-    }
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
 
@@ -711,98 +711,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);
 
@@ -819,92 +819,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.
-                        }
-                    }
-                }
-            }
-
-            $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.
+						}
+					}
+				}
+			}
+
+			$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);
 
@@ -921,113 +921,113 @@ 
  */
 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']}, ","));
-
-            $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']};
-            }
-
-            $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']}, ","));
+
+			$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']};
+			}
+
+			$html .= '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
 
@@ -1044,152 +1044,152 @@ 
  */
 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']})) {
-            $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']}) {
-                $html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
-                $seperator = ' | ';
-            }
-
-            if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
-                $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
-            }
-
-            $html .= '</span></div>';
-
-
-            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']})) {
+			$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']}) {
+				$html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+				$seperator = ' | ';
+			}
+
+			if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
+				$html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
+			}
+
+			$html .= '</span></div>';
+
+
+			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);
 
@@ -1206,130 +1206,130 @@ 
  */
 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']) ? 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');
-
-                        // 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>';
-                        } 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']) ? 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');
+
+						// 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>';
+						} 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);
 
@@ -1347,80 +1347,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);
 
@@ -1438,79 +1438,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);
 
@@ -1528,113 +1528,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);
 
@@ -1651,162 +1651,162 @@ 
  */
 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 = 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 = 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="http://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="http://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>';
 
 
-            if ( $post->post_address ) {
-                $html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
-            }
-            if ($show_city_in_address && $post->post_city ) {
-                $html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
-            }
-            if ($show_region_in_address && $post->post_region ) {
-                $html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
-            }
-            if ($show_zip_in_address && $post->post_zip ) {
-                $html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
-            }
-            if ($show_country_in_address && $post->post_country ) {
-                $html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
-            }
-            $html .= '</div>';
+			if ( $post->post_address ) {
+				$html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
+			}
+			if ($show_city_in_address && $post->post_city ) {
+				$html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
+			}
+			if ($show_region_in_address && $post->post_region ) {
+				$html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
+			}
+			if ($show_zip_in_address && $post->post_zip ) {
+				$html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
+			}
+			if ($show_country_in_address && $post->post_country ) {
+				$html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
+			}
+			$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 +298 added lines, -298 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,9 +686,9 @@ 
             }
 
 
-            $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>' . $post->{$cf['htmlvar_name']} . '</div>';
+            $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>'.$post->{$cf['htmlvar_name']}.'</div>';
 
         endif;
 
@@ -696,7 +696,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);
 
 
 /**
@@ -709,21 +709,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.
          *
@@ -731,11 +731,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.
          *
@@ -744,11 +744,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.
          *
@@ -757,11 +757,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']} != ''):
@@ -795,16 +795,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);
 
 
 /**
@@ -817,21 +817,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.
          *
@@ -839,11 +839,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.
          *
@@ -852,11 +852,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.
          *
@@ -865,11 +865,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');
@@ -897,16 +897,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);
 
 
 /**
@@ -919,21 +919,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.
          *
@@ -941,11 +941,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.
          *
@@ -954,11 +954,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.
          *
@@ -967,11 +967,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,15 +1006,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>';
@@ -1029,7 +1029,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);
 
 
 /**
@@ -1042,21 +1042,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.
          *
@@ -1064,11 +1064,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.
          *
@@ -1077,11 +1077,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.
          *
@@ -1090,18 +1090,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']})) {
             $send_to_friend = true;
@@ -1112,7 +1112,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);
@@ -1125,26 +1125,26 @@ 
                 $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']}) {
-                $html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+                $html .= '<a href="javascript:void(0);" class="'.$b_send_inquiry.'" >'.SEND_INQUIRY.'</a>';
                 $seperator = ' | ';
             }
 
             if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
-                $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
+                $html .= $seperator.'<a href="javascript:void(0);" 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');}*/
@@ -1164,11 +1164,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.
                      *
@@ -1177,10 +1177,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>';
             }
@@ -1191,7 +1191,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);
 
 
 /**
@@ -1204,21 +1204,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.
          *
@@ -1226,11 +1226,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.
          *
@@ -1239,11 +1239,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.
          *
@@ -1252,11 +1252,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']})):
 
@@ -1264,7 +1264,7 @@ 
             if (!empty($files)):
 
                 $extra_fields = !empty($cf['extra_fields']) ? 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) {
@@ -1301,9 +1301,9 @@ 
                             //$file_paths .= '<img src="'.$file.'"  />';	
                             $file_paths .= '</div>';
                         } else {
-                            $ext_path = '_' . $html_var . '_';
+                            $ext_path = '_'.$html_var.'_';
                             $filename = explode($ext_path, $filename);
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
+                            $file_paths .= '<a href="'.$file.'" target="_blank">'.$filename[count($filename) - 1].'</a>';
                         }
                     }
                 }
@@ -1318,11 +1318,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;
@@ -1331,7 +1331,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);
 
 
 
@@ -1345,21 +1345,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.
          *
@@ -1367,11 +1367,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.
          *
@@ -1380,11 +1380,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.
          *
@@ -1393,11 +1393,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']})) {
 
@@ -1412,9 +1412,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>';
 
         }
 
@@ -1422,7 +1422,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);
 
 
 
@@ -1436,21 +1436,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.
          *
@@ -1458,11 +1458,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.
          *
@@ -1471,11 +1471,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.
          *
@@ -1484,11 +1484,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']})) {
 
@@ -1502,9 +1502,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>';
 
         }
 
@@ -1512,7 +1512,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);
 
 
 
@@ -1526,21 +1526,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.
          *
@@ -1548,11 +1548,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.
          *
@@ -1561,11 +1561,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.
          *
@@ -1574,14 +1574,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();
@@ -1599,7 +1599,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;
                         }
                     }
@@ -1613,7 +1613,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);
@@ -1626,9 +1626,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>';
             }
         }
 
@@ -1636,7 +1636,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);
 
 
 /**
@@ -1649,21 +1649,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.
          *
@@ -1671,11 +1671,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.
          *
@@ -1684,11 +1684,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.
          *
@@ -1697,14 +1697,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']) {
 
@@ -1767,10 +1767,10 @@ 
 
         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;
@@ -1779,26 +1779,26 @@ 
             
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="http://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="http://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>';
 
 
-            if ( $post->post_address ) {
-                $html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
+            if ($post->post_address) {
+                $html .= '<span itemprop="streetAddress">'.$post->post_address.'</span><br>';
             }
-            if ($show_city_in_address && $post->post_city ) {
-                $html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
+            if ($show_city_in_address && $post->post_city) {
+                $html .= '<span itemprop="addressLocality">'.$post->post_city.'</span><br>';
             }
-            if ($show_region_in_address && $post->post_region ) {
-                $html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
+            if ($show_region_in_address && $post->post_region) {
+                $html .= '<span itemprop="addressRegion">'.$post->post_region.'</span><br>';
             }
-            if ($show_zip_in_address && $post->post_zip ) {
-                $html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
+            if ($show_zip_in_address && $post->post_zip) {
+                $html .= '<span itemprop="postalCode">'.$post->post_zip.'</span><br>';
             }
-            if ($show_country_in_address && $post->post_country ) {
-                $html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
+            if ($show_country_in_address && $post->post_country) {
+                $html .= '<span itemprop="addressCountry">'.__($post->post_country, 'geodirectory').'</span><br>';
             }
             $html .= '</div>';
 
@@ -1809,4 +1809,4 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
\ No newline at end of file
+add_filter('geodir_custom_field_output_address', 'geodir_cf_address', 10, 3);
\ No newline at end of file

geodirectory_hooks_actions.php

Indentation +1105 added lines, -1105 removed lines

@@ -19,7 +19,7 @@ 
  */

 function geodir_get_ajax_url()

 {

-    return admin_url('admin-ajax.php?action=geodir_ajax_action');

+	return admin_url('admin-ajax.php?action=geodir_ajax_action');

 }

 

 /////////////////////

@@ -87,7 +87,7 @@ 
 add_filter('query_vars', 'geodir_add_geodir_page_var');

 add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8

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

-    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

+	add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

 

 add_filter('parse_query', 'geodir_modified_query');

 

@@ -154,14 +154,14 @@ 
 /* POST AND LOOP ACTIONS */

 ////////////////////////

 if (!is_admin()) {

-    add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtural page from everywhere

-    add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);

-    /** Exclude Virtual Pages From Pages List **/

-    add_action('pre_get_posts', 'set_listing_request', 0);

-    add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);

-    add_filter('excerpt_more', 'geodir_excerpt_more', 1000);

-    add_filter('excerpt_length', 'geodir_excerpt_length', 1000);

-    add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter

+	add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtural page from everywhere

+	add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);

+	/** Exclude Virtual Pages From Pages List **/

+	add_action('pre_get_posts', 'set_listing_request', 0);

+	add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);

+	add_filter('excerpt_more', 'geodir_excerpt_more', 1000);

+	add_filter('excerpt_length', 'geodir_excerpt_length', 1000);

+	add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter

 }

 

 

@@ -222,12 +222,12 @@ 
  */

 function geodir_unset_prev_theme_nav_location($newname)

 {

-    $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);

-    if ($geodir_theme_location) {

-        update_option('geodir_theme_location_nav', $geodir_theme_location);

-    } else {

-        update_option('geodir_theme_location_nav', '');

-    }

+	$geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);

+	if ($geodir_theme_location) {

+		update_option('geodir_theme_location_nav', $geodir_theme_location);

+	} else {

+		update_option('geodir_theme_location_nav', '');

+	}

 }

 

 /// add action for theme switch to blank previous theme navigation location setting

@@ -248,32 +248,32 @@ 
  */

 function geodir_add_post_filters()

 {

-    /**

-     * Contains all function for filtering listing.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once('geodirectory-functions/listing_filters.php');

+	/**

+	 * Contains all function for filtering listing.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once('geodirectory-functions/listing_filters.php');

 }

 

 

 if (!function_exists('geodir_init_defaults')) {

-    /**

-     * Calls the function to register the GeoDirectory default CPT and taxonomies.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_init_defaults()

-    {

-        if (function_exists('geodir_register_defaults')) {

+	/**

+	 * Calls the function to register the GeoDirectory default CPT and taxonomies.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_init_defaults()

+	{

+		if (function_exists('geodir_register_defaults')) {

 

-            geodir_register_defaults();

+			geodir_register_defaults();

 

-        }

+		}

 

-    }

+	}

 }

 

 

@@ -295,26 +295,26 @@ 
 // CALLED ON 'sidebars_widgets' FILTER

 

 if (!function_exists('geodir_restrict_widget')) {

-    /**

-     * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page.

-     *

-     * @global bool $is_listing Sets the global value to true if on a GD category page. False if not.

-     * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not.

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_restrict_widget()

-    {

-        global $is_listing, $is_single_place;

+	/**

+	 * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page.

+	 *

+	 * @global bool $is_listing Sets the global value to true if on a GD category page. False if not.

+	 * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not.

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_restrict_widget()

+	{

+		global $is_listing, $is_single_place;

 

-        // set is listing	

-        (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;

+		// set is listing	

+		(geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;

 

-        // set is single place

-        (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;

+		// set is single place

+		(geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;

 

 

-    }

+	}

 }

 

 

@@ -335,32 +335,32 @@ 
  */

 function geodir_detail_page_sidebar_content_sorting()

 {

-    $arr_detail_page_sidebar_content =

-        /**

-         * An array of functions to be called to be displayed on the details (post) page sidebar.

-         *

-         * This filter can be used to remove sections of the details page sidebar,

-         * add new sections or rearrange the order of the sections.

-         *

-         * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.

-         * @since 1.0.0

-         */

-        apply_filters('geodir_detail_page_sidebar_content',

-            array('geodir_social_sharing_buttons',

-                'geodir_share_this_button',

-                'geodir_detail_page_google_analytics',

-                'geodir_edit_post_link',

-                'geodir_detail_page_review_rating',

-                'geodir_detail_page_more_info'

-            ) // end of array 

-        ); // end of apply filter

-    if (!empty($arr_detail_page_sidebar_content)) {

-        foreach ($arr_detail_page_sidebar_content as $content_function) {

-            if (function_exists($content_function)) {

-                add_action('geodir_detail_page_sidebar', $content_function);

-            }

-        }

-    }

+	$arr_detail_page_sidebar_content =

+		/**

+		 * An array of functions to be called to be displayed on the details (post) page sidebar.

+		 *

+		 * This filter can be used to remove sections of the details page sidebar,

+		 * add new sections or rearrange the order of the sections.

+		 *

+		 * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.

+		 * @since 1.0.0

+		 */

+		apply_filters('geodir_detail_page_sidebar_content',

+			array('geodir_social_sharing_buttons',

+				'geodir_share_this_button',

+				'geodir_detail_page_google_analytics',

+				'geodir_edit_post_link',

+				'geodir_detail_page_review_rating',

+				'geodir_detail_page_more_info'

+			) // end of array 

+		); // end of apply filter

+	if (!empty($arr_detail_page_sidebar_content)) {

+		foreach ($arr_detail_page_sidebar_content as $content_function) {

+			if (function_exists($content_function)) {

+				add_action('geodir_detail_page_sidebar', $content_function);

+			}

+		}

+	}

 }

 

 add_action('geodir_after_edit_post_link', 'geodir_add_to_favourite_link', 1);

@@ -375,14 +375,14 @@ 
  */

 function geodir_add_to_favourite_link()

 {

-    global $post, $preview;

-    if (!$preview && geodir_is_page('detail')) {

-        ?>

+	global $post, $preview;

+	if (!$preview && geodir_is_page('detail')) {

+		?>

         <p class="edit_link">

             <?php geodir_favourite_html($post->post_author, $post->ID); ?>

         </p>

     <?php

-    }

+	}

 }

 

 /**

@@ -396,41 +396,41 @@ 
  */

 function geodir_social_sharing_buttons()

 {

-    global $preview;

-    ob_start(); // Start  buffering;

-    /**

-     * This action is called before the social buttons twitter,facebook and google plus are output in a containing div.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_social_sharing_buttons');

-    if (!$preview) {

-        ?>

+	global $preview;

+	ob_start(); // Start  buffering;

+	/**

+	 * This action is called before the social buttons twitter,facebook and google plus are output in a containing div.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_social_sharing_buttons');

+	if (!$preview) {

+		?>

         <div class="likethis">

             <?php geodir_twitter_tweet_button(); ?>

             <?php geodir_fb_like_button(); ?>

             <?php geodir_google_plus_button(); ?>

         </div>

     <?php

-    }// end of if, if its a preview or not

-

-    /**

-     * This action is called after the social buttons twitter,facebook and google plus are output in a containing div.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_social_sharing_buttons');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

-        /**

-         * Filter the geodir_social_sharing_buttons() function content.

-         *

-         * @param string $content_html The output html of the geodir_social_sharing_buttons() function.

-         */

-        echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);

-    }

+	}// end of if, if its a preview or not

+

+	/**

+	 * This action is called after the social buttons twitter,facebook and google plus are output in a containing div.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_social_sharing_buttons');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

+		/**

+		 * Filter the geodir_social_sharing_buttons() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_social_sharing_buttons() function.

+		 */

+		echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);

+	}

 

 

 }

@@ -446,39 +446,39 @@ 
  */

 function geodir_share_this_button()

 {

-    global $preview;

-    ob_start(); // Start buffering;

-    /**

-     * This is called before the share this html in the function geodir_share_this_button()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_share_this_button');

-    if (!$preview) {

-        ?>

+	global $preview;

+	ob_start(); // Start buffering;

+	/**

+	 * This is called before the share this html in the function geodir_share_this_button()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_share_this_button');

+	if (!$preview) {

+		?>

         <div class="share clearfix">

             <?php geodir_share_this_button_code(); ?>

         </div>

     <?php

-    }// end of if, if its a preview or not

-    /**

-     * This is called after the share this html in the function geodir_share_this_button()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_share_this_button');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_sharethis_button_section') != 1) {

-        /**

-         * Filter the geodir_share_this_button() function content.

-         *

-         * @param string $content_html The output html of the geodir_share_this_button() function.

-         * @since 1.0.0

-         */

-        echo $content_html = apply_filters('geodir_share_this_button_html', $content_html);

-    }

+	}// end of if, if its a preview or not

+	/**

+	 * This is called after the share this html in the function geodir_share_this_button()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_share_this_button');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_sharethis_button_section') != 1) {

+		/**

+		 * Filter the geodir_share_this_button() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_share_this_button() function.

+		 * @since 1.0.0

+		 */

+		echo $content_html = apply_filters('geodir_share_this_button_html', $content_html);

+	}

 

 }

 

@@ -494,46 +494,46 @@ 
  */

 function geodir_edit_post_link()

 {

-    global $post, $preview;

-    ob_start(); // Start buffering;

-    /**

-     * This is called before the edit post link html in the function geodir_edit_post_link()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_edit_post_link');

-    if (!$preview) {

-        $is_current_user_owner = geodir_listing_belong_to_current_user();

+	global $post, $preview;

+	ob_start(); // Start buffering;

+	/**

+	 * This is called before the edit post link html in the function geodir_edit_post_link()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_edit_post_link');

+	if (!$preview) {

+		$is_current_user_owner = geodir_listing_belong_to_current_user();

         

-        if ($is_current_user_owner) {

-            $post_id = $post->ID;

+		if ($is_current_user_owner) {

+			$post_id = $post->ID;

             

-            if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-                $post_id = (int)$_REQUEST['pid'];

-            }

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

+				$post_id = (int)$_REQUEST['pid'];

+			}

 

-            $postlink = get_permalink(geodir_add_listing_page_id());

-            $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);

-            echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';

-        }

-    }// end of if, if its a preview or not

-    /**

-     * This is called after the edit post link html in the function geodir_edit_post_link()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_edit_post_link');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_user_links_section') != 1) {

-        /**

-         * Filter the geodir_edit_post_link() function content.

-         *

-         * @param string $content_html The output html of the geodir_edit_post_link() function.

-         */

-        echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);

-    }

+			$postlink = get_permalink(geodir_add_listing_page_id());

+			$editlink = geodir_getlink($postlink, array('pid' => $post_id), false);

+			echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';

+		}

+	}// end of if, if its a preview or not

+	/**

+	 * This is called after the edit post link html in the function geodir_edit_post_link()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_edit_post_link');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_user_links_section') != 1) {

+		/**

+		 * Filter the geodir_edit_post_link() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_edit_post_link() function.

+		 */

+		echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);

+	}

 }

 

 /**

@@ -547,41 +547,41 @@ 
  */

 function geodir_detail_page_google_analytics()

 {

-    global $post;

-    $package_info = array();

-    $package_info = geodir_post_package_info($package_info, $post);

+	global $post;

+	$package_info = array();

+	$package_info = geodir_post_package_info($package_info, $post);

 

-    $id = trim(get_option('geodir_ga_id'));

+	$id = trim(get_option('geodir_ga_id'));

 

-    if (!$id) {

-        return; //if no Google Analytics ID then bail.

-    }

+	if (!$id) {

+		return; //if no Google Analytics ID then bail.

+	}

 

-    ob_start(); // Start buffering;

-    /**

-     * This is called before the edit post link html in the function geodir_detail_page_google_analytics()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_google_analytics');

+	ob_start(); // Start buffering;

+	/**

+	 * This is called before the edit post link html in the function geodir_detail_page_google_analytics()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_google_analytics');

     

-    $refresh_time = get_option('geodir_ga_refresh_time', 5);

-    /**

-     * Filter the time interval to check & refresh new users results.

-     *

-     * @since 1.5.9

-     *

-     * @param int $refresh_time Time interval to check & refresh new users results.

-     */

-    $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);

-    $refresh_time = absint($refresh_time * 1000);

+	$refresh_time = get_option('geodir_ga_refresh_time', 5);

+	/**

+	 * Filter the time interval to check & refresh new users results.

+	 *

+	 * @since 1.5.9

+	 *

+	 * @param int $refresh_time Time interval to check & refresh new users results.

+	 */

+	$refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);

+	$refresh_time = absint($refresh_time * 1000);

     

-    $hide_refresh = get_option('geodir_ga_auto_refresh');

+	$hide_refresh = get_option('geodir_ga_auto_refresh');

     

-    $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0;

-    if (get_option('geodir_ga_stats') && is_user_logged_in() &&  (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {

-        $page_url = urlencode($_SERVER['REQUEST_URI']);

-        ?>

+	$auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0;

+	if (get_option('geodir_ga_stats') && is_user_logged_in() &&  (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {

+		$page_url = urlencode($_SERVER['REQUEST_URI']);

+		?>

         <script type="text/javascript">

             var gd_gaTimeOut;

             var gd_gaTime = parseInt('<?php echo $refresh_time;?>');

@@ -833,15 +833,15 @@ 
                     var labels = results[1].rows.map(function(row) { return +row[0]; });

 

                     <?php

-                    // Here we list the shorthand days of the week so it can be used in translation.

-                    __("Mon",'geodirectory');

-                    __("Tue",'geodirectory');

-                    __("Wed",'geodirectory');

-                    __("Thu",'geodirectory');

-                    __("Fri",'geodirectory');

-                    __("Sat",'geodirectory');

-                    __("Sun",'geodirectory');

-                    ?>

+					// Here we list the shorthand days of the week so it can be used in translation.

+					__("Mon",'geodirectory');

+					__("Tue",'geodirectory');

+					__("Wed",'geodirectory');

+					__("Thu",'geodirectory');

+					__("Fri",'geodirectory');

+					__("Sat",'geodirectory');

+					__("Sun",'geodirectory');

+					?>

 

                     labels = [

                         "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",

@@ -1090,24 +1090,24 @@ 
         </span>

 

     <?php

-    }

-    /**

-     * This is called after the edit post link html in the function geodir_detail_page_google_analytics()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_google_analytics');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

-        /**

-         * Filter the geodir_edit_post_link() function content.

-         *

-         * @param string $content_html The output html of the geodir_edit_post_link() function.

-         */

-        echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);

-    }

+	}

+	/**

+	 * This is called after the edit post link html in the function geodir_detail_page_google_analytics()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_google_analytics');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

+		/**

+		 * Filter the geodir_edit_post_link() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_edit_post_link() function.

+		 */

+		echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);

+	}

 }

 

 /**

@@ -1123,90 +1123,90 @@ 
  */

 function geodir_detail_page_review_rating()

 {

-    global $post, $preview, $post_images;

-    ob_start(); // Start  buffering;

-    /**

-     * This is called before the rating html in the function geodir_detail_page_review_rating().

-     *

-     * This is called outside the check for an actual rating and the check for preview page.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_detail_page_review_rating');

-

-    $comment_count = geodir_get_review_count_total($post->ID);

-    $post_avgratings = geodir_get_post_rating($post->ID);

-

-    if ($post_avgratings != 0 && !$preview) {

-        /**

-         * This is called before the rating html in the function geodir_detail_page_review_rating().

-         *

-         * This is called inside the check for an actual rating and the check for preview page.

-         *

-         * @since 1.0.0

-         * @param float $post_avgratings Average rating for the surrent post.

-         * @param int $post->ID Current post ID.

-         */

-        do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);

-

-        $html = '<p style=" float:left;">';

-        $html .= geodir_get_rating_stars($post_avgratings, $post->ID);

-        $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">';

-        $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings;

+	global $post, $preview, $post_images;

+	ob_start(); // Start  buffering;

+	/**

+	 * This is called before the rating html in the function geodir_detail_page_review_rating().

+	 *

+	 * This is called outside the check for an actual rating and the check for preview page.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_detail_page_review_rating');

+

+	$comment_count = geodir_get_review_count_total($post->ID);

+	$post_avgratings = geodir_get_post_rating($post->ID);

+

+	if ($post_avgratings != 0 && !$preview) {

+		/**

+		 * This is called before the rating html in the function geodir_detail_page_review_rating().

+		 *

+		 * This is called inside the check for an actual rating and the check for preview page.

+		 *

+		 * @since 1.0.0

+		 * @param float $post_avgratings Average rating for the surrent post.

+		 * @param int $post->ID Current post ID.

+		 */

+		do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);

+

+		$html = '<p style=" float:left;">';

+		$html .= geodir_get_rating_stars($post_avgratings, $post->ID);

+		$html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">';

+		$post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings;

        

 	   $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');

 	   

 	   $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';

 

-        $html .= '<span class="item">';

-        $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>';

+		$html .= '<span class="item">';

+		$html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>';

 

-        if ($post_images) {

-            foreach ($post_images as $img) {

-                $post_img = $img->src;

-                break;

-            }

-        }

-

-        if (isset($post_img) && $post_img) {

-            $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />';

-        }

-

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

-

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

-        /**

-         * This is called after the rating html in the function geodir_detail_page_review_rating().

-         *

-         * This is called inside the check for an actual rating and the check for preview page.

-         *

-         * @since 1.0.0

-         * @param float $post_avgratings Average rating for the surrent post.

-         * @param int $post->ID Current post ID.

-         */

-        do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);

-    }

-    /**

-     * This is called before the rating html in the function geodir_detail_page_review_rating().

-     *

-     * This is called outside the check for an actual rating and the check for preview page.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_detail_page_review_rating');

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '') {

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';

-    }

-    if ((int)get_option('geodir_disable_rating_info_section') != 1) {

-        /**

-         * Filter the geodir_detail_page_review_rating() function content.

-         *

-         * @since 1.0.0

-         * @param string $content_html The output html of the geodir_detail_page_review_rating() function.

-         */

-        echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);

-    }

+		if ($post_images) {

+			foreach ($post_images as $img) {

+				$post_img = $img->src;

+				break;

+			}

+		}

+

+		if (isset($post_img) && $post_img) {

+			$html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />';

+		}

+

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

+

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

+		/**

+		 * This is called after the rating html in the function geodir_detail_page_review_rating().

+		 *

+		 * This is called inside the check for an actual rating and the check for preview page.

+		 *

+		 * @since 1.0.0

+		 * @param float $post_avgratings Average rating for the surrent post.

+		 * @param int $post->ID Current post ID.

+		 */

+		do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);

+	}

+	/**

+	 * This is called before the rating html in the function geodir_detail_page_review_rating().

+	 *

+	 * This is called outside the check for an actual rating and the check for preview page.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_detail_page_review_rating');

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '') {

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';

+	}

+	if ((int)get_option('geodir_disable_rating_info_section') != 1) {

+		/**

+		 * Filter the geodir_detail_page_review_rating() function content.

+		 *

+		 * @since 1.0.0

+		 * @param string $content_html The output html of the geodir_detail_page_review_rating() function.

+		 */

+		echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);

+	}

 }

 

 /**

@@ -1218,35 +1218,35 @@ 
  */

 function geodir_detail_page_more_info()

 {

-    ob_start(); // Start  buffering;

-    /**

-     * This is called before the info section html.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_detail_page_more_info');

-    if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {

-        echo $geodir_post_detail_fields;

-    }

-    /**

-     * This is called after the info section html.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_detail_page_more_info');

-

-    $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_listing_info_section') != 1) {

-        /**

-         * Filter the output html for function geodir_detail_page_more_info().

-         *

-         * @since 1.0.0

-         * @param string $content_html The output html of the geodir_detail_page_more_info() function.

-         */

-        echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);

-    }

+	ob_start(); // Start  buffering;

+	/**

+	 * This is called before the info section html.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_detail_page_more_info');

+	if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {

+		echo $geodir_post_detail_fields;

+	}

+	/**

+	 * This is called after the info section html.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_detail_page_more_info');

+

+	$content_html = ob_get_clean();

+	if (trim($content_html) != '')

+		$content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

+	if ((int)get_option('geodir_disable_listing_info_section') != 1) {

+		/**

+		 * Filter the output html for function geodir_detail_page_more_info().

+		 *

+		 * @since 1.0.0

+		 * @param string $content_html The output html of the geodir_detail_page_more_info() function.

+		 */

+		echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);

+	}

 }

 

 

@@ -1260,15 +1260,15 @@ 
  */

 function geodir_localize_all_js_msg()

 {// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

-    if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-        $ajax_url = admin_url('admin-ajax.php');

-    } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-        $ajax_url = admin_url('admin-ajax.php');

-    } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-        $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

-    } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-        $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

-    }

+	if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+		$ajax_url = admin_url('admin-ajax.php');

+	} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+		$ajax_url = admin_url('admin-ajax.php');

+	} elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+		$ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

+	} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+		$ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

+	}

 	

 	/**

 	 * Filter the allowed image type extensions for post images.

@@ -1278,60 +1278,60 @@ 
 	 */

 	$allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));

 	

-    $default_marker_icon = get_option('geodir_default_marker_icon');

-    $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));

-    $default_marker_width = $default_marker_size['w'];

-    $default_marker_height = $default_marker_size['h'];

+	$default_marker_icon = get_option('geodir_default_marker_icon');

+	$default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));

+	$default_marker_width = $default_marker_size['w'];

+	$default_marker_height = $default_marker_size['h'];

     

-    $arr_alert_msg = array(

-        'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_admin_ajax_url' => $ajax_url,

-        'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),

-        'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),

-        'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),

-        'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),

-        //start not show alert msg

-        'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),

-        'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),

-        'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),

-        'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),

-        'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),

-        // end not show alert msg

-        'my_place_listing_del' => __('Are you wish to delete this listing?', 'geodirectory'),

-        'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),

-        //start not show alert msg

-        'rating_error_msg' => __('Error : please retry', 'geodirectory'),

-        'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),

-        'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),

-        'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),

-        'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),

-        'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),

-        'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),

-        'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),

-        'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),

-        'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),

-        'geodir_field_id_required' => __('This field is required.', 'geodirectory'),

-        'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),

-        'geodir_default_marker_icon' => $default_marker_icon,

-        'geodir_default_marker_w' => $default_marker_width,

-        'geodir_default_marker_h' => $default_marker_height,

-        'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG,

-        'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG,

-        'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),

-        'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),

-        'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),

-        'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),

-        'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),

-        'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),

-        /* on/off dragging for phone devices */

-        'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,

-        'geodir_is_mobile' => wp_is_mobile() ? true : false,

-        'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),

-        'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),

-        'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),

-        'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),

-        'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),

-        'geodir_action_remove' => __('Remove', 'geodirectory'),

+	$arr_alert_msg = array(

+		'geodir_plugin_url' => geodir_plugin_url(),

+		'geodir_admin_ajax_url' => $ajax_url,

+		'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),

+		'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),

+		'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),

+		'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),

+		//start not show alert msg

+		'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),

+		'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),

+		'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),

+		'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),

+		'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),

+		// end not show alert msg

+		'my_place_listing_del' => __('Are you wish to delete this listing?', 'geodirectory'),

+		'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),

+		//start not show alert msg

+		'rating_error_msg' => __('Error : please retry', 'geodirectory'),

+		'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),

+		'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),

+		'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),

+		'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),

+		'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),

+		'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),

+		'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),

+		'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),

+		'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),

+		'geodir_field_id_required' => __('This field is required.', 'geodirectory'),

+		'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),

+		'geodir_default_marker_icon' => $default_marker_icon,

+		'geodir_default_marker_w' => $default_marker_width,

+		'geodir_default_marker_h' => $default_marker_height,

+		'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG,

+		'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG,

+		'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),

+		'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),

+		'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),

+		'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),

+		'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),

+		'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),

+		/* on/off dragging for phone devices */

+		'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,

+		'geodir_is_mobile' => wp_is_mobile() ? true : false,

+		'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),

+		'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),

+		'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),

+		'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),

+		'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),

+		'geodir_action_remove' => __('Remove', 'geodirectory'),

 		'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),

 		'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),

 		'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',

@@ -1339,32 +1339,32 @@ 
 		'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

 		'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

 		'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',

-        'geodir_map_name' => geodir_map_name(),

-        'osmStart' => __('Start', 'geodirectory'),

-        'osmVia' => __('Via {viaNumber}', 'geodirectory'),

-        'osmEnd' => __('Enter Your Location', 'geodirectory'),

-    );

-

-    /**

-     * Filters the translated JS strings from function geodir_localize_all_js_msg().

-     *

-     * With this filter you can add, remove or change translated JS strings.

-     * You should add your own translations to this if you are building an addon rather than adding another script block.

-     *

-     * @since 1.0.0

-     */

-    $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

-

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

-        if (!is_scalar($value))

-            continue;

-        $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

-    }

+		'geodir_map_name' => geodir_map_name(),

+		'osmStart' => __('Start', 'geodirectory'),

+		'osmVia' => __('Via {viaNumber}', 'geodirectory'),

+		'osmEnd' => __('Enter Your Location', 'geodirectory'),

+	);

 

-    $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

-    echo '<script>';

-    echo $script;

-    echo '</script>';

+	/**

+	 * Filters the translated JS strings from function geodir_localize_all_js_msg().

+	 *

+	 * With this filter you can add, remove or change translated JS strings.

+	 * You should add your own translations to this if you are building an addon rather than adding another script block.

+	 *

+	 * @since 1.0.0

+	 */

+	$arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

+

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

+		if (!is_scalar($value))

+			continue;

+		$arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

+	}

+

+	$script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

+	echo '<script>';

+	echo $script;

+	echo '</script>';

 }

 

 add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);

@@ -1380,11 +1380,11 @@ 
  */

 function geodir_admin_bar_site_menu($wp_admin_bar)

 {

-    if (get_option("geodir_installed")) {

-        if (current_user_can('manage_options')) {

-            $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));

-        }

-    }

+	if (get_option("geodir_installed")) {

+		if (current_user_can('manage_options')) {

+			$wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));

+		}

+	}

 }

 

 add_action('geodir_before_listing', 'geodir_display_sort_options'); /*function in custom_functions.php*/

@@ -1410,25 +1410,25 @@ 
  */

 function geodir_store_sidebars()

 {

-    global $geodir_sidebars;

-    global $sidebars_widgets;

-

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

-    $geodir_old_sidebars = array();

-

-    if (is_array($geodir_sidebars)) {

-        foreach ($geodir_sidebars as $val) {

-            if (is_array($sidebars_widgets)) {

-                if (array_key_exists($val, $sidebars_widgets))

-                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];

-                else

-                    $geodir_old_sidebars[$val] = array();

-            }

-        }

-    }

-    update_option('geodir_sidebars', $geodir_old_sidebars);

-    geodir_option_version_backup('geodir_sidebars');

+	global $geodir_sidebars;

+	global $sidebars_widgets;

+

+	if (!is_array($sidebars_widgets))

+		$sidebars_widgets = wp_get_sidebars_widgets();

+	$geodir_old_sidebars = array();

+

+	if (is_array($geodir_sidebars)) {

+		foreach ($geodir_sidebars as $val) {

+			if (is_array($sidebars_widgets)) {

+				if (array_key_exists($val, $sidebars_widgets))

+					$geodir_old_sidebars[$val] = $sidebars_widgets[$val];

+				else

+					$geodir_old_sidebars[$val] = array();

+			}

+		}

+	}

+	update_option('geodir_sidebars', $geodir_old_sidebars);

+	geodir_option_version_backup('geodir_sidebars');

 

 }

 

@@ -1442,28 +1442,28 @@ 
  */

 function geodir_restore_sidebars()

 {

-    global $sidebars_widgets;

-

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

-

-    if (is_array($sidebars_widgets)) {

-        $geodir_old_sidebars = get_option('geodir_sidebars');

-        if (is_array($geodir_old_sidebars)) {

-            foreach ($geodir_old_sidebars as $key => $val) {

-                if(0 === strpos($key, 'geodir_'))// if gd widget

-                {

-                    $sidebars_widgets[$key] = $geodir_old_sidebars[$key];

-                }

+	global $sidebars_widgets;

 

+	if (!is_array($sidebars_widgets))

+		$sidebars_widgets = wp_get_sidebars_widgets();

 

-            }

-        }

+	if (is_array($sidebars_widgets)) {

+		$geodir_old_sidebars = get_option('geodir_sidebars');

+		if (is_array($geodir_old_sidebars)) {

+			foreach ($geodir_old_sidebars as $key => $val) {

+				if(0 === strpos($key, 'geodir_'))// if gd widget

+				{

+					$sidebars_widgets[$key] = $geodir_old_sidebars[$key];

+				}

 

-    }

 

-    update_option('sidebars_widgets', $sidebars_widgets);

-    update_option('geodir_sidebars', '');

+			}

+		}

+

+	}

+

+	update_option('sidebars_widgets', $sidebars_widgets);

+	update_option('geodir_sidebars', '');

 }

 

 add_action('geodir_after_listing_post_gridview', 'geodir_after_listing_post_gridview');

@@ -1476,9 +1476,9 @@ 
  */

 function geodir_after_listing_post_gridview()

 {

-    global $gridview_columns;

+	global $gridview_columns;

 

-    $gridview_columns = '';

+	$gridview_columns = '';

 

 }

 

@@ -1506,11 +1506,11 @@ 
  */

 function so_handle_038($url, $original_url, $_context)

 {

-    if (strstr($url, "maps.google.com/maps/api/js") !== false) {

-        $url = str_replace("&#038;", "&amp;", $url); // or $url = $original_url

-    }

+	if (strstr($url, "maps.google.com/maps/api/js") !== false) {

+		$url = str_replace("&#038;", "&amp;", $url); // or $url = $original_url

+	}

 

-    return $url;

+	return $url;

 }

 

 

@@ -1526,34 +1526,34 @@ 
 function geodir_after_main_form_fields() {

 	global $gd_session;

 	

-    if (get_option('geodir_accept_term_condition')) {

-        global $post;

-        $term_condition = '';

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

-            $post = (object)$gd_session->get('listing');

-            $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';

-        }

-

-        ?>

+	if (get_option('geodir_accept_term_condition')) {

+		global $post;

+		$term_condition = '';

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

+			$post = (object)$gd_session->get('listing');

+			$term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';

+		}

+

+		?>

         <div id="geodir_accept_term_condition_row" class="required_field geodir_form_row clearfix">

             <label>&nbsp;</label>

 

             <div class="geodir_taxonomy_field" style="float:left; width:70%;">

 				<span style="display:block"> 

 				<input class="main_list_selecter" type="checkbox" <?php if ($term_condition == '1') {

-                    echo 'checked="checked"';

-                } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"

+					echo 'checked="checked"';

+				} ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"

                        class="geodir_textfield" value="1"

                        style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

 				</span>

             </div>

             <span class="geodir_message_error"><?php if (isset($required_msg)) {

-                    _e($required_msg, 'geodirectory');

-                } ?></span>

+					_e($required_msg, 'geodirectory');

+				} ?></span>

         </div>

     <?php

 

-    }

+	}

 }

 

 

@@ -1578,42 +1578,42 @@ 
  */

 function geodir_detail_page_tab_is_display($is_display, $tab)

 {

-    global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields;

+	global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields;

 

-    if ($tab == 'post_profile') {

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

-        $desc_limit = apply_filters('geodir_description_field_desc_limit', '');

+	if ($tab == 'post_profile') {

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

+		$desc_limit = apply_filters('geodir_description_field_desc_limit', '');

         

-        if (!($desc_limit === '' || (int)$desc_limit > 0)) {

-            $is_display = false;

-        }

-    }

+		if (!($desc_limit === '' || (int)$desc_limit > 0)) {

+			$is_display = false;

+		}

+	}

     

-    if ($tab == 'post_info')

-        $is_display = (!empty($geodir_post_detail_fields)) ? true : false;

+	if ($tab == 'post_info')

+		$is_display = (!empty($geodir_post_detail_fields)) ? true : false;

     

-    if ($tab == 'post_images')

-        $is_display = (!empty($post_images)) ? true : false;

+	if ($tab == 'post_images')

+		$is_display = (!empty($post_images)) ? true : false;

 

-    if ($tab == 'post_video')

-        $is_display = (!empty($video)) ? true : false;

+	if ($tab == 'post_video')

+		$is_display = (!empty($video)) ? true : false;

 

-    if ($tab == 'special_offers')

-        $is_display = (!empty($special_offers)) ? true : false;

+	if ($tab == 'special_offers')

+		$is_display = (!empty($special_offers)) ? true : false;

 

-    if ($tab == 'reviews')

-        $is_display = (geodir_is_page('detail')) ? true : false;

+	if ($tab == 'reviews')

+		$is_display = (geodir_is_page('detail')) ? true : false;

 

-    if ($tab == 'related_listing') {

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

+	if ($tab == 'related_listing') {

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

        

-       /** This action is documented in geodirectory-functions/template_functions.php */

-       $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);

+	   /** This action is documented in geodirectory-functions/template_functions.php */

+	   $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);

        

-       $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;

-    }

+	   $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;

+	}

 

-    return $is_display;

+	return $is_display;

 }

 

 

@@ -1629,69 +1629,69 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.

  */

 function geodir_changes_in_custom_fields_table() {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 	

 	// Remove unused virtual page

 	$listings_page_id = (int)get_option('geodir_listing_page');

 	if ($listings_page_id) {

 		$wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

-        delete_option('geodir_listing_page');

+		delete_option('geodir_listing_page');

 	}

 

-    if (!get_option('geodir_changes_in_custom_fields_table')) {

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s",

-                array('1', '1', 'admin')

-            )

-        );

+	if (!get_option('geodir_changes_in_custom_fields_table')) {

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s",

+				array('1', '1', 'admin')

+			)

+		);

 

 

-        /* --- terms meta value set --- */

+		/* --- terms meta value set --- */

 

-        update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');

+		update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');

 

-        $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));

+		$options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));

 

-        if (!empty($options_data)) {

+		if (!empty($options_data)) {

 

-            foreach ($options_data as $optobj) {

+			foreach ($options_data as $optobj) {

 

-                $option_val = str_replace('tax_meta_', '', $optobj->option_name);

+				$option_val = str_replace('tax_meta_', '', $optobj->option_name);

 

-                $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

+				$taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

 

-                if (!empty($taxonomies_data)) {

+				if (!empty($taxonomies_data)) {

 

-                    foreach ($taxonomies_data as $taxobj) {

+					foreach ($taxonomies_data as $taxobj) {

 

-                        $taxObject = get_taxonomy($taxobj->taxonomy);

-                        $post_type = $taxObject->object_type[0];

+						$taxObject = get_taxonomy($taxobj->taxonomy);

+						$post_type = $taxObject->object_type[0];

 

-                        $opt_value = 'tax_meta_' . $post_type . '_' . $option_val;

+						$opt_value = 'tax_meta_' . $post_type . '_' . $option_val;

 

-                        $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));

+						$duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));

 

-                        if ($duplicate_data) {

+						if ($duplicate_data) {

 

-                            $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

+							$wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

 

-                        } else {

+						} else {

 

-                            $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

+							$wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

 

-                        }

+						}

 

-                    }

+					}

 

-                }

+				}

 

-            }

-        }

+			}

+		}

 

-        update_option('geodir_changes_in_custom_fields_table', '1');

+		update_option('geodir_changes_in_custom_fields_table', '1');

 

-    }

+	}

 

 }

 

@@ -1710,24 +1710,24 @@ 
 function geodir_location_slug_check($slug)

 {

 

-    global $wpdb, $table_prefix;

+	global $wpdb, $table_prefix;

 

-    $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));

+	$slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));

 

-    if ($slug_exists) {

+	if ($slug_exists) {

 

-        $suffix = 1;

-        do {

-            $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

-            $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));

-            $suffix++;

-        } while ($location_slug_check && $suffix < 100);

+		$suffix = 1;

+		do {

+			$alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

+			$location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));

+			$suffix++;

+		} while ($location_slug_check && $suffix < 100);

 

-        $slug = $alt_location_name;

+		$slug = $alt_location_name;

 

-    }

+	}

 

-    return $slug;

+	return $slug;

 

 }

 

@@ -1752,42 +1752,42 @@ 
 function geodir_update_term_slug($term_id, $tt_id, $taxonomy)

 {

 

-    global $wpdb, $plugin_prefix, $table_prefix;

+	global $wpdb, $plugin_prefix, $table_prefix;

 

-    $tern_data = get_term_by('id', $term_id, $taxonomy);

+	$tern_data = get_term_by('id', $term_id, $taxonomy);

 

-    $slug = $tern_data->slug;

+	$slug = $tern_data->slug;

 

-    /**

-     * Filter if a term slug exists.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param bool $bool Default: false.

-     * @param string $slug The term slug.

-     * @param int $term_id The term ID.

-     */

-    $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);

+	/**

+	 * Filter if a term slug exists.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param bool $bool Default: false.

+	 * @param string $slug The term slug.

+	 * @param int $term_id The term ID.

+	 */

+	$slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);

 

-    if ($slug_exists) {

+	if ($slug_exists) {

 

-        $suffix = 1;

-        do {

-            $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

+		$suffix = 1;

+		do {

+			$new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

 

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

-            $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);

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

+			$term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);

 

-            $suffix++;

-        } while ($term_slug_check && $suffix < 100);

+			$suffix++;

+		} while ($term_slug_check && $suffix < 100);

 

-        $slug = $new_slug;

+		$slug = $new_slug;

 

-        //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );

+		//wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );

 

-        $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

+		$wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

 

-    }

+	}

 	

 	// Update tag in detail table.

 	$taxonomy_obj = get_taxonomy($taxonomy);

@@ -1828,21 +1828,21 @@ 
 function geodir_term_slug_is_exists($slug_exists, $slug, $term_id)

 {

 

-    global $wpdb, $table_prefix;

+	global $wpdb, $table_prefix;

 

-    $default_location = geodir_get_default_location();

+	$default_location = geodir_get_default_location();

 

-    $country_slug = $default_location->country_slug;

-    $region_slug = $default_location->region_slug;

-    $city_slug = $default_location->city_slug;

+	$country_slug = $default_location->country_slug;

+	$region_slug = $default_location->region_slug;

+	$city_slug = $default_location->city_slug;

 

-    if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

-        return $slug_exists = true;

+	if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

+		return $slug_exists = true;

 

-    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

-        return $slug_exists = true;

+	if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

+		return $slug_exists = true;

 

-    return $slug_exists;

+	return $slug_exists;

 }

 

 

@@ -1861,75 +1861,75 @@ 
  */

 function geodir_custom_page_title($title = '', $sep = '')

 {

-    global $wp;

-    if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {

-        return $title;

-    }

+	global $wp;

+	if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {

+		return $title;

+	}

 

-    if ($sep == '') {

-        /**

-         * Filter the page title separator.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param string $sep The separator, default: `|`.

-         */

-        $sep = apply_filters('geodir_page_title_separator', '|');

-    }

+	if ($sep == '') {

+		/**

+		 * Filter the page title separator.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param string $sep The separator, default: `|`.

+		 */

+		$sep = apply_filters('geodir_page_title_separator', '|');

+	}

 

 

-    $gd_page = '';

-    if(geodir_is_page('home')){

-        $gd_page = 'home';

-        $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;

-    }

-    elseif(geodir_is_page('detail')){

-        $gd_page = 'detail';

-        $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;

-    }

-    elseif(geodir_is_page('pt')){

-        $gd_page = 'pt';

-        $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;

-    }

-    elseif(geodir_is_page('listing')){

-        $gd_page = 'listing';

-        $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;

-    }

-    elseif(geodir_is_page('location')){

-        $gd_page = 'location';

-        $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;

-    }

-    elseif(geodir_is_page('search')){

-        $gd_page = 'search';

-        $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;

-    }

-    elseif(geodir_is_page('add-listing')){

-        $gd_page = 'add-listing';

-        $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;

-    }

-    elseif(geodir_is_page('author')){

-        $gd_page = 'author';

-        $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;

-    }

-    elseif(geodir_is_page('login')){

-        $gd_page = 'login';

-        $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;

-    }

-    elseif(geodir_is_page('listing-success')){

-        $gd_page = 'listing-success';

-        $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

-    }

+	$gd_page = '';

+	if(geodir_is_page('home')){

+		$gd_page = 'home';

+		$title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;

+	}

+	elseif(geodir_is_page('detail')){

+		$gd_page = 'detail';

+		$title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;

+	}

+	elseif(geodir_is_page('pt')){

+		$gd_page = 'pt';

+		$title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;

+	}

+	elseif(geodir_is_page('listing')){

+		$gd_page = 'listing';

+		$title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;

+	}

+	elseif(geodir_is_page('location')){

+		$gd_page = 'location';

+		$title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;

+	}

+	elseif(geodir_is_page('search')){

+		$gd_page = 'search';

+		$title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;

+	}

+	elseif(geodir_is_page('add-listing')){

+		$gd_page = 'add-listing';

+		$title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;

+	}

+	elseif(geodir_is_page('author')){

+		$gd_page = 'author';

+		$title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;

+	}

+	elseif(geodir_is_page('login')){

+		$gd_page = 'login';

+		$title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;

+	}

+	elseif(geodir_is_page('listing-success')){

+		$gd_page = 'listing-success';

+		$title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

+	}

 

 

-    /**

-     * Filter page meta title to replace variables.

-     *

-     * @since 1.5.4

-     * @param string $title The page title including variables.

-     * @param string $gd_page The GeoDirectory page type if any.

-     * @param string $sep The title separator symbol.

-     */

-    return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);

+	/**

+	 * Filter page meta title to replace variables.

+	 *

+	 * @since 1.5.4

+	 * @param string $title The page title including variables.

+	 * @param string $gd_page The GeoDirectory page type if any.

+	 * @param string $sep The title separator symbol.

+	 */

+	return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);

 

 }

 

@@ -1945,36 +1945,36 @@ 
 function geodir_set_post_attachment()

 {

 

-    if (!get_option('geodir_set_post_attachments')) {

+	if (!get_option('geodir_set_post_attachments')) {

 

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

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

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

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

 

-        $all_postypes = geodir_get_posttypes();

+		$all_postypes = geodir_get_posttypes();

 

-        foreach($all_postypes as $post_type){

-            $args = array(

-                'posts_per_page' => -1,

-                'post_type' => $post_type,

-                'post_status' => 'publish');

+		foreach($all_postypes as $post_type){

+			$args = array(

+				'posts_per_page' => -1,

+				'post_type' => $post_type,

+				'post_status' => 'publish');

 

-            $posts_array = get_posts($args);

+			$posts_array = get_posts($args);

 

-            if (!empty($posts_array)) {

+			if (!empty($posts_array)) {

 

-                foreach ($posts_array as $post) {

+				foreach ($posts_array as $post) {

 

-                    geodir_set_wp_featured_image($post->ID);

+					geodir_set_wp_featured_image($post->ID);

 

-                }

+				}

 

-            }

-        }

+			}

+		}

 

 

-        update_option('geodir_set_post_attachments', '1');

+		update_option('geodir_set_post_attachments', '1');

 

-    }

+	}

 

 }

 

@@ -1991,19 +1991,19 @@ 
 function geodir_remove_url_seperator()

 {

 

-    if (!get_option('geodir_remove_url_seperator')) {

+	if (!get_option('geodir_remove_url_seperator')) {

 

-        if (get_option('geodir_listingurl_separator'))

-            delete_option('geodir_listingurl_separator');

+		if (get_option('geodir_listingurl_separator'))

+			delete_option('geodir_listingurl_separator');

 

-        if (get_option('geodir_detailurl_separator'))

-            delete_option('geodir_detailurl_separator');

+		if (get_option('geodir_detailurl_separator'))

+			delete_option('geodir_detailurl_separator');

 

-        flush_rewrite_rules(false);

+		flush_rewrite_rules(false);

 

-        update_option('geodir_remove_url_seperator', '1');

+		update_option('geodir_remove_url_seperator', '1');

 

-    }

+	}

 

 }

 

@@ -2019,19 +2019,19 @@ 
  */

 function geodir_remove_url_seperator_form_permalink_settings($permalink_arr)

 {

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

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

 

-        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

-            unset($permalink_arr[$key]);

+		if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

+			unset($permalink_arr[$key]);

 

-    }

+	}

 

-    return $permalink_arr;

+	return $permalink_arr;

 

 }

 

 if (!is_admin()) {

-    add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');

+	add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');

 }

 /**

  * Set status from draft to publish.

@@ -2044,16 +2044,16 @@ 
  */

 function geodir_set_status_draft_to_publish_for_own_post($post)

 {

-    $user_id = get_current_user_id();

+	$user_id = get_current_user_id();

 

-    if(!$user_id){return $post;}

+	if(!$user_id){return $post;}

 

-    $gd_post_types = geodir_get_posttypes();

+	$gd_post_types = geodir_get_posttypes();

 

-    if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {

-        $post[0]->post_status = 'publish';

-    }

-    return $post;

+	if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {

+		$post[0]->post_status = 'publish';

+	}

+	return $post;

 }

 

 

@@ -2145,33 +2145,33 @@ 
  */

 function geodir_detail_page_tab_headings_change($tabs_arr)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $post_type = geodir_get_current_posttype();

+	$post_type = geodir_get_current_posttype();

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {

+	if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {

 

-        if (array_key_exists('post_video', $tabs_arr)) {

+		if (array_key_exists('post_video', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

+			$field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

 

-            if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

-                $tabs_arr['post_video']['heading_text'] = $field_title;

-        }

+			if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

+				$tabs_arr['post_video']['heading_text'] = $field_title;

+		}

 

-        if (array_key_exists('special_offers', $tabs_arr)) {

+		if (array_key_exists('special_offers', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

+			$field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

 

-            if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

-                $tabs_arr['special_offers']['heading_text'] = $field_title;

-        }

+			if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

+				$tabs_arr['special_offers']['heading_text'] = $field_title;

+		}

 

-    }

+	}

 

-    return $tabs_arr;

+	return $tabs_arr;

 

 }

 

@@ -2184,10 +2184,10 @@ 
  */

 function geodir_remove_template_redirect_actions()

 {

-    if (geodir_is_page('login')){

-        remove_all_actions('template_redirect');

-        remove_action('init', 'avia_modify_front', 10);

-    }

+	if (geodir_is_page('login')){

+		remove_all_actions('template_redirect');

+		remove_action('init', 'avia_modify_front', 10);

+	}

 }

 

 

@@ -2209,51 +2209,51 @@ 
 function geodirectory_before_featured_image_delete($attachment_id)

 {

 

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_id = get_post_field('post_parent', $attachment_id);

+	$post_id = get_post_field('post_parent', $attachment_id);

 

-    $attachment_url = wp_get_attachment_url($attachment_id);

+	$attachment_url = wp_get_attachment_url($attachment_id);

 

-    if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {

+	if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {

 

-        $post_type = get_post_type($post_id);

+		$post_type = get_post_type($post_id);

 

-        $all_postypes = geodir_get_posttypes();

+		$all_postypes = geodir_get_posttypes();

 

-        if (!in_array($post_type, $all_postypes) || !is_admin())

-            return false;

+		if (!in_array($post_type, $all_postypes) || !is_admin())

+			return false;

 

-        $uploads = wp_upload_dir();

+		$uploads = wp_upload_dir();

 

-        $split_img_path = explode($uploads['baseurl'], $attachment_url);

+		$split_img_path = explode($uploads['baseurl'], $attachment_url);

 

-        $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

+		$split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

 

-        $wpdb->query(

-            $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",

-                array($post_id, $split_img_file_path)

-            )

-        );

+		$wpdb->query(

+			$wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",

+				array($post_id, $split_img_file_path)

+			)

+		);

 

-        $attachment_data = $wpdb->get_row(

-            $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",

-                array($post_id)

-            )

-        );

+		$attachment_data = $wpdb->get_row(

+			$wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",

+				array($post_id)

+			)

+		);

 

-        if (!empty($attachment_data)) {

-            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

-        }

+		if (!empty($attachment_data)) {

+			$wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+		}

 

 

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

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

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);

+		$wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);

 

-        geodir_set_wp_featured_image($post_id);

+		geodir_set_wp_featured_image($post_id);

 

-    }

+	}

 

 }

 

@@ -2271,79 +2271,79 @@ 
 function geodir_temp_set_post_attachment()

 {

 

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    foreach ($all_postypes as $posttype) {

+	foreach ($all_postypes as $posttype) {

 

-        $tablename = $plugin_prefix . $posttype . '_detail';

+		$tablename = $plugin_prefix . $posttype . '_detail';

 

-        $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);

+		$get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);

 

-        if (!empty($get_post_data)) {

+		if (!empty($get_post_data)) {

 

-            foreach ($get_post_data as $data) {

+			foreach ($get_post_data as $data) {

 

-                $post_id = $data->post_id;

+				$post_id = $data->post_id;

 

-                $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");

+				$attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");

 

-                if (!empty($attachment_data)) {

+				if (!empty($attachment_data)) {

 

-                    foreach ($attachment_data as $attach) {

+					foreach ($attachment_data as $attach) {

 

-                        $file_info = pathinfo($attach->file);

+						$file_info = pathinfo($attach->file);

 

-                        $sub_dir = '';

-                        if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                            $sub_dir = stripslashes_deep($file_info['dirname']);

+						$sub_dir = '';

+						if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

+							$sub_dir = stripslashes_deep($file_info['dirname']);

 

-                        $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

-                        $uploads_path = $uploads['basedir'];

+						$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

+						$uploads_path = $uploads['basedir'];

 

-                        $file_name = $file_info['basename'];

+						$file_name = $file_info['basename'];

 

-                        $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name;

+						$img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name;

 

-                        if (!file_exists($img_arr['path'])) {

+						if (!file_exists($img_arr['path'])) {

 

-                            $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);

+							$wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);

 

-                        }

+						}

 

-                    }

+					}

 

-                    $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");

+					$attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");

 

-                    if (!empty($attachment_data)) {

+					if (!empty($attachment_data)) {

 

-                        if ($attachment_data->ID)

-                            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+						if ($attachment_data->ID)

+							$wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

 

-                    } else {

+					} else {

 

-                        if (has_post_thumbnail($post_id)) {

+						if (has_post_thumbnail($post_id)) {

 

-                            $post_thumbnail_id = get_post_thumbnail_id($post_id);

+							$post_thumbnail_id = get_post_thumbnail_id($post_id);

 

-                            wp_delete_attachment($post_thumbnail_id);

+							wp_delete_attachment($post_thumbnail_id);

 

-                        }

+						}

 

-                    }

+					}

 

-                    $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);

+					$wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);

 

-                    geodir_set_wp_featured_image($post_id);

+					geodir_set_wp_featured_image($post_id);

 

-                }

+				}

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 }

 

@@ -2361,9 +2361,9 @@ 
 function geodir_default_rating_star_icon()

 {

 

-    if (!get_option('geodir_default_rating_star_icon')) {

-        update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');

-    }

+	if (!get_option('geodir_default_rating_star_icon')) {

+		update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');

+	}

 

 }

 

@@ -2381,27 +2381,27 @@ 
  */

 function geodir_user_post_listing_count($user_id=null)

 {

-    global $wpdb, $plugin_prefix, $current_user;

-    if(!$user_id){

-        $user_id = $current_user->ID;

-    }

+	global $wpdb, $plugin_prefix, $current_user;

+	if(!$user_id){

+		$user_id = $current_user->ID;

+	}

 

-    $user_id = $current_user->ID;

-    $all_postypes = geodir_get_posttypes();

-    $all_posts = get_option('geodir_listing_link_user_dashboard');

+	$user_id = $current_user->ID;

+	$all_postypes = geodir_get_posttypes();

+	$all_posts = get_option('geodir_listing_link_user_dashboard');

 

-    $user_listing = array();

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

-        foreach ($all_posts as $ptype) {

-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");

+	$user_listing = array();

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

+		foreach ($all_posts as $ptype) {

+			$total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");

 

-            if ($total_posts > 0) {

-                $user_listing[$ptype] = $total_posts;

-            }

-        }

-    }

+			if ($total_posts > 0) {

+				$user_listing[$ptype] = $total_posts;

+			}

+		}

+	}

 

-    return $user_listing;

+	return $user_listing;

 }

 

 

@@ -2421,189 +2421,189 @@ 
  */

 function geodir_detail_page_custom_field_tab($tabs_arr)

 {

-    global $post;

-

-    $post_type = geodir_get_current_posttype();

-    $all_postypes = geodir_get_posttypes();

-

-    if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {

-        $package_info = array();

-        $package_info = geodir_post_package_info($package_info, $post);

-        $post_package_id = !empty($package_info->pid) ? $package_info->pid : '';

-        $fields_location = 'owntab';

-

-        $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location);

-

-        //remove video and special offers if it is already set to show

-        if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){

-            $unset_video = true;

-        }

-

-        if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){

-            $unset_special_offers = true;

-        }

-        if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){

-            foreach($custom_fields as $key => $custom_field){

-                if($custom_field['name']=='geodir_video' && isset($unset_video)){

-                    unset($custom_fields[$key]);

-                }

-                if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){

-                    unset($custom_fields[$key]);

-                }

-            }

-        }

+	global $post;

 

+	$post_type = geodir_get_current_posttype();

+	$all_postypes = geodir_get_posttypes();

 

+	if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {

+		$package_info = array();

+		$package_info = geodir_post_package_info($package_info, $post);

+		$post_package_id = !empty($package_info->pid) ? $package_info->pid : '';

+		$fields_location = 'owntab';

 

-        if (!empty($custom_fields)) {

-            $parse_custom_fields = array();

-            foreach ($custom_fields as $field) {

-                $field = stripslashes_deep($field); // strip slashes

-                

-                $type = $field;

-                $field_name = $field['htmlvar_name'];

-                if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

-                    $post->{$field_name} = $_REQUEST[$field_name];

-                }

-

-                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false  && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

-                    if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {

-                        continue;

-                    }

+		$custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location);

 

-                    $parse_custom_fields[] = $field;

-                }

-            }

-            $custom_fields = $parse_custom_fields;

-        }

-        //print_r($custom_fields);

-        if (!empty($custom_fields)) {

-

-            global $field_set_start;

+		//remove video and special offers if it is already set to show

+		if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){

+			$unset_video = true;

+		}

 

-            $post = stripslashes_deep($post); // strip slashes

-            

-            $field_set_start = 0;

-            $fieldset_count = 0;

-            $fieldset = '';

-            $total_fields = count($custom_fields);

-            $count_field = 0;

-            $fieldset_arr = array();

-            $i = 0;

-            $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL;

-

-            foreach ($custom_fields as $field) {

-                $count_field++;

-                $field_name = $field['htmlvar_name'];

-                if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

-                    $post->{$field_name} = $_REQUEST[$field_name];

-                }

+		if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){

+			$unset_special_offers = true;

+		}

+		if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){

+			foreach($custom_fields as $key => $custom_field){

+				if($custom_field['name']=='geodir_video' && isset($unset_video)){

+					unset($custom_fields[$key]);

+				}

+				if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){

+					unset($custom_fields[$key]);

+				}

+			}

+		}

 

-                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

-                    $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title'];

-                    $site_title = trim($field['site_title']);

-                    $type = $field;

-                    $variables_array = array();

 

-                    if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {

-                        continue;

-                    }

 

-                    if ($type['type'] != 'fieldset') {

-                        $i++;

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

-                        $variables_array['label'] = __($type['site_title'], 'geodirectory');

-                        $variables_array['value'] = '';

-                        $variables_array['value'] = $post->{$type['htmlvar_name']};

-                    }else{

-                        $i = 0;

-                        $fieldset_count++;

-                        $field_set_start = 1;

-                        $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count;

-                        $fieldset_arr[$fieldset_count]['label'] = $label;

-                    }

+		if (!empty($custom_fields)) {

+			$parse_custom_fields = array();

+			foreach ($custom_fields as $field) {

+				$field = stripslashes_deep($field); // strip slashes

+                

+				$type = $field;

+				$field_name = $field['htmlvar_name'];

+				if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

+					$post->{$field_name} = $_REQUEST[$field_name];

+				}

+

+				if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false  && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

+					if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {

+						continue;

+					}

+

+					$parse_custom_fields[] = $field;

+				}

+			}

+			$custom_fields = $parse_custom_fields;

+		}

+		//print_r($custom_fields);

+		if (!empty($custom_fields)) {

 

+			global $field_set_start;

 

-                    $type = stripslashes_deep($type); // strip slashes

-                    $html = '';

-                    $html_var = '';

-                    $field_icon = geodir_field_icon_proccess($type);

-                    $filed_type = $type['type'];

-

-                    /**

-                     * Filter the output for custom fields.

-                     *

-                     * Here we can remove or add new functions depending on the field type.

-                     *

-                     * @param string $html The html to be filtered (blank).

-                     * @param string $fields_location The location the field is to be show.

-                     * @param array $type The array of field values.

-                     */

-                    $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);

-

-

-                    /**

-                     * Filter custom field output in tab.

-                     *

-                     * @since 1.5.6

-                     *

-                     * @param string $html_var The HTML variable name for the field.

-                     * @param string $html Custom field unfiltered HTML.

-                     * @param array $variables_array Custom field variables array.

-                     */

-                    $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);

-

-                    $fieldset_html = '';

-                    if ($field_set_start == 1) {

-                        $add_html = false;

-                        if ($type['type'] == 'fieldset' && $fieldset_count > 1) {

-                            if ($fieldset != '') {

-                                $add_html = true;

-                                $label = $fieldset_arr[$fieldset_count - 1]['label'];

-                                $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name'];

-                            }

-                            $fieldset_html = $fieldset;

-                            $fieldset = '';

-                        } else {

-                            $fieldset .= $html;

-                            if ($total_fields == $count_field && $fieldset != '') {

-                                $add_html = true;

-                                $label = $fieldset_arr[$fieldset_count]['label'];

-                                $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name'];

-                                $fieldset_html = $fieldset;

-                            }

-                        }

-

-                        if ($add_html) {

-                            $tabs_arr[$htmlvar_name] = array(

-                                'heading_text' => __($label, 'geodirectory'),

-                                'is_active_tab' => false,

-                                /**

-                                 * Filter if a custom field should be displayed on the details page tab.

-                                 *

-                                 * @since 1.0.0

-                                 * @param string $htmlvar_name The field HTML var name.

-                                 */

-                                'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),

-                                'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>'

-                            );

-                        }

-                    } else {

-                        if ($html != '') {

-                            $tabs_arr[$field['htmlvar_name']] = array(

-                                'heading_text' => __($label, 'geodirectory'),

-                                'is_active_tab' => false,

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

-                                'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),

-                                'tab_content' => $html

-                            );

-                        }

-                    }

-                }

-            }

-        }

-    }

-    return $tabs_arr;

+			$post = stripslashes_deep($post); // strip slashes

+            

+			$field_set_start = 0;

+			$fieldset_count = 0;

+			$fieldset = '';

+			$total_fields = count($custom_fields);

+			$count_field = 0;

+			$fieldset_arr = array();

+			$i = 0;

+			$geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL;

+

+			foreach ($custom_fields as $field) {

+				$count_field++;

+				$field_name = $field['htmlvar_name'];

+				if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

+					$post->{$field_name} = $_REQUEST[$field_name];

+				}

+

+				if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

+					$label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title'];

+					$site_title = trim($field['site_title']);

+					$type = $field;

+					$variables_array = array();

+

+					if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {

+						continue;

+					}

+

+					if ($type['type'] != 'fieldset') {

+						$i++;

+						$variables_array['post_id'] = $post->ID;

+						$variables_array['label'] = __($type['site_title'], 'geodirectory');

+						$variables_array['value'] = '';

+						$variables_array['value'] = $post->{$type['htmlvar_name']};

+					}else{

+						$i = 0;

+						$fieldset_count++;

+						$field_set_start = 1;

+						$fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count;

+						$fieldset_arr[$fieldset_count]['label'] = $label;

+					}

+

+

+					$type = stripslashes_deep($type); // strip slashes

+					$html = '';

+					$html_var = '';

+					$field_icon = geodir_field_icon_proccess($type);

+					$filed_type = $type['type'];

+

+					/**

+					 * Filter the output for custom fields.

+					 *

+					 * Here we can remove or add new functions depending on the field type.

+					 *

+					 * @param string $html The html to be filtered (blank).

+					 * @param string $fields_location The location the field is to be show.

+					 * @param array $type The array of field values.

+					 */

+					$html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);

+

+

+					/**

+					 * Filter custom field output in tab.

+					 *

+					 * @since 1.5.6

+					 *

+					 * @param string $html_var The HTML variable name for the field.

+					 * @param string $html Custom field unfiltered HTML.

+					 * @param array $variables_array Custom field variables array.

+					 */

+					$html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);

+

+					$fieldset_html = '';

+					if ($field_set_start == 1) {

+						$add_html = false;

+						if ($type['type'] == 'fieldset' && $fieldset_count > 1) {

+							if ($fieldset != '') {

+								$add_html = true;

+								$label = $fieldset_arr[$fieldset_count - 1]['label'];

+								$htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name'];

+							}

+							$fieldset_html = $fieldset;

+							$fieldset = '';

+						} else {

+							$fieldset .= $html;

+							if ($total_fields == $count_field && $fieldset != '') {

+								$add_html = true;

+								$label = $fieldset_arr[$fieldset_count]['label'];

+								$htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name'];

+								$fieldset_html = $fieldset;

+							}

+						}

+

+						if ($add_html) {

+							$tabs_arr[$htmlvar_name] = array(

+								'heading_text' => __($label, 'geodirectory'),

+								'is_active_tab' => false,

+								/**

+								 * Filter if a custom field should be displayed on the details page tab.

+								 *

+								 * @since 1.0.0

+								 * @param string $htmlvar_name The field HTML var name.

+								 */

+								'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),

+								'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>'

+							);

+						}

+					} else {

+						if ($html != '') {

+							$tabs_arr[$field['htmlvar_name']] = array(

+								'heading_text' => __($label, 'geodirectory'),

+								'is_active_tab' => false,

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

+								'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),

+								'tab_content' => $html

+							);

+						}

+					}

+				}

+			}

+		}

+	}

+	return $tabs_arr;

 }

 

 /* display add listing page for wpml */

@@ -2627,37 +2627,37 @@ 
  */

 function geodir_add_post_status_author_page()

 {

-    global $wpdb, $post;

-

-    $html = '';

-    if (get_current_user_id()) {

-        if (geodir_is_page('author') && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {

-

-            // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them.

-            $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");

-            $status = "<strong>(";

-            $status_icon = '<i class="fa fa-play"></i>';

-            if ($real_status == 'publish') {

-                $status .= __('Published', 'geodirectory');

-            } else {

-                $status .= __('Not published', 'geodirectory');

-                $status_icon = '<i class="fa fa-pause"></i>';

-            }

-            $status .= ")</strong>";

+	global $wpdb, $post;

+

+	$html = '';

+	if (get_current_user_id()) {

+		if (geodir_is_page('author') && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {

+

+			// we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them.

+			$real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");

+			$status = "<strong>(";

+			$status_icon = '<i class="fa fa-play"></i>';

+			if ($real_status == 'publish') {

+				$status .= __('Published', 'geodirectory');

+			} else {

+				$status .= __('Not published', 'geodirectory');

+				$status_icon = '<i class="fa fa-pause"></i>';

+			}

+			$status .= ")</strong>";

 

-            $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';

-        }

-    }

+			$html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';

+		}

+	}

 

-    if ($html != '') {

-        /**

-         * Filter the post status text on the author page.

-         *

-         * @since 1.0.0

-         * @param string $html The HTML of the status.

-         */

-        echo apply_filters('geodir_filter_status_text_on_author_page', $html);

-    }

+	if ($html != '') {

+		/**

+		 * Filter the post status text on the author page.

+		 *

+		 * @since 1.0.0

+		 * @param string $html The HTML of the status.

+		 */

+		echo apply_filters('geodir_filter_status_text_on_author_page', $html);

+	}

 

 

 }

@@ -2671,21 +2671,21 @@ 
  */

 function geodir_init_no_rating()

 {

-    if (get_option('geodir_disable_rating')) {

-        remove_action('comment_form_logged_in_after', 'geodir_comment_rating_fields');

-        remove_action('comment_form_before_fields', 'geodir_comment_rating_fields');

-        remove_action('comment_form_logged_in_after', 'geodir_reviewrating_comment_rating_fields');

-        remove_action('comment_form_before_fields', 'geodir_reviewrating_comment_rating_fields');

-        remove_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');

-        remove_action('add_meta_boxes', 'geodir_reviewrating_comment_metabox', 13);

-        remove_filter('comment_text', 'geodir_wrap_comment_text', 40);

-

-        add_action('comment_form_logged_in_after', 'geodir_no_rating_rating_fields');

-        add_action('comment_form_before_fields', 'geodir_no_rating_rating_fields');

-        add_filter('comment_text', 'geodir_no_rating_comment_text', 100, 2);

-        add_filter('geodir_detail_page_review_rating_html', 'geodir_no_rating_review_rating_html', 100);

-        add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);

-    }

+	if (get_option('geodir_disable_rating')) {

+		remove_action('comment_form_logged_in_after', 'geodir_comment_rating_fields');

+		remove_action('comment_form_before_fields', 'geodir_comment_rating_fields');

+		remove_action('comment_form_logged_in_after', 'geodir_reviewrating_comment_rating_fields');

+		remove_action('comment_form_before_fields', 'geodir_reviewrating_comment_rating_fields');

+		remove_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');

+		remove_action('add_meta_boxes', 'geodir_reviewrating_comment_metabox', 13);

+		remove_filter('comment_text', 'geodir_wrap_comment_text', 40);

+

+		add_action('comment_form_logged_in_after', 'geodir_no_rating_rating_fields');

+		add_action('comment_form_before_fields', 'geodir_no_rating_rating_fields');

+		add_filter('comment_text', 'geodir_no_rating_comment_text', 100, 2);

+		add_filter('geodir_detail_page_review_rating_html', 'geodir_no_rating_review_rating_html', 100);

+		add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);

+	}

 }

 

 /**

@@ -2697,20 +2697,20 @@ 
  */

 function geodir_no_rating_rating_fields()

 {

-    global $post;

+	global $post;

 

-    $post_types = geodir_get_posttypes();

+	$post_types = geodir_get_posttypes();

 

-    if (!empty($post) && isset($post->post_type) && in_array($post->post_type, $post_types)) {

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

-            echo '<input type="hidden" value="1" name="geodir_rating[overall]" />';

-            if (get_option('geodir_reviewrating_enable_images')) {

-                geodir_reviewrating_rating_img_html();

-            }

-        } else {

-            echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />';

-        }

-    }

+	if (!empty($post) && isset($post->post_type) && in_array($post->post_type, $post_types)) {

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

+			echo '<input type="hidden" value="1" name="geodir_rating[overall]" />';

+			if (get_option('geodir_reviewrating_enable_images')) {

+				geodir_reviewrating_rating_img_html();

+			}

+		} else {

+			echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />';

+		}

+	}

 }

 

 /**

@@ -2724,11 +2724,11 @@ 
  */

 function geodir_no_rating_comment_text($content, $comment = '')

 {

-    if (!is_admin()) {

-        return '<div class="description">' . $content . '</div>';

-    } else {

-        return $content;

-    }

+	if (!is_admin()) {

+		return '<div class="description">' . $content . '</div>';

+	} else {

+		return $content;

+	}

 }

 

 /**

@@ -2741,7 +2741,7 @@ 
  */

 function geodir_no_rating_review_rating_html($content = '')

 {

-    return NULL;

+	return NULL;

 }

 

 /**

@@ -2755,19 +2755,19 @@ 
  */

 function geodir_no_rating_get_sort_options($options, $post_type = '')

 {

-    $new_options = array();

-    if (!empty($options)) {

-        foreach ($options as $option) {

-            if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {

-                continue;

-            }

-            $new_options[] = $option;

-        }

+	$new_options = array();

+	if (!empty($options)) {

+		foreach ($options as $option) {

+			if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {

+				continue;

+			}

+			$new_options[] = $option;

+		}

 

-        $options = $new_options;

-    }

+		$options = $new_options;

+	}

 

-    return $options;

+	return $options;

 }

 

 add_filter('geodir_all_js_msg', 'geodir_all_js_msg_no_rating', 100);

@@ -2781,11 +2781,11 @@ 
  */

 function geodir_all_js_msg_no_rating($msg = array())

 {

-    if (get_option('geodir_disable_rating')) {

-        $msg['gd_cmt_no_rating'] = true;

-    }

+	if (get_option('geodir_disable_rating')) {

+		$msg['gd_cmt_no_rating'] = true;

+	}

 

-    return $msg;

+	return $msg;

 }

 

 add_filter('body_class', 'geodir_body_class_no_rating', 100);

@@ -2799,13 +2799,13 @@ 
  */

 function geodir_body_class_no_rating($classes = array())

 {

-    if (get_option('geodir_disable_rating')) {

-        $classes[] = 'gd-no-rating';

-    }

+	if (get_option('geodir_disable_rating')) {

+		$classes[] = 'gd-no-rating';

+	}

     

-    $classes[] = 'gd-map-' . geodir_map_name();

+	$classes[] = 'gd-map-' . geodir_map_name();

 

-    return $classes;

+	return $classes;

 }

 

 add_filter('admin_body_class', 'geodir_admin_body_class_no_rating', 100);

@@ -2819,13 +2819,13 @@ 
  */

 function geodir_admin_body_class_no_rating($class = '')

 {

-    if (get_option('geodir_disable_rating')) {

-        $class .= ' gd-no-rating';

-    }

+	if (get_option('geodir_disable_rating')) {

+		$class .= ' gd-no-rating';

+	}

     

-    $class .= ' gd-map-' . geodir_map_name();

+	$class .= ' gd-map-' . geodir_map_name();

 

-    return $class;

+	return $class;

 }

 

 add_action('wp_head', 'geodir_wp_head_no_rating');

@@ -2838,10 +2838,10 @@ 
  */

 function geodir_wp_head_no_rating()

 {

-    if (get_option('geodir_disable_rating')) {

-        echo '<style>body .geodir-rating, body .geodir-bubble-rating, body .gd_ratings_module_box{display:none!important;}</style>';

-        echo '<script type="text/javascript">jQuery(function(){jQuery(".gd_rating_show").parent(".geodir-rating").remove();});</script>';

-    }

+	if (get_option('geodir_disable_rating')) {

+		echo '<style>body .geodir-rating, body .geodir-bubble-rating, body .gd_ratings_module_box{display:none!important;}</style>';

+		echo '<script type="text/javascript">jQuery(function(){jQuery(".gd_rating_show").parent(".geodir-rating").remove();});</script>';

+	}

 }

 

 add_filter('geodir_load_db_language', 'geodir_load_custom_field_translation');

@@ -2858,36 +2858,36 @@ 
  * @return array Translation texts.

  */

 function geodir_load_gd_options_text_translation($translation_texts = array()) {

-    $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

-

-    $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');

-

-    /**

-     * Filters the geodirectory option names that requires to add for translation.

-     *

-     * @since 1.5.7

-     * @package GeoDirectory

-     *

-     * @param  array $gd_options Array of option names.

-     */

-    $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);

-    $gd_options = array_unique($gd_options);

-

-    if (!empty($gd_options)) {

-        foreach ($gd_options as $gd_option) {

-            if ($gd_option != '' && $option_value = get_option($gd_option)) {

-                $option_value = is_string($option_value) ? stripslashes_deep($option_value) : '';

+	$translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

+

+	$gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');

+

+	/**

+	 * Filters the geodirectory option names that requires to add for translation.

+	 *

+	 * @since 1.5.7

+	 * @package GeoDirectory

+	 *

+	 * @param  array $gd_options Array of option names.

+	 */

+	$gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);

+	$gd_options = array_unique($gd_options);

+

+	if (!empty($gd_options)) {

+		foreach ($gd_options as $gd_option) {

+			if ($gd_option != '' && $option_value = get_option($gd_option)) {

+				$option_value = is_string($option_value) ? stripslashes_deep($option_value) : '';

                 

-                if ($option_value != '' && !in_array($option_value, $translation_texts)) {

-                    $translation_texts[] = stripslashes_deep($option_value);

-                }

-            }

-        }

-    }

+				if ($option_value != '' && !in_array($option_value, $translation_texts)) {

+					$translation_texts[] = stripslashes_deep($option_value);

+				}

+			}

+		}

+	}

 

-    $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

-    return $translation_texts;

+	return $translation_texts;

 }

 

 add_filter('geodir_load_db_language', 'geodir_load_gd_options_text_translation');

@@ -2901,15 +2901,15 @@ 
 

 add_filter('get_comments_link', 'gd_get_comments_link', 10, 2);

 function gd_get_comments_link($comments_link, $post_id) {

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $all_postypes = geodir_get_posttypes();

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

-        $comments_link = str_replace('#comments', '#reviews', $comments_link);

-        $comments_link = str_replace('#respond', '#reviews', $comments_link);

-    }

+	$all_postypes = geodir_get_posttypes();

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

+		$comments_link = str_replace('#comments', '#reviews', $comments_link);

+		$comments_link = str_replace('#respond', '#reviews', $comments_link);

+	}

 

-    return $comments_link;

+	return $comments_link;

 }

 

 

@@ -2927,11 +2927,11 @@ 
 function geodir_add_nav_menu_class( $args )

 {

 

-        if(isset($args['menu_class'])){

-            $args['menu_class'] = $args['menu_class']." gd-menu-z";

-        }

+		if(isset($args['menu_class'])){

+			$args['menu_class'] = $args['menu_class']." gd-menu-z";

+		}

     

-    return $args;

+	return $args;

 }

 

 add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' );
\ No newline at end of file

Spacing +145 added lines, -145 removed lines

@@ -136,7 +136,7 @@ 
 /* ON TEMPLATE INCLUDE */

 /////////////////////////

 

-add_filter('template_include', 'geodir_template_loader',9);

+add_filter('template_include', 'geodir_template_loader', 9);

 

 /////////////////////////

 /* CATEGORY / TAXONOMY / CUSTOM POST ACTIONS */

@@ -176,9 +176,9 @@ 
 /* WP REVIEW COUNT ACTIONS */

 ////////////////////////

 

-add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100,1);

+add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100, 1);

 //add_action('geodir_update_postrating', 'geodir_term_review_count_force_update', 100);

-add_action('transition_post_status', 'geodir_term_review_count_force_update', 100,3);

+add_action('transition_post_status', 'geodir_term_review_count_force_update', 100, 3);

 //add_action('created_term', 'geodir_term_review_count_force_update', 100);

 add_action('edited_term', 'geodir_term_review_count_force_update', 100);

 add_action('delete_term', 'geodir_term_review_count_force_update', 100);

@@ -222,7 +222,7 @@ 
  */

 function geodir_unset_prev_theme_nav_location($newname)

 {

-    $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);

+    $geodir_theme_location = get_option('geodir_theme_location_nav_'.$newname);

     if ($geodir_theme_location) {

         update_option('geodir_theme_location_nav', $geodir_theme_location);

     } else {

@@ -320,8 +320,8 @@ 
 

 /////// GEO DIRECOTORY CUSTOM HOOKS ///

 

-add_action('geodir_before_tab_content', 'geodir_before_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content 

-add_action('geodir_after_tab_content', 'geodir_after_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content

+add_action('geodir_before_tab_content', 'geodir_before_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content 

+add_action('geodir_after_tab_content', 'geodir_after_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content

 

 // Detail page sidebar content 

 add_action('geodir_detail_page_sidebar', 'geodir_detail_page_sidebar_content_sorting', 1);

@@ -422,8 +422,8 @@ 
     do_action('geodir_after_social_sharing_buttons');

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_tfg_buttons_section') != 1) {

         /**

          * Filter the geodir_social_sharing_buttons() function content.

          *

@@ -469,8 +469,8 @@ 
     do_action('geodir_after_share_this_button');

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_sharethis_button_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_sharethis_button_section') != 1) {

         /**

          * Filter the geodir_share_this_button() function content.

          *

@@ -509,12 +509,12 @@ 
             $post_id = $post->ID;

             

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

-                $post_id = (int)$_REQUEST['pid'];

+                $post_id = (int) $_REQUEST['pid'];

             }

 

             $postlink = get_permalink(geodir_add_listing_page_id());

             $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);

-            echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';

+            echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="'.esc_url($editlink).'">'.__('Edit this Post', 'geodirectory').'</a></p>';

         }

     }// end of if, if its a preview or not

     /**

@@ -525,8 +525,8 @@ 
     do_action('geodir_after_edit_post_link');

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_user_links_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_user_links_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

          *

@@ -579,14 +579,14 @@ 
     $hide_refresh = get_option('geodir_ga_auto_refresh');

     

     $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0;

-    if (get_option('geodir_ga_stats') && is_user_logged_in() &&  (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {

+    if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id() == $post->post_author || current_user_can('manage_options'))) {

         $page_url = urlencode($_SERVER['REQUEST_URI']);

         ?>

         <script type="text/javascript">

             var gd_gaTimeOut;

-            var gd_gaTime = parseInt('<?php echo $refresh_time;?>');

-            var gd_gaHideRefresh = <?php echo (int)$hide_refresh;?>;

-            var gd_gaAutoRefresh = <?php echo $auto_refresh;?>;

+            var gd_gaTime = parseInt('<?php echo $refresh_time; ?>');

+            var gd_gaHideRefresh = <?php echo (int) $hide_refresh; ?>;

+            var gd_gaAutoRefresh = <?php echo $auto_refresh; ?>;

             ga_data1 = false;

             ga_data2 = false;

             ga_data3 = false;

@@ -727,7 +727,7 @@ 
             }

 

             function gdga_noResults() {

-                jQuery('#gdga-chart-container').html('<?php _e('No results available','geodirectory');?>');

+                jQuery('#gdga-chart-container').html('<?php _e('No results available', 'geodirectory'); ?>');

                 jQuery('#gdga-legend-container').html('');

             }

 

@@ -759,18 +759,18 @@ 
                     var data2 = results[1].rows.map(function(row) { return +row[2]; });

                     //var labelsN = results[0].rows.map(function(row) { return +row[1]; });

 

-                    var labels = ['<?php _e('Jan', 'geodirectory');?>',

-                        '<?php _e('Feb', 'geodirectory');?>',

-                        '<?php _e('Mar', 'geodirectory');?>',

-                        '<?php _e('Apr', 'geodirectory');?>',

-                        '<?php _e('May', 'geodirectory');?>',

-                        '<?php _e('Jun', 'geodirectory');?>',

-                        '<?php _e('Jul', 'geodirectory');?>',

-                        '<?php _e('Aug', 'geodirectory');?>',

-                        '<?php _e('Sep', 'geodirectory');?>',

-                        '<?php _e('Oct', 'geodirectory');?>',

-                        '<?php _e('Nov', 'geodirectory');?>',

-                        '<?php _e('Dec', 'geodirectory');?>'];

+                    var labels = ['<?php _e('Jan', 'geodirectory'); ?>',

+                        '<?php _e('Feb', 'geodirectory'); ?>',

+                        '<?php _e('Mar', 'geodirectory'); ?>',

+                        '<?php _e('Apr', 'geodirectory'); ?>',

+                        '<?php _e('May', 'geodirectory'); ?>',

+                        '<?php _e('Jun', 'geodirectory'); ?>',

+                        '<?php _e('Jul', 'geodirectory'); ?>',

+                        '<?php _e('Aug', 'geodirectory'); ?>',

+                        '<?php _e('Sep', 'geodirectory'); ?>',

+                        '<?php _e('Oct', 'geodirectory'); ?>',

+                        '<?php _e('Nov', 'geodirectory'); ?>',

+                        '<?php _e('Dec', 'geodirectory'); ?>'];

 

                     // Ensure the data arrays are at least as long as the labels array.

                     // Chart.js bar charts don't (yet) accept sparse datasets.

@@ -783,13 +783,13 @@ 
                         labels : labels,

                         datasets : [

                             {

-                                label: '<?php _e('Last Year', 'geodirectory');?>',

+                                label: '<?php _e('Last Year', 'geodirectory'); ?>',

                                 fillColor : "rgba(220,220,220,0.5)",

                                 strokeColor : "rgba(220,220,220,1)",

                                 data : data2

                             },

                             {

-                                label: '<?php _e('This Year', 'geodirectory');?>',

+                                label: '<?php _e('This Year', 'geodirectory'); ?>',

                                 fillColor : "rgba(151,187,205,0.5)",

                                 strokeColor : "rgba(151,187,205,1)",

                                 data : data1

@@ -834,30 +834,30 @@ 
 

                     <?php

                     // Here we list the shorthand days of the week so it can be used in translation.

-                    __("Mon",'geodirectory');

-                    __("Tue",'geodirectory');

-                    __("Wed",'geodirectory');

-                    __("Thu",'geodirectory');

-                    __("Fri",'geodirectory');

-                    __("Sat",'geodirectory');

-                    __("Sun",'geodirectory');

+                    __("Mon", 'geodirectory');

+                    __("Tue", 'geodirectory');

+                    __("Wed", 'geodirectory');

+                    __("Thu", 'geodirectory');

+                    __("Fri", 'geodirectory');

+                    __("Sat", 'geodirectory');

+                    __("Sun", 'geodirectory');

                     ?>

 

                     labels = [

-                        "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+2 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+3 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+4 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+5 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+6 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+7 day")),'geodirectory'); ?>"

+                        "<?php _e(date('D', strtotime("+1 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+2 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+3 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+4 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+5 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+6 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+7 day")), 'geodirectory'); ?>"

                     ];

 

                     var data = {

                         labels : labels,

                         datasets : [

                             {

-                                label: '<?php _e('Last Week', 'geodirectory');?>',

+                                label: '<?php _e('Last Week', 'geodirectory'); ?>',

                                 fillColor : "rgba(220,220,220,0.5)",

                                 strokeColor : "rgba(220,220,220,1)",

                                 pointColor : "rgba(220,220,220,1)",

@@ -865,7 +865,7 @@ 
                                 data : data2

                             },

                             {

-                                label: '<?php _e('This Week', 'geodirectory');?>',

+                                label: '<?php _e('This Week', 'geodirectory'); ?>',

                                 fillColor : "rgba(151,187,205,0.5)",

                                 strokeColor : "rgba(151,187,205,1)",

                                 pointColor : "rgba(151,187,205,1)",

@@ -1072,18 +1072,18 @@ 
         </style>

         <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js"></script>

         <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js"></script>

-        <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory');?></button>

+        <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory'); ?></button>

         <span id="ga_stats" class="gdga-analytics-box" style="display:none">

-            <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory');?></div>

+            <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory'); ?></div>

             <div id="gd-active-users-container">

-                <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory');?>"></i><?php _e("Active Users:", 'geodirectory');?>

+                <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory'); ?>"></i><?php _e("Active Users:", 'geodirectory'); ?>

                     <b class="gd-ActiveUsers-value">0</b>

                 </div>

             </div>

             <select id="gdga-select-analytic" onchange="gdga_select_option();" style="display: none;">

-                <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory');?></option>

-                <option value="years"><?php _e("This Year vs Last Year", 'geodirectory');?></option>

-                <option value="country"><?php _e("Top Countries", 'geodirectory');?></option>

+                <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory'); ?></option>

+                <option value="years"><?php _e("This Year vs Last Year", 'geodirectory'); ?></option>

+                <option value="country"><?php _e("Top Countries", 'geodirectory'); ?></option>

             </select>

             <div class="Chartjs-figure" id="gdga-chart-container"></div>

             <ol class="Chartjs-legend" id="gdga-legend-container"></ol>

@@ -1099,8 +1099,8 @@ 
     do_action('geodir_after_google_analytics');

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_google_analytics_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

          *

@@ -1156,10 +1156,10 @@ 
        

 	   $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');

 	   

-	   $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';

+	   $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="'.$post_avgratings.'">'.$post_avgratings.'</span> / <span itemprop="best" content="5">5</span> '.__("based on", 'geodirectory').' </span><span class="count" itemprop="count" content="'.$comment_count.'">'.$comment_count.' '.$reviews_text.'</span><br />';

 

         $html .= '<span class="item">';

-        $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>';

+        $html .= '<span class="fn" itemprop="itemreviewed">'.$post->post_title.'</span>';

 

         if ($post_images) {

             foreach ($post_images as $img) {

@@ -1169,7 +1169,7 @@ 
         }

 

         if (isset($post_img) && $post_img) {

-            $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />';

+            $html .= '<br /><img src="'.$post_img.'" class="photo" alt="'.esc_attr($post->post_title).'" itemprop="photo" content="'.$post_img.'" class="photo" />';

         }

 

         $html .= '</span>';

@@ -1196,9 +1196,9 @@ 
     do_action('geodir_after_detail_page_review_rating');

     $content_html = ob_get_clean();

     if (trim($content_html) != '') {

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">'.$content_html.'</div>';

     }

-    if ((int)get_option('geodir_disable_rating_info_section') != 1) {

+    if ((int) get_option('geodir_disable_rating_info_section') != 1) {

         /**

          * Filter the geodir_detail_page_review_rating() function content.

          *

@@ -1237,8 +1237,8 @@ 
 

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_listing_info_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_listing_info_section') != 1) {

         /**

          * Filter the output html for function geodir_detail_page_more_info().

          *

@@ -1337,7 +1337,7 @@ 
 		'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',

 		'geodir_txt_form_wait' => __('Wait...', 'geodirectory'),

 		'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

-		'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

+		'fa_rating' => (int) get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

 		'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',

         'geodir_map_name' => geodir_map_name(),

         'osmStart' => __('Start', 'geodirectory'),

@@ -1358,10 +1358,10 @@ 
     foreach ($arr_alert_msg as $key => $value) {

         if (!is_scalar($value))

             continue;

-        $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

+        $arr_alert_msg[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');

     }

 

-    $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

+    $script = "var geodir_all_js_msg = ".json_encode($arr_alert_msg).';';

     echo '<script>';

     echo $script;

     echo '</script>';

@@ -1451,7 +1451,7 @@ 
         $geodir_old_sidebars = get_option('geodir_sidebars');

         if (is_array($geodir_old_sidebars)) {

             foreach ($geodir_old_sidebars as $key => $val) {

-                if(0 === strpos($key, 'geodir_'))// if gd widget

+                if (0 === strpos($key, 'geodir_'))// if gd widget

                 {

                     $sidebars_widgets[$key] = $geodir_old_sidebars[$key];

                 }

@@ -1530,7 +1530,7 @@ 
         global $post;

         $term_condition = '';

         if (isset($_REQUEST['backandedit'])) {

-            $post = (object)$gd_session->get('listing');

+            $post = (object) $gd_session->get('listing');

             $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';

         }

 

@@ -1544,7 +1544,7 @@ 
                     echo 'checked="checked"';

                 } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"

                        class="geodir_textfield" value="1"

-                       style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

+                       style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if ($terms_page) { echo get_permalink($terms_page); }?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

 				</span>

             </div>

             <span class="geodir_message_error"><?php if (isset($required_msg)) {

@@ -1584,7 +1584,7 @@ 
         /** This action is documented in geodirectory_template_actions.php */

         $desc_limit = apply_filters('geodir_description_field_desc_limit', '');

         

-        if (!($desc_limit === '' || (int)$desc_limit > 0)) {

+        if (!($desc_limit === '' || (int) $desc_limit > 0)) {

             $is_display = false;

         }

     }

@@ -1632,16 +1632,16 @@ 
     global $wpdb, $plugin_prefix;

 	

 	// Remove unused virtual page

-	$listings_page_id = (int)get_option('geodir_listing_page');

+	$listings_page_id = (int) get_option('geodir_listing_page');

 	if ($listings_page_id) {

-		$wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

+		$wpdb->query($wpdb->prepare("DELETE FROM ".$wpdb->posts." WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

         delete_option('geodir_listing_page');

 	}

 

     if (!get_option('geodir_changes_in_custom_fields_table')) {

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s",

+                "UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET is_default=%s, is_admin=%s WHERE is_default=%s",

                 array('1', '1', 'admin')

             )

         );

@@ -1649,9 +1649,9 @@ 
 

         /* --- terms meta value set --- */

 

-        update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');

+        update_option('geodir_default_marker_icon', geodir_plugin_url().'/geodirectory-functions/map-functions/icons/pin.png');

 

-        $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));

+        $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."options WHERE option_name LIKE %s", array('%tax_meta_%')));

 

         if (!empty($options_data)) {

 

@@ -1659,7 +1659,7 @@ 
 

                 $option_val = str_replace('tax_meta_', '', $optobj->option_name);

 

-                $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

+                $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM ".$wpdb->prefix."term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

 

                 if (!empty($taxonomies_data)) {

 

@@ -1668,17 +1668,17 @@ 
                         $taxObject = get_taxonomy($taxobj->taxonomy);

                         $post_type = $taxObject->object_type[0];

 

-                        $opt_value = 'tax_meta_' . $post_type . '_' . $option_val;

+                        $opt_value = 'tax_meta_'.$post_type.'_'.$option_val;

 

-                        $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));

+                        $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM ".$wpdb->prefix."options WHERE option_name=%s", array('tax_meta_'.$option_val)));

 

                         if ($duplicate_data) {

 

-                            $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

+                            $wpdb->query($wpdb->prepare("UPDATE ".$wpdb->prefix."options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

 

                         } else {

 

-                            $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

+                            $wpdb->query($wpdb->prepare("INSERT INTO ".$wpdb->prefix."options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

 

                         }

 

@@ -1712,14 +1712,14 @@ 
 

     global $wpdb, $table_prefix;

 

-    $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));

+    $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s", array($slug)));

 

     if ($slug_exists) {

 

         $suffix = 1;

         do {

-            $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

-            $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));

+            $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";

+            $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s", array($alt_location_name)));

             $suffix++;

         } while ($location_slug_check && $suffix < 100);

 

@@ -1773,7 +1773,7 @@ 
 

         $suffix = 1;

         do {

-            $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

+            $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";

 

             /** This action is documented in geodirectory_hooks_actions.php */

             $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);

@@ -1785,7 +1785,7 @@ 
 

         //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );

 

-        $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

+        $wpdb->query($wpdb->prepare("UPDATE ".$table_prefix."terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

 

     }

 	

@@ -1794,18 +1794,18 @@ 
 	$post_type = !empty($taxonomy_obj) ? $taxonomy_obj->object_type[0] : NULL;

 	

 	$post_types = geodir_get_posttypes();

-	if ($post_type && in_array($post_type, $post_types) && $post_type . '_tags' == $taxonomy) {		

-		$posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM " . $wpdb->term_relationships . " WHERE term_taxonomy_id = %d", array($tt_id)));

+	if ($post_type && in_array($post_type, $post_types) && $post_type.'_tags' == $taxonomy) {		

+		$posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM ".$wpdb->term_relationships." WHERE term_taxonomy_id = %d", array($tt_id)));

 		

 		if (!empty($posts_obj)) {

 			foreach ($posts_obj as $post_obj) {

 				$post_id = $post_obj->object_id;

 				

-				$raw_tags = wp_get_object_terms($post_id, $post_type . '_tags', array('fields' => 'names'));

+				$raw_tags = wp_get_object_terms($post_id, $post_type.'_tags', array('fields' => 'names'));

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

 				

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

-				$wpdb->query($wpdb->prepare("UPDATE " . $listing_table . " SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));

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

+				$wpdb->query($wpdb->prepare("UPDATE ".$listing_table." SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));

 			}

 		}

 	}

@@ -1839,7 +1839,7 @@ 
     if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

         return $slug_exists = true;

 

-    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

+    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

         return $slug_exists = true;

 

     return $slug_exists;

@@ -1879,43 +1879,43 @@ 
 

 

     $gd_page = '';

-    if(geodir_is_page('home')){

+    if (geodir_is_page('home')) {

         $gd_page = 'home';

         $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;

     }

-    elseif(geodir_is_page('detail')){

+    elseif (geodir_is_page('detail')) {

         $gd_page = 'detail';

         $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;

     }

-    elseif(geodir_is_page('pt')){

+    elseif (geodir_is_page('pt')) {

         $gd_page = 'pt';

         $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;

     }

-    elseif(geodir_is_page('listing')){

+    elseif (geodir_is_page('listing')) {

         $gd_page = 'listing';

         $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;

     }

-    elseif(geodir_is_page('location')){

+    elseif (geodir_is_page('location')) {

         $gd_page = 'location';

         $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;

     }

-    elseif(geodir_is_page('search')){

+    elseif (geodir_is_page('search')) {

         $gd_page = 'search';

         $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;

     }

-    elseif(geodir_is_page('add-listing')){

+    elseif (geodir_is_page('add-listing')) {

         $gd_page = 'add-listing';

         $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;

     }

-    elseif(geodir_is_page('author')){

+    elseif (geodir_is_page('author')) {

         $gd_page = 'author';

         $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;

     }

-    elseif(geodir_is_page('login')){

+    elseif (geodir_is_page('login')) {

         $gd_page = 'login';

         $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;

     }

-    elseif(geodir_is_page('listing-success')){

+    elseif (geodir_is_page('listing-success')) {

         $gd_page = 'listing-success';

         $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

     }

@@ -1947,12 +1947,12 @@ 
 

     if (!get_option('geodir_set_post_attachments')) {

 

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

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

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

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

 

         $all_postypes = geodir_get_posttypes();

 

-        foreach($all_postypes as $post_type){

+        foreach ($all_postypes as $post_type) {

             $args = array(

                 'posts_per_page' => -1,

                 'post_type' => $post_type,

@@ -2046,7 +2046,7 @@ 
 {

     $user_id = get_current_user_id();

 

-    if(!$user_id){return $post;}

+    if (!$user_id) {return $post; }

 

     $gd_post_types = geodir_get_posttypes();

 

@@ -2155,7 +2155,7 @@ 
 

         if (array_key_exists('post_video', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

+            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from ".GEODIR_CUSTOM_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

 

             if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

                 $tabs_arr['post_video']['heading_text'] = $field_title;

@@ -2163,7 +2163,7 @@ 
 

         if (array_key_exists('special_offers', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

+            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from ".GEODIR_CUSTOM_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

 

             if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

                 $tabs_arr['special_offers']['heading_text'] = $field_title;

@@ -2184,7 +2184,7 @@ 
  */

 function geodir_remove_template_redirect_actions()

 {

-    if (geodir_is_page('login')){

+    if (geodir_is_page('login')) {

         remove_all_actions('template_redirect');

         remove_action('init', 'avia_modify_front', 10);

     }

@@ -2231,25 +2231,25 @@ 
         $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

 

         $wpdb->query(

-            $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",

+            $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d AND file=%s ",

                 array($post_id, $split_img_file_path)

             )

         );

 

         $attachment_data = $wpdb->get_row(

-            $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",

+            $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id=%d",

                 array($post_id)

             )

         );

 

         if (!empty($attachment_data)) {

-            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+            $wpdb->query("UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order=1 WHERE ID=".$attachment_data->ID);

         }

 

 

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

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

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);

+        $wpdb->query("UPDATE ".$table_name." SET featured_image='' WHERE post_id =".$post_id);

 

         geodir_set_wp_featured_image($post_id);

 

@@ -2277,9 +2277,9 @@ 
 

     foreach ($all_postypes as $posttype) {

 

-        $tablename = $plugin_prefix . $posttype . '_detail';

+        $tablename = $plugin_prefix.$posttype.'_detail';

 

-        $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);

+        $get_post_data = $wpdb->get_results("SELECT post_id FROM ".$tablename);

 

         if (!empty($get_post_data)) {

 

@@ -2287,7 +2287,7 @@ 
 

                 $post_id = $data->post_id;

 

-                $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");

+                $attachment_data = $wpdb->get_results("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id =".$post_id." AND file!=''");

 

                 if (!empty($attachment_data)) {

 

@@ -2304,22 +2304,22 @@ 
 

                         $file_name = $file_info['basename'];

 

-                        $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name;

+                        $img_arr['path'] = $uploads_path.$sub_dir.'/'.$file_name;

 

                         if (!file_exists($img_arr['path'])) {

 

-                            $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);

+                            $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ID=".$attach->ID);

 

                         }

 

                     }

 

-                    $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");

+                    $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id=".$post_id." GROUP BY post_id");

 

                     if (!empty($attachment_data)) {

 

                         if ($attachment_data->ID)

-                            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+                            $wpdb->query("UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order=1 WHERE ID=".$attachment_data->ID);

 

                     } else {

 

@@ -2333,7 +2333,7 @@ 
 

                     }

 

-                    $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);

+                    $wpdb->query("UPDATE ".$tablename." SET featured_image='' WHERE post_id =".$post_id);

 

                     geodir_set_wp_featured_image($post_id);

 

@@ -2362,7 +2362,7 @@ 
 {

 

     if (!get_option('geodir_default_rating_star_icon')) {

-        update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');

+        update_option('geodir_default_rating_star_icon', geodir_plugin_url().'/geodirectory-assets/images/stars.png');

     }

 

 }

@@ -2379,10 +2379,10 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @return array User listing count for each post type.

  */

-function geodir_user_post_listing_count($user_id=null)

+function geodir_user_post_listing_count($user_id = null)

 {

     global $wpdb, $plugin_prefix, $current_user;

-    if(!$user_id){

+    if (!$user_id) {

         $user_id = $current_user->ID;

     }

 

@@ -2393,7 +2393,7 @@ 
     $user_listing = array();

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

         foreach ($all_posts as $ptype) {

-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");

+            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE post_author=".$user_id." AND post_type='".$ptype."' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");

 

             if ($total_posts > 0) {

                 $user_listing[$ptype] = $total_posts;

@@ -2435,19 +2435,19 @@ 
         $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location);

 

         //remove video and special offers if it is already set to show

-        if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){

+        if (isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']) {

             $unset_video = true;

         }

 

-        if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){

+        if (isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']) {

             $unset_special_offers = true;

         }

-        if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){

-            foreach($custom_fields as $key => $custom_field){

-                if($custom_field['name']=='geodir_video' && isset($unset_video)){

+        if (isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)) {

+            foreach ($custom_fields as $key => $custom_field) {

+                if ($custom_field['name'] == 'geodir_video' && isset($unset_video)) {

                     unset($custom_fields[$key]);

                 }

-                if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){

+                if ($custom_field['name'] == 'geodir_special_offers' && isset($unset_special_offers)) {

                     unset($custom_fields[$key]);

                 }

             }

@@ -2466,7 +2466,7 @@ 
                     $post->{$field_name} = $_REQUEST[$field_name];

                 }

 

-                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false  && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

+                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

                     if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {

                         continue;

                     }

@@ -2515,11 +2515,11 @@ 
                         $variables_array['label'] = __($type['site_title'], 'geodirectory');

                         $variables_array['value'] = '';

                         $variables_array['value'] = $post->{$type['htmlvar_name']};

-                    }else{

+                    } else {

                         $i = 0;

                         $fieldset_count++;

                         $field_set_start = 1;

-                        $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count;

+                        $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_'.$fieldset_count;

                         $fieldset_arr[$fieldset_count]['label'] = $label;

                     }

 

@@ -2539,7 +2539,7 @@ 
                      * @param string $fields_location The location the field is to be show.

                      * @param array $type The array of field values.

                      */

-                    $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);

+                    $html = apply_filters("geodir_custom_field_output_{$filed_type}", $html, $fields_location, $type);

 

 

                     /**

@@ -2585,7 +2585,7 @@ 
                                  * @param string $htmlvar_name The field HTML var name.

                                  */

                                 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),

-                                'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>'

+                                'tab_content' => '<div class="geodir-company_info field-group xxx">'.$fieldset_html.'</div>'

                             );

                         }

                     } else {

@@ -2645,7 +2645,7 @@ 
             }

             $status .= ")</strong>";

 

-            $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';

+            $html = '<span class="geodir-post-status">'.$status_icon.' <font class="geodir-status-label">'.__('Status: ', 'geodirectory').'</font>'.$status.'</span>';

         }

     }

 

@@ -2725,7 +2725,7 @@ 
 function geodir_no_rating_comment_text($content, $comment = '')

 {

     if (!is_admin()) {

-        return '<div class="description">' . $content . '</div>';

+        return '<div class="description">'.$content.'</div>';

     } else {

         return $content;

     }

@@ -2803,7 +2803,7 @@ 
         $classes[] = 'gd-no-rating';

     }

     

-    $classes[] = 'gd-map-' . geodir_map_name();

+    $classes[] = 'gd-map-'.geodir_map_name();

 

     return $classes;

 }

@@ -2823,7 +2823,7 @@ 
         $class .= ' gd-no-rating';

     }

     

-    $class .= ' gd-map-' . geodir_map_name();

+    $class .= ' gd-map-'.geodir_map_name();

 

     return $class;

 }

@@ -2858,7 +2858,7 @@ 
  * @return array Translation texts.

  */

 function geodir_load_gd_options_text_translation($translation_texts = array()) {

-    $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

+    $translation_texts = !empty($translation_texts) && is_array($translation_texts) ? $translation_texts : array();

 

     $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');

 

@@ -2924,14 +2924,14 @@ 
  * @param array $args The array of menu arguments.

  * @return array The modified arguments.

  */

-function geodir_add_nav_menu_class( $args )

+function geodir_add_nav_menu_class($args)

 {

 

-        if(isset($args['menu_class'])){

+        if (isset($args['menu_class'])) {

             $args['menu_class'] = $args['menu_class']." gd-menu-z";

         }

     

     return $args;

 }

 

-add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' );
\ No newline at end of file
+add_filter('wp_nav_menu_args', 'geodir_add_nav_menu_class');
\ No newline at end of file