GeoDirectory / geodirectory

geodirectory-functions/helper_functions.php

Indentation +379 added lines, -379 removed lines

@@ -14,13 +14,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_add_listing_page_id(){
-    $gd_page_id = get_option('geodir_add_listing_page');
+	$gd_page_id = get_option('geodir_add_listing_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -31,13 +31,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_preview_page_id(){
-    $gd_page_id = get_option('geodir_preview_page');
+	$gd_page_id = get_option('geodir_preview_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -48,13 +48,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_success_page_id(){
-    $gd_page_id = get_option('geodir_success_page');
+	$gd_page_id = get_option('geodir_success_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -65,13 +65,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_location_page_id(){
-    $gd_page_id = get_option('geodir_location_page');
+	$gd_page_id = get_option('geodir_location_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -82,13 +82,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_home_page_id(){
-    $gd_page_id = get_option('geodir_home_page');
+	$gd_page_id = get_option('geodir_home_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -99,13 +99,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_info_page_id(){
-    $gd_page_id = get_option('geodir_info_page');
+	$gd_page_id = get_option('geodir_info_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 /**
@@ -116,13 +116,13 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_login_page_id(){
-    $gd_page_id = get_option('geodir_login_page');
+	$gd_page_id = get_option('geodir_login_page');
 
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
 
-    return $gd_page_id;
+	return $gd_page_id;
 }
 
 
@@ -134,51 +134,51 @@ 
  * @return int|null Return the page ID if present or null if not.
  */
 function geodir_login_url($args=array()){
-    $gd_page_id = get_option('geodir_login_page');
-
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-    }
-
-    if (geodir_is_wpml()){
-        $home_url = icl_get_home_url();
-    }else{
-        $home_url = home_url();
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
-    }
-
-    if($gd_page_id){
-        $post = get_post($gd_page_id);
-        $slug = $post->post_name;
-        //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
-        $login_url = trailingslashit($home_url)."$slug/";
-    }else{
-        $login_url = trailingslashit($home_url)."?geodir_signup=true";
-    }
-
-    if($args){
-        $login_url = add_query_arg($args,$login_url );
-    }
-
-    /**
-     * Filter the GeoDirectory login page url.
-     *
-     * This filter can be used to change the GeoDirectory page url.
-     *
-     * @since 1.5.3
-     * @package GeoDirectory
-     * @param string $login_url The url of the login page.
-     * @param array $args The array of query args used.
-     * @param int $gd_page_id The page id of the GD login page.
-     */
-	    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
+	$gd_page_id = get_option('geodir_login_page');
+
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+	}
+
+	if (geodir_is_wpml()){
+		$home_url = icl_get_home_url();
+	}else{
+		$home_url = home_url();
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
+	}
+
+	if($gd_page_id){
+		$post = get_post($gd_page_id);
+		$slug = $post->post_name;
+		//$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
+		$login_url = trailingslashit($home_url)."$slug/";
+	}else{
+		$login_url = trailingslashit($home_url)."?geodir_signup=true";
+	}
+
+	if($args){
+		$login_url = add_query_arg($args,$login_url );
+	}
+
+	/**
+	 * Filter the GeoDirectory login page url.
+	 *
+	 * This filter can be used to change the GeoDirectory page url.
+	 *
+	 * @since 1.5.3
+	 * @package GeoDirectory
+	 * @param string $login_url The url of the login page.
+	 * @param array $args The array of query args used.
+	 * @param int $gd_page_id The page id of the GD login page.
+	 */
+		return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
 }
 
 /**
@@ -190,40 +190,40 @@ 
  * @return string Info page url.
  */
 function geodir_info_url($args=array()){
-    $gd_page_id = get_option('geodir_info_page');
-
-    if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-    }
-
-    if (geodir_is_wpml()){
-        $home_url = icl_get_home_url();
-    }else{
-        $home_url = home_url();
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
-    }
-
-    if($gd_page_id){
-        $post = get_post($gd_page_id);
-        $slug = $post->post_name;
-        //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
-        $info_url = trailingslashit($home_url)."$slug/";
-    }else{
-        $info_url = trailingslashit($home_url);
-    }
-
-    if($args){
-        $info_url = add_query_arg($args,$info_url );
-    }
-
-    return $info_url;
+	$gd_page_id = get_option('geodir_info_page');
+
+	if (function_exists('icl_object_id')) {
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+	}
+
+	if (geodir_is_wpml()){
+		$home_url = icl_get_home_url();
+	}else{
+		$home_url = home_url();
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
+	}
+
+	if($gd_page_id){
+		$post = get_post($gd_page_id);
+		$slug = $post->post_name;
+		//$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
+		$info_url = trailingslashit($home_url)."$slug/";
+	}else{
+		$info_url = trailingslashit($home_url);
+	}
+
+	if($args){
+		$info_url = add_query_arg($args,$info_url );
+	}
+
+	return $info_url;
 }
 
 /**
@@ -239,11 +239,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_ucwords($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_TITLE, $charset);
-    } else {
-        return ucwords($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_TITLE, $charset);
+	} else {
+		return ucwords($string);
+	}
 }
 
 /**
@@ -259,11 +259,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_strtolower($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_LOWER, $charset);
-    } else {
-        return strtolower($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_LOWER, $charset);
+	} else {
+		return strtolower($string);
+	}
 }
 
 /**
@@ -279,11 +279,11 @@ 
  * @return string Returns converted string.
  */
 function geodir_strtoupper($string, $charset='UTF-8') {
-    if (function_exists('mb_convert_case')) {
-        return mb_convert_case($string, MB_CASE_UPPER, $charset);
-    } else {
-        return strtoupper($string);
-    }
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_UPPER, $charset);
+	} else {
+		return strtoupper($string);
+	}
 }
 
 /**
@@ -462,11 +462,11 @@ 
  * @package GeoDirectory
  */
 function _gd_die_handler() {
-    if ( defined( 'GD_TESTING_MODE' ) ) {
-        return '_gd_die_handler';
-    } else {
-        die();
-    }
+	if ( defined( 'GD_TESTING_MODE' ) ) {
+		return '_gd_die_handler';
+	} else {
+		die();
+	}
 }
 
 /**
@@ -481,9 +481,9 @@ 
  * @param int $status     Optional. Status code.
  */
 function gd_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+	add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
+	add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
+	wp_die( $message, $title, array( 'response' => $status ));
 }
 
 /*
@@ -652,37 +652,37 @@ 
  * @return string The formatted date.
  */
 function geodir_date($date_input, $date_to, $date_from = '') {
-    if (empty($date_input) || empty($date_to)) {
-        return NULL;
-    }
+	if (empty($date_input) || empty($date_to)) {
+		return NULL;
+	}
     
-    $date = '';
-    if (!empty($date_from)) {
-        $datetime = date_create_from_format($date_from, $date_input);
+	$date = '';
+	if (!empty($date_from)) {
+		$datetime = date_create_from_format($date_from, $date_input);
         
-        if (!empty($datetime)) {
-            $date = $datetime->format($date_to);
-        }
-    }
+		if (!empty($datetime)) {
+			$date = $datetime->format($date_to);
+		}
+	}
     
-    if (empty($date)) {
-        $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input;
-        $date = date_i18n($date_to, strtotime($date));
-    }
+	if (empty($date)) {
+		$date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input;
+		$date = date_i18n($date_to, strtotime($date));
+	}
     
-    $date = geodir_maybe_untranslate_date($date);
-    /**
-     * Filter the the date format conversion.
-     *
-     * @since 1.6.7
-     * @package GeoDirectory
-     *
-     * @param string $date The date string.
-     * @param string $date_input The date input.
-     * @param string $date_to The destination date format.
-     * @param string $date_from The source date format.
-     */
-    return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from);
+	$date = geodir_maybe_untranslate_date($date);
+	/**
+	 * Filter the the date format conversion.
+	 *
+	 * @since 1.6.7
+	 * @package GeoDirectory
+	 *
+	 * @param string $date The date string.
+	 * @param string $date_input The date input.
+	 * @param string $date_to The destination date format.
+	 * @param string $date_from The source date format.
+	 */
+	return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from);
 }
 
 /**
@@ -707,91 +707,91 @@ 
  * @return string Trimmed string.
  */
 function geodir_excerpt($text, $length = 100, $options = array()) {
-    if (!(int)$length > 0) {
-        return $text;
-    }
-    $default = array(
-        'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false,
+	if (!(int)$length > 0) {
+		return $text;
+	}
+	$default = array(
+		'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false,
 	);
-    if (!empty($options['html']) && function_exists('mb_internal_encoding') && strtolower(mb_internal_encoding()) === 'utf-8') {
-        $default['ellipsis'] = "";
-    }
-    $options += $default;
-
-    $prefix = '';
-    $suffix = $options['ellipsis'];
-
-    if ($options['html']) {
-        $ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options);
-
-        $truncateLength = 0;
-        $totalLength = 0;
-        $openTags = array();
-        $truncate = '';
-
-        preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
-        foreach ($tags as $tag) {
-            $contentLength = geodir_strlen($tag[3], $options);
-
-            if ($truncate === '') {
-                if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) {
-                    if (preg_match('/<[\w]+[^>]*>/', $tag[0])) {
-                        array_unshift($openTags, $tag[2]);
-                    } elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) {
-                        $pos = array_search($closeTag[1], $openTags);
-                        if ($pos !== false) {
-                            array_splice($openTags, $pos, 1);
-                        }
-                    }
-                }
-
-                $prefix .= $tag[1];
-
-                if ($totalLength + $contentLength + $ellipsisLength > $length) {
-                    $truncate = $tag[3];
-                    $truncateLength = $length - $totalLength;
-                } else {
-                    $prefix .= $tag[3];
-                }
-            }
-
-            $totalLength += $contentLength;
-            if ($totalLength > $length) {
-                break;
-            }
-        }
-
-        if ($totalLength <= $length) {
-            return $text;
-        }
-
-        $text = $truncate;
-        $length = $truncateLength;
-
-        foreach ($openTags as $tag) {
-            $suffix .= '</' . $tag . '>';
-        }
-    } else {
-        if (geodir_strlen($text, $options) <= $length) {
-            return $text;
-        }
-        $ellipsisLength = geodir_strlen($options['ellipsis'], $options);
-    }
-
-    $result = geodir_substr($text, 0, $length - $ellipsisLength, $options);
-
-    if (!$options['exact']) {
-        if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') {
-            $result = geodir_remove_last_word($result);
-        }
-
-        // Do not need to count ellipsis in the cut, if result is empty.
-        if (!strlen($result)) {
-            $result = geodir_substr($text, 0, $length, $options);
-        }
-    }
-
-    return $prefix . $result . $suffix;
+	if (!empty($options['html']) && function_exists('mb_internal_encoding') && strtolower(mb_internal_encoding()) === 'utf-8') {
+		$default['ellipsis'] = "";
+	}
+	$options += $default;
+
+	$prefix = '';
+	$suffix = $options['ellipsis'];
+
+	if ($options['html']) {
+		$ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options);
+
+		$truncateLength = 0;
+		$totalLength = 0;
+		$openTags = array();
+		$truncate = '';
+
+		preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
+		foreach ($tags as $tag) {
+			$contentLength = geodir_strlen($tag[3], $options);
+
+			if ($truncate === '') {
+				if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) {
+					if (preg_match('/<[\w]+[^>]*>/', $tag[0])) {
+						array_unshift($openTags, $tag[2]);
+					} elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) {
+						$pos = array_search($closeTag[1], $openTags);
+						if ($pos !== false) {
+							array_splice($openTags, $pos, 1);
+						}
+					}
+				}
+
+				$prefix .= $tag[1];
+
+				if ($totalLength + $contentLength + $ellipsisLength > $length) {
+					$truncate = $tag[3];
+					$truncateLength = $length - $totalLength;
+				} else {
+					$prefix .= $tag[3];
+				}
+			}
+
+			$totalLength += $contentLength;
+			if ($totalLength > $length) {
+				break;
+			}
+		}
+
+		if ($totalLength <= $length) {
+			return $text;
+		}
+
+		$text = $truncate;
+		$length = $truncateLength;
+
+		foreach ($openTags as $tag) {
+			$suffix .= '</' . $tag . '>';
+		}
+	} else {
+		if (geodir_strlen($text, $options) <= $length) {
+			return $text;
+		}
+		$ellipsisLength = geodir_strlen($options['ellipsis'], $options);
+	}
+
+	$result = geodir_substr($text, 0, $length - $ellipsisLength, $options);
+
+	if (!$options['exact']) {
+		if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') {
+			$result = geodir_remove_last_word($result);
+		}
+
+		// Do not need to count ellipsis in the cut, if result is empty.
+		if (!strlen($result)) {
+			$result = geodir_substr($text, 0, $length, $options);
+		}
+	}
+
+	return $prefix . $result . $suffix;
 }
 
 /**
@@ -815,28 +815,28 @@ 
  * @return int
  */
 function geodir_strlen($text, array $options) {
-    if (empty($options['trimWidth'])) {
-        $strlen = 'geodir_utf8_strlen';
-    } else {
-        $strlen = 'geodir_utf8_strwidth';
-    }
-
-    if (empty($options['html'])) {
-        return $strlen($text);
-    }
-
-    $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
-    $replace = preg_replace_callback(
-        $pattern,
-        function ($match) use ($strlen) {
-            $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
-
-            return str_repeat(' ', $strlen($utf8, 'UTF-8'));
-        },
-        $text
-    );
-
-    return $strlen($replace);
+	if (empty($options['trimWidth'])) {
+		$strlen = 'geodir_utf8_strlen';
+	} else {
+		$strlen = 'geodir_utf8_strwidth';
+	}
+
+	if (empty($options['html'])) {
+		return $strlen($text);
+	}
+
+	$pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
+	$replace = preg_replace_callback(
+		$pattern,
+		function ($match) use ($strlen) {
+			$utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
+
+			return str_repeat(' ', $strlen($utf8, 'UTF-8'));
+		},
+		$text
+	);
+
+	return $strlen($replace);
 }
 
 /**
@@ -857,80 +857,80 @@ 
  * @return string
  */
 function geodir_substr($text, $start, $length, array $options) {
-    if (empty($options['trimWidth'])) {
-        $substr = 'geodir_utf8_substr';
-    } else {
-        $substr = 'geodir_utf8_strimwidth';
-    }
-
-    $maxPosition = geodir_strlen($text, array('trimWidth' => false) + $options);
-    if ($start < 0) {
-        $start += $maxPosition;
-        if ($start < 0) {
-            $start = 0;
-        }
-    }
-    if ($start >= $maxPosition) {
-        return '';
-    }
-
-    if ($length === null) {
-        $length = geodir_strlen($text, $options);
-    }
-
-    if ($length < 0) {
-        $text = geodir_substr($text, $start, null, $options);
-        $start = 0;
-        $length += geodir_strlen($text, $options);
-    }
-
-    if ($length <= 0) {
-        return '';
-    }
-
-    if (empty($options['html'])) {
-        return (string)$substr($text, $start, $length);
-    }
-
-    $totalOffset = 0;
-    $totalLength = 0;
-    $result = '';
-
-    $pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i';
-    $parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-    foreach ($parts as $part) {
-        $offset = 0;
-
-        if ($totalOffset < $start) {
-            $len = geodir_strlen($part, array('trimWidth' => false) + $options);
-            if ($totalOffset + $len <= $start) {
-                $totalOffset += $len;
-                continue;
-            }
-
-            $offset = $start - $totalOffset;
-            $totalOffset = $start;
-        }
-
-        $len = geodir_strlen($part, $options);
-        if ($offset !== 0 || $totalLength + $len > $length) {
-            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
-                // Entities cannot be passed substr.
-                continue;
-            }
-
-            $part = $substr($part, $offset, $length - $totalLength);
-            $len = geodir_strlen($part, $options);
-        }
-
-        $result .= $part;
-        $totalLength += $len;
-        if ($totalLength >= $length) {
-            break;
-        }
-    }
-
-    return $result;
+	if (empty($options['trimWidth'])) {
+		$substr = 'geodir_utf8_substr';
+	} else {
+		$substr = 'geodir_utf8_strimwidth';
+	}
+
+	$maxPosition = geodir_strlen($text, array('trimWidth' => false) + $options);
+	if ($start < 0) {
+		$start += $maxPosition;
+		if ($start < 0) {
+			$start = 0;
+		}
+	}
+	if ($start >= $maxPosition) {
+		return '';
+	}
+
+	if ($length === null) {
+		$length = geodir_strlen($text, $options);
+	}
+
+	if ($length < 0) {
+		$text = geodir_substr($text, $start, null, $options);
+		$start = 0;
+		$length += geodir_strlen($text, $options);
+	}
+
+	if ($length <= 0) {
+		return '';
+	}
+
+	if (empty($options['html'])) {
+		return (string)$substr($text, $start, $length);
+	}
+
+	$totalOffset = 0;
+	$totalLength = 0;
+	$result = '';
+
+	$pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i';
+	$parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+	foreach ($parts as $part) {
+		$offset = 0;
+
+		if ($totalOffset < $start) {
+			$len = geodir_strlen($part, array('trimWidth' => false) + $options);
+			if ($totalOffset + $len <= $start) {
+				$totalOffset += $len;
+				continue;
+			}
+
+			$offset = $start - $totalOffset;
+			$totalOffset = $start;
+		}
+
+		$len = geodir_strlen($part, $options);
+		if ($offset !== 0 || $totalLength + $len > $length) {
+			if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
+				// Entities cannot be passed substr.
+				continue;
+			}
+
+			$part = $substr($part, $offset, $length - $totalLength);
+			$len = geodir_strlen($part, $options);
+		}
+
+		$result .= $part;
+		$totalLength += $len;
+		if ($totalLength >= $length) {
+			break;
+		}
+	}
+
+	return $result;
 }
 
 /**
@@ -943,21 +943,21 @@ 
  * @return string
  */
 function geodir_remove_last_word($text) {
-    $spacepos = geodir_utf8_strrpos($text, ' ');
+	$spacepos = geodir_utf8_strrpos($text, ' ');
 
-    if ($spacepos !== false) {
-        $lastWord = geodir_utf8_strrpos($text, $spacepos);
+	if ($spacepos !== false) {
+		$lastWord = geodir_utf8_strrpos($text, $spacepos);
 
-        // Some languages are written without word separation.
-        // We recognize a string as a word if it does not contain any full-width characters.
-        if (geodir_utf8_strwidth($lastWord) === geodir_utf8_strlen($lastWord)) {
-            $text = geodir_utf8_substr($text, 0, $spacepos);
-        }
+		// Some languages are written without word separation.
+		// We recognize a string as a word if it does not contain any full-width characters.
+		if (geodir_utf8_strwidth($lastWord) === geodir_utf8_strlen($lastWord)) {
+			$text = geodir_utf8_substr($text, 0, $spacepos);
+		}
 
-        return $text;
-    }
+		return $text;
+	}
 
-    return '';
+	return '';
 }
 
 function geodir_tool_restore_cpt_from_taxonomies(){
@@ -1075,11 +1075,11 @@ 
  * @return string
  */
 function geodir_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strimwidth' ) ) {
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
-    }
+	if ( function_exists( 'mb_strimwidth' ) ) {
+		return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
+	}
     
-    return geodir_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
+	return geodir_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
 }
 
 /**
@@ -1093,11 +1093,11 @@ 
  * @return int Returns the number of characters in string.
  */
 function geodir_utf8_strlen( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        return mb_strlen( $str, $encoding );
-    }
+	if ( function_exists( 'mb_strlen' ) ) {
+		return mb_strlen( $str, $encoding );
+	}
         
-    return strlen( $str );
+	return strlen( $str );
 }
 
 /**
@@ -1113,11 +1113,11 @@ 
  * @return int Returns the position of the first occurrence of search in the string.
  */
 function geodir_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strpos' ) ) {
-        return mb_strpos( $str, $find, $offset, $encoding );
-    }
+	if ( function_exists( 'mb_strpos' ) ) {
+		return mb_strpos( $str, $find, $offset, $encoding );
+	}
         
-    return strpos( $str, $find, $offset );
+	return strpos( $str, $find, $offset );
 }
 
 /**
@@ -1133,11 +1133,11 @@ 
  * @return int Returns the position of the last occurrence of search.
  */
 function geodir_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strrpos' ) ) {
-        return mb_strrpos( $str, $find, $offset, $encoding );
-    }
+	if ( function_exists( 'mb_strrpos' ) ) {
+		return mb_strrpos( $str, $find, $offset, $encoding );
+	}
         
-    return strrpos( $str, $find, $offset );
+	return strrpos( $str, $find, $offset );
 }
 
 /**
@@ -1154,15 +1154,15 @@ 
  * @return string
  */
 function geodir_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_substr' ) ) {
-        if ( $length === null ) {
-            return mb_substr( $str, $start, geodir_utf8_strlen( $str, $encoding ), $encoding );
-        } else {
-            return mb_substr( $str, $start, $length, $encoding );
-        }
-    }
+	if ( function_exists( 'mb_substr' ) ) {
+		if ( $length === null ) {
+			return mb_substr( $str, $start, geodir_utf8_strlen( $str, $encoding ), $encoding );
+		} else {
+			return mb_substr( $str, $start, $length, $encoding );
+		}
+	}
         
-    return substr( $str, $start, $length );
+	return substr( $str, $start, $length );
 }
 
 /**

Spacing +115 added lines, -115 removed lines

@@ -13,11 +13,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_add_listing_page_id(){
+function geodir_add_listing_page_id() {
     $gd_page_id = get_option('geodir_add_listing_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -30,11 +30,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_preview_page_id(){
+function geodir_preview_page_id() {
     $gd_page_id = get_option('geodir_preview_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -47,11 +47,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_success_page_id(){
+function geodir_success_page_id() {
     $gd_page_id = get_option('geodir_success_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -64,11 +64,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_location_page_id(){
+function geodir_location_page_id() {
     $gd_page_id = get_option('geodir_location_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -81,11 +81,11 @@ 
  * @since 1.5.4
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_home_page_id(){
+function geodir_home_page_id() {
     $gd_page_id = get_option('geodir_home_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -98,11 +98,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_info_page_id(){
+function geodir_info_page_id() {
     $gd_page_id = get_option('geodir_info_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -115,11 +115,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_page_id(){
+function geodir_login_page_id() {
     $gd_page_id = get_option('geodir_login_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -133,20 +133,20 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_url($args=array()){
+function geodir_login_url($args = array()) {
     $gd_page_id = get_option('geodir_login_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
     }
 
-    if (geodir_is_wpml()){
+    if (geodir_is_wpml()) {
         $home_url = icl_get_home_url();
-    }else{
+    } else {
         $home_url = home_url();
     }
 
@@ -154,17 +154,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $login_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $login_url = trailingslashit($home_url)."?geodir_signup=true";
     }
 
-    if($args){
-        $login_url = add_query_arg($args,$login_url );
+    if ($args) {
+        $login_url = add_query_arg($args, $login_url);
     }
 
     /**
@@ -178,7 +178,7 @@ 
      * @param array $args The array of query args used.
      * @param int $gd_page_id The page id of the GD login page.
      */
-	    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
+	    return apply_filters('geodir_login_url', $login_url, $args, $gd_page_id);
 }
 
 /**
@@ -189,20 +189,20 @@ 
  * @since 1.5.16 Added WPML lang code to url.
  * @return string Info page url.
  */
-function geodir_info_url($args=array()){
+function geodir_info_url($args = array()) {
     $gd_page_id = get_option('geodir_info_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
     }
 
-    if (geodir_is_wpml()){
+    if (geodir_is_wpml()) {
         $home_url = icl_get_home_url();
-    }else{
+    } else {
         $home_url = home_url();
     }
 
@@ -210,17 +210,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $info_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $info_url = trailingslashit($home_url);
     }
 
-    if($args){
-        $info_url = add_query_arg($args,$info_url );
+    if ($args) {
+        $info_url = add_query_arg($args, $info_url);
     }
 
     return $info_url;
@@ -238,7 +238,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_ucwords($string, $charset='UTF-8') {
+function geodir_ucwords($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_TITLE, $charset);
     } else {
@@ -258,7 +258,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtolower($string, $charset='UTF-8') {
+function geodir_strtolower($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_LOWER, $charset);
     } else {
@@ -278,7 +278,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtoupper($string, $charset='UTF-8') {
+function geodir_strtoupper($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_UPPER, $charset);
     } else {
@@ -309,7 +309,7 @@ 
 	
 	$url = trim($parts[0]);
 	if ($formatted && $url != '') {
-		$url = str_replace( ' ', '%20', $url );
+		$url = str_replace(' ', '%20', $url);
 		$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 		
 		if (0 !== stripos($url, 'mailto:')) {
@@ -319,8 +319,8 @@ 
 		
 		$url = str_replace(';//', '://', $url);
 		
-		if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
-			$url = 'http://' . $url;
+		if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
+			$url = 'http://'.$url;
 		}
 		
 		$url = wp_kses_normalize_entities($url);
@@ -462,7 +462,7 @@ 
  * @package GeoDirectory
  */
 function _gd_die_handler() {
-    if ( defined( 'GD_TESTING_MODE' ) ) {
+    if (defined('GD_TESTING_MODE')) {
         return '_gd_die_handler';
     } else {
         die();
@@ -480,10 +480,10 @@ 
  * @param string $title   Optional. Error title.
  * @param int $status     Optional. Status code.
  */
-function gd_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+function gd_die($message = '', $title = '', $status = 400) {
+    add_filter('wp_die_ajax_handler', '_gd_die_handler', 10, 3);
+    add_filter('wp_die_handler', '_gd_die_handler', 10, 3);
+    wp_die($message, $title, array('response' => $status));
 }
 
 /*
@@ -493,7 +493,7 @@ 
  * @param string $php_format The PHP date format.
  * @return string The jQuery format date string.
  */
-function geodir_date_format_php_to_jqueryui( $php_format ) {
+function geodir_date_format_php_to_jqueryui($php_format) {
 	$symbols = array(
 		// Day
 		'd' => 'dd',
@@ -533,27 +533,27 @@ 
 	$jqueryui_format = "";
 	$escaping = false;
 
-	for ( $i = 0; $i < strlen( $php_format ); $i++ ) {
+	for ($i = 0; $i < strlen($php_format); $i++) {
 		$char = $php_format[$i];
 
 		// PHP date format escaping character
-		if ( $char === '\\' ) {
+		if ($char === '\\') {
 			$i++;
 
-			if ( $escaping ) {
+			if ($escaping) {
 				$jqueryui_format .= $php_format[$i];
 			} else {
-				$jqueryui_format .= '\'' . $php_format[$i];
+				$jqueryui_format .= '\''.$php_format[$i];
 			}
 
 			$escaping = true;
 		} else {
-			if ( $escaping ) {
+			if ($escaping) {
 				$jqueryui_format .= "'";
 				$escaping = false;
 			}
 
-			if ( isset( $symbols[$char] ) ) {
+			if (isset($symbols[$char])) {
 				$jqueryui_format .= $symbols[$char];
 			} else {
 				$jqueryui_format .= $char;
@@ -572,7 +572,7 @@ 
  * @return string The untranslated date string.
  * @since 1.6.5
  */
-function geodir_maybe_untranslate_date($date){
+function geodir_maybe_untranslate_date($date) {
 	$english_long_months = array(
 		'January',
 		'February',
@@ -588,7 +588,7 @@ 
 		'December',
 	);
 
-	$non_english_long_months  = array(
+	$non_english_long_months = array(
 		__('January'),
 		__('February'),
 		__('March'),
@@ -602,7 +602,7 @@ 
 		__('November'),
 		__('December'),
 	);
-	$date = str_replace($non_english_long_months,$english_long_months,$date);
+	$date = str_replace($non_english_long_months, $english_long_months, $date);
 
 
 	$english_short_months = array(
@@ -621,21 +621,21 @@ 
 	);
 
 	$non_english_short_months = array(
-		' '._x( 'Jan', 'January abbreviation' ).' ',
-		' '._x( 'Feb', 'February abbreviation' ).' ',
-		' '._x( 'Mar', 'March abbreviation' ).' ',
-		' '._x( 'Apr', 'April abbreviation' ).' ',
-		' '._x( 'May', 'May abbreviation' ).' ',
-		' '._x( 'Jun', 'June abbreviation' ).' ',
-		' '._x( 'Jul', 'July abbreviation' ).' ',
-		' '._x( 'Aug', 'August abbreviation' ).' ',
-		' '._x( 'Sep', 'September abbreviation' ).' ',
-		' '._x( 'Oct', 'October abbreviation' ).' ',
-		' '._x( 'Nov', 'November abbreviation' ).' ',
-		' '._x( 'Dec', 'December abbreviation' ).' ',
+		' '._x('Jan', 'January abbreviation').' ',
+		' '._x('Feb', 'February abbreviation').' ',
+		' '._x('Mar', 'March abbreviation').' ',
+		' '._x('Apr', 'April abbreviation').' ',
+		' '._x('May', 'May abbreviation').' ',
+		' '._x('Jun', 'June abbreviation').' ',
+		' '._x('Jul', 'July abbreviation').' ',
+		' '._x('Aug', 'August abbreviation').' ',
+		' '._x('Sep', 'September abbreviation').' ',
+		' '._x('Oct', 'October abbreviation').' ',
+		' '._x('Nov', 'November abbreviation').' ',
+		' '._x('Dec', 'December abbreviation').' ',
 	);
 
-	$date = str_replace($non_english_short_months,$english_short_months,$date);
+	$date = str_replace($non_english_short_months, $english_short_months, $date);
 
 
 	return $date;
@@ -707,7 +707,7 @@ 
  * @return string Trimmed string.
  */
 function geodir_excerpt($text, $length = 100, $options = array()) {
-    if (!(int)$length > 0) {
+    if (!(int) $length > 0) {
         return $text;
     }
     $default = array(
@@ -769,7 +769,7 @@ 
         $length = $truncateLength;
 
         foreach ($openTags as $tag) {
-            $suffix .= '</' . $tag . '>';
+            $suffix .= '</'.$tag.'>';
         }
     } else {
         if (geodir_strlen($text, $options) <= $length) {
@@ -791,7 +791,7 @@ 
         }
     }
 
-    return $prefix . $result . $suffix;
+    return $prefix.$result.$suffix;
 }
 
 /**
@@ -828,7 +828,7 @@ 
     $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
     $replace = preg_replace_callback(
         $pattern,
-        function ($match) use ($strlen) {
+        function($match) use ($strlen) {
             $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
 
             return str_repeat(' ', $strlen($utf8, 'UTF-8'));
@@ -889,7 +889,7 @@ 
     }
 
     if (empty($options['html'])) {
-        return (string)$substr($text, $start, $length);
+        return (string) $substr($text, $start, $length);
     }
 
     $totalOffset = 0;
@@ -914,7 +914,7 @@ 
 
         $len = geodir_strlen($part, $options);
         if ($offset !== 0 || $totalLength + $len > $length) {
-            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
+            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8')) {
                 // Entities cannot be passed substr.
                 continue;
             }
@@ -960,39 +960,39 @@ 
     return '';
 }
 
-function geodir_tool_restore_cpt_from_taxonomies(){
+function geodir_tool_restore_cpt_from_taxonomies() {
 
 	$cpts = get_option('geodir_post_types');
 
-	if(!empty($cpts)){return;}
+	if (!empty($cpts)) {return; }
 
 	$taxonomies = get_option('geodir_taxonomies');
 
-	if(empty($taxonomies)){return;}
+	if (empty($taxonomies)) {return; }
 
 	$cpts = array();
 
-	foreach($taxonomies as $key => $val){
+	foreach ($taxonomies as $key => $val) {
 
-		if(strpos($val['listing_slug'], '/') === false) {
-			$cpts[$val['object_type']] = array('cpt'=>$val['object_type'],'slug'=>$val['listing_slug']);
+		if (strpos($val['listing_slug'], '/') === false) {
+			$cpts[$val['object_type']] = array('cpt'=>$val['object_type'], 'slug'=>$val['listing_slug']);
 		}
 
 	}
 
-	if(empty($cpts)){return;}
+	if (empty($cpts)) {return; }
 
 
 	$cpts_restore = $cpts;
 
-	foreach($cpts as $cpt){
+	foreach ($cpts as $cpt) {
 
 
-		$is_custom = $cpt['cpt']=='gd_place' ? 0 : 1;
+		$is_custom = $cpt['cpt'] == 'gd_place' ? 0 : 1;
 
-		$cpts_restore[$cpt['cpt']] = array (
+		$cpts_restore[$cpt['cpt']] = array(
 				'labels' =>
-					array (
+					array(
 						'name' => $cpt['slug'],
 						'singular_name' => $cpt['slug'],
 						'add_new' => 'Add New',
@@ -1020,14 +1020,14 @@ 
 				'public' => true,
 				'query_var' => true,
 				'rewrite' =>
-					array (
+					array(
 						'slug' => $cpt['slug'],
 						'with_front' => false,
 						'hierarchical' => true,
 						'feeds' => true,
 					),
 				'supports' =>
-					array (
+					array(
 						0 => 'title',
 						1 => 'editor',
 						2 => 'author',
@@ -1037,14 +1037,14 @@ 
 						6 => 'comments',
 					),
 				'taxonomies' =>
-					array (
+					array(
 						0 => $cpt['cpt'].'category',
 						1 => $cpt['cpt'].'_tags',
 					),
 				'is_custom' => $is_custom,
 				'listing_order' => '1',
 				'seo' =>
-					array (
+					array(
 						'meta_keyword' => '',
 						'meta_description' => '',
 					),
@@ -1056,7 +1056,7 @@ 
 	}
 
 
-	update_option('geodir_post_types',$cpts_restore);
+	update_option('geodir_post_types', $cpts_restore);
 
 }
 
@@ -1074,12 +1074,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function geodir_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strimwidth' ) ) {
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
+function geodir_utf8_strimwidth($str, $start, $width, $trimmaker = '', $encoding = 'UTF-8') {
+    if (function_exists('mb_strimwidth')) {
+        return mb_strimwidth($str, $start, $width, $trimmaker, $encoding);
     }
     
-    return geodir_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
+    return geodir_utf8_substr($str, $start, $width, $encoding).$trimmaker;
 }
 
 /**
@@ -1092,12 +1092,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the number of characters in string.
  */
-function geodir_utf8_strlen( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        return mb_strlen( $str, $encoding );
+function geodir_utf8_strlen($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        return mb_strlen($str, $encoding);
     }
         
-    return strlen( $str );
+    return strlen($str);
 }
 
 /**
@@ -1112,12 +1112,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the first occurrence of search in the string.
  */
-function geodir_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strpos' ) ) {
-        return mb_strpos( $str, $find, $offset, $encoding );
+function geodir_utf8_strpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strpos')) {
+        return mb_strpos($str, $find, $offset, $encoding);
     }
         
-    return strpos( $str, $find, $offset );
+    return strpos($str, $find, $offset);
 }
 
 /**
@@ -1132,12 +1132,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the last occurrence of search.
  */
-function geodir_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strrpos' ) ) {
-        return mb_strrpos( $str, $find, $offset, $encoding );
+function geodir_utf8_strrpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strrpos')) {
+        return mb_strrpos($str, $find, $offset, $encoding);
     }
         
-    return strrpos( $str, $find, $offset );
+    return strrpos($str, $find, $offset);
 }
 
 /**
@@ -1153,16 +1153,16 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function geodir_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_substr' ) ) {
-        if ( $length === null ) {
-            return mb_substr( $str, $start, geodir_utf8_strlen( $str, $encoding ), $encoding );
+function geodir_utf8_substr($str, $start, $length = null, $encoding = 'UTF-8') {
+    if (function_exists('mb_substr')) {
+        if ($length === null) {
+            return mb_substr($str, $start, geodir_utf8_strlen($str, $encoding), $encoding);
         } else {
-            return mb_substr( $str, $start, $length, $encoding );
+            return mb_substr($str, $start, $length, $encoding);
         }
     }
         
-    return substr( $str, $start, $length );
+    return substr($str, $start, $length);
 }
 
 /**
@@ -1175,12 +1175,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The width of string.
  */
-function geodir_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
-	if ( function_exists( 'mb_strwidth' ) ) {
-		return mb_strwidth( $str, $encoding );
+function geodir_utf8_strwidth($str, $encoding = 'UTF-8') {
+	if (function_exists('mb_strwidth')) {
+		return mb_strwidth($str, $encoding);
 	}
 
-	return geodir_utf8_strlen( $str, $encoding );
+	return geodir_utf8_strlen($str, $encoding);
 }
 
 function geodir_total_listings_count($post_type = false)
@@ -1190,13 +1190,13 @@ 
 	$count = 0;
 	
 	if ($post_type) {
-		$count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $post_type . "_detail");
+		$count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$post_type."_detail");
 	} else {
 		$all_postypes = geodir_get_posttypes();
 
 		if (!empty($all_postypes)) {
 			foreach ($all_postypes as $key) {
-				$count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $key . "_detail");
+				$count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$key."_detail");
 			}
 		}	
 	}

geodirectory-functions/taxonomy_functions.php

Indentation +1244 added lines, -1244 removed lines

@@ -33,265 +33,265 @@ 
  */

 function geodir_add_nav_menu_items()

 {

-    $items = '';

-    // apply filter to add more navigations // -Filter-Location-Manager

-

-    if (get_option('geodir_show_listing_nav')) {

-

-        $menu_class = '';

-        if (geodir_is_page('listing'))

-            $menu_class = 'current-menu-item';

-

-

-        //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

-        $post_types = geodir_get_posttypes('object');

-        $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');

-        if (!empty($post_types)) {

-            foreach ($post_types as $post_type => $args) {

-                if (!empty($show_post_type_main_nav)) {

-                    if (in_array($post_type, $show_post_type_main_nav)) {

-                        if (get_post_type_archive_link($post_type)) {

-                            $menu_class = '';

-                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                $menu_class = 'current-menu-item';

-                            /**

-                             * Filter the menu li class.

-                             *

-                             * @since 1.0.0

-                             * @param string $menu_class The menu HTML class.

-                             */

-                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                            /**

-                             * Filter the menu a class.

-                             *

-                             * @since 1.0.0

-                             */

-                            $a_class = apply_filters('geodir_menu_a_class', '');

-                            $items .= '<li class="' . $li_class . '">

+	$items = '';

+	// apply filter to add more navigations // -Filter-Location-Manager

+

+	if (get_option('geodir_show_listing_nav')) {

+

+		$menu_class = '';

+		if (geodir_is_page('listing'))

+			$menu_class = 'current-menu-item';

+

+

+		//SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

+		$post_types = geodir_get_posttypes('object');

+		$show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');

+		if (!empty($post_types)) {

+			foreach ($post_types as $post_type => $args) {

+				if (!empty($show_post_type_main_nav)) {

+					if (in_array($post_type, $show_post_type_main_nav)) {

+						if (get_post_type_archive_link($post_type)) {

+							$menu_class = '';

+							if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

+								$menu_class = 'current-menu-item';

+							/**

+							 * Filter the menu li class.

+							 *

+							 * @since 1.0.0

+							 * @param string $menu_class The menu HTML class.

+							 */

+							$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+							/**

+							 * Filter the menu a class.

+							 *

+							 * @since 1.0.0

+							 */

+							$a_class = apply_filters('geodir_menu_a_class', '');

+							$items .= '<li class="' . $li_class . '">

 									<a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '">

 										' . __(ucfirst($args->labels->name),'geodirectory') . '

 									</a>

 								</li>';

-                        }

-                    }

-                }

-            }

-        }

-        //END LISTING OF POST TYPE IN MAIN NAVIGATION

-

-        $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');

-        $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;

-        if ($is_listing_sub_meny_exists) {

-            /**

-             * Filter the menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

-            /**

-             * Filter the sub menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

-            /**

-             * Filter the sub menu ul class.

-             *

-             * @since 1.0.0

-             */

-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

-            /**

-             * Filter the menu a class.

-             *

-             * @since 1.0.0

-             */

-            $a_class = apply_filters('geodir_menu_a_class', '');

-            /**

-             * Filter the sub menu a class.

-             *

-             * @since 1.0.0

-             */

-            $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

-            $items .= '<li class="' . $li_class . '">

+						}

+					}

+				}

+			}

+		}

+		//END LISTING OF POST TYPE IN MAIN NAVIGATION

+

+		$view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');

+		$is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;

+		if ($is_listing_sub_meny_exists) {

+			/**

+			 * Filter the menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

+			/**

+			 * Filter the sub menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+			/**

+			 * Filter the sub menu ul class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

+			/**

+			 * Filter the menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$a_class = apply_filters('geodir_menu_a_class', '');

+			/**

+			 * Filter the sub menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

+			$items .= '<li class="' . $li_class . '">

 					<a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>

 					<ul class="' . $sub_ul_class . '">';

-            $post_types = geodir_get_posttypes('object');

+			$post_types = geodir_get_posttypes('object');

 

-            $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

+			$show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

 

-            if (!empty($post_types)) {

-                global $geodir_add_location_url;

-                $geodir_add_location_url = true;

-                foreach ($post_types as $post_type => $args) {

-                    if (!empty($show_listing_post_types)) {

-                        if (in_array($post_type, $show_listing_post_types)) {

-                            if (get_post_type_archive_link($post_type)) {

+			if (!empty($post_types)) {

+				global $geodir_add_location_url;

+				$geodir_add_location_url = true;

+				foreach ($post_types as $post_type => $args) {

+					if (!empty($show_listing_post_types)) {

+						if (in_array($post_type, $show_listing_post_types)) {

+							if (get_post_type_archive_link($post_type)) {

 

-                                $menu_class = '';

-                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                    $menu_class = 'current-menu-item';

+								$menu_class = '';

+								if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

+									$menu_class = 'current-menu-item';

 

-                                $items .= '<li class="' . $sub_li_class . '">

+								$items .= '<li class="' . $sub_li_class . '">

 														<a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '">

 															' . __(ucfirst($args->labels->name),'geodirectory') . '

 														</a>

 													</li>';

-                            }

-                        }

-                    }

-                }

-                $geodir_add_location_url = NULL;

-            }

+							}

+						}

+					}

+				}

+				$geodir_add_location_url = NULL;

+			}

 

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

-            /**

-             * Filter called after the sub menu closing ul tag for dynamic added menu items.

-             *

-             * @since 1.5.9

-             */

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

-            $items .= '</li>';

-        }

-    }

-

-    if (get_option('geodir_show_addlisting_nav')) {

-

-        $menu_class = '';

-        if (geodir_is_page('add-listing'))

-            $menu_class = 'current-menu-item';

-

-        //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

-        $post_types = geodir_get_posttypes('object');

-        $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');

-        $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

-

-        if (!empty($post_types)) {

-            foreach ($post_types as $post_type => $args) {

-                if (!empty($geodir_allow_posttype_frontend)) {

-                    if (in_array($post_type, $geodir_allow_posttype_frontend)) {

-                        if (!empty($show_add_listing_post_types_main_nav)) {

-                            if (in_array($post_type, $show_add_listing_post_types_main_nav)) {

-                                if (geodir_get_addlisting_link($post_type)) {

-

-                                    $menu_class = '';

-                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                        $menu_class = 'current-menu-item';

-                                    /**

-                                     * Filter the menu li class.

-                                     *

-                                     * @since 1.0.0

-                                     * @param string $menu_class The menu HTML class.

-                                     */

-                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                                    /**

-                                     * Filter the menu a class.

-                                     *

-                                     * @since 1.0.0

-                                     */

-                                    $a_class = apply_filters('geodir_menu_a_class', '');

-                                    $cpt_name = __($args->labels->singular_name, 'geodirectory');

-                                    $items .= '<li class="' . $li_class . '">

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

+			/**

+			 * Filter called after the sub menu closing ul tag for dynamic added menu items.

+			 *

+			 * @since 1.5.9

+			 */

+			$items .= apply_filters('geodir_menu_after_sub_ul','');

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

+		}

+	}

+

+	if (get_option('geodir_show_addlisting_nav')) {

+

+		$menu_class = '';

+		if (geodir_is_page('add-listing'))

+			$menu_class = 'current-menu-item';

+

+		//SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

+		$post_types = geodir_get_posttypes('object');

+		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');

+		$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

+

+		if (!empty($post_types)) {

+			foreach ($post_types as $post_type => $args) {

+				if (!empty($geodir_allow_posttype_frontend)) {

+					if (in_array($post_type, $geodir_allow_posttype_frontend)) {

+						if (!empty($show_add_listing_post_types_main_nav)) {

+							if (in_array($post_type, $show_add_listing_post_types_main_nav)) {

+								if (geodir_get_addlisting_link($post_type)) {

+

+									$menu_class = '';

+									if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

+										$menu_class = 'current-menu-item';

+									/**

+									 * Filter the menu li class.

+									 *

+									 * @since 1.0.0

+									 * @param string $menu_class The menu HTML class.

+									 */

+									$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+									/**

+									 * Filter the menu a class.

+									 *

+									 * @since 1.0.0

+									 */

+									$a_class = apply_filters('geodir_menu_a_class', '');

+									$cpt_name = __($args->labels->singular_name, 'geodirectory');

+									$items .= '<li class="' . $li_class . '">

 											<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '">

 												' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

 											</a>

 										</li>';

-                                }

-                            }

-                        }

-                    }

-                }

-            }

-        }

-        //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

-    }

-

-    $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');

-    $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;

-    if ($is_add_listing_sub_meny_exists) {

-

-        if (get_option('geodir_show_addlisting_nav')) {

-            /**

-             * Filter the menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

-            /**

-             * Filter the sub menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

-            /**

-             * Filter the sub menu ul class.

-             *

-             * @since 1.0.0

-             */

-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

-            /**

-             * Filter the menu a class.

-             *

-             * @since 1.0.0

-             */

-            $a_class = apply_filters('geodir_menu_a_class', '');

-            /**

-             * Filter the sub menu a class.

-             *

-             * @since 1.0.0

-             */

-            $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

-            $items .= '<li  class="' . $li_class . '">

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		//END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

+	}

+

+	$view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');

+	$is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;

+	if ($is_add_listing_sub_meny_exists) {

+

+		if (get_option('geodir_show_addlisting_nav')) {

+			/**

+			 * Filter the menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

+			/**

+			 * Filter the sub menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

+			$sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+			/**

+			 * Filter the sub menu ul class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

+			/**

+			 * Filter the menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$a_class = apply_filters('geodir_menu_a_class', '');

+			/**

+			 * Filter the sub menu a class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

+			$items .= '<li  class="' . $li_class . '">

 					<a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>

 					<ul class="' . $sub_ul_class . '">';

 

-            $post_types = geodir_get_posttypes('object');

-

-            $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');

-

-            if (!empty($post_types)) {

-                foreach ($post_types as $post_type => $args) {

-                    if (!empty($geodir_allow_posttype_frontend)) {

-                        if (in_array($post_type, $geodir_allow_posttype_frontend)) {

-                            if (!empty($show_add_listing_post_types)) {

-                                if (in_array($post_type, $show_add_listing_post_types)) {

-                                    if (geodir_get_addlisting_link($post_type)) {

-

-                                        $menu_class = '';

-                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                            $menu_class = 'current-menu-item';

-                                        /**

-                                         * Filter the menu li class.

-                                         *

-                                         * @since 1.0.0

-                                         * @param string $menu_class The menu HTML class.

-                                         */

-                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

-                                        $cpt_name = __($args->labels->singular_name, 'geodirectory');

-                                        $items .= '<li class="' . $li_class . '">

+			$post_types = geodir_get_posttypes('object');

+

+			$show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');

+

+			if (!empty($post_types)) {

+				foreach ($post_types as $post_type => $args) {

+					if (!empty($geodir_allow_posttype_frontend)) {

+						if (in_array($post_type, $geodir_allow_posttype_frontend)) {

+							if (!empty($show_add_listing_post_types)) {

+								if (in_array($post_type, $show_add_listing_post_types)) {

+									if (geodir_get_addlisting_link($post_type)) {

+

+										$menu_class = '';

+										if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

+											$menu_class = 'current-menu-item';

+										/**

+										 * Filter the menu li class.

+										 *

+										 * @since 1.0.0

+										 * @param string $menu_class The menu HTML class.

+										 */

+										$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+										$cpt_name = __($args->labels->singular_name, 'geodirectory');

+										$items .= '<li class="' . $li_class . '">

 														<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '">

 															' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

 														</a>

 													</li>';

-                                    }

-                                }

-                            }

-                        }

-                    }

-                }

-            }

+									}

+								}

+							}

+						}

+					}

+				}

+			}

 

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

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

-            $items .= '</li>';

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

+			$items .= apply_filters('geodir_menu_after_sub_ul','');

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

 

-        }

-    }

-    // apply filter to add more navigations // -Filter-Location-Manager

-    return $items;

+		}

+	}

+	// apply filter to add more navigations // -Filter-Location-Manager

+	return $items;

 }

 

 

@@ -309,20 +309,20 @@ 
  */

 function geodir_pagemenu_items($menu, $args)

 {

-    $locations = get_nav_menu_locations();

-    $geodir_theme_location = get_option('geodir_theme_location_nav');

-    $geodir_theme_location_nav = array();

-    if (empty($locations) && empty($geodir_theme_location)) {

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

-        $geodir_theme_location_nav[] = $args['theme_location'];

-        update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

-    }

-    //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.

+	$locations = get_nav_menu_locations();

+	$geodir_theme_location = get_option('geodir_theme_location_nav');

+	$geodir_theme_location_nav = array();

+	if (empty($locations) && empty($geodir_theme_location)) {

+		$menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+		$geodir_theme_location_nav[] = $args['theme_location'];

+		update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

+	}

+	//else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.

 //		$menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);

-    else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+	else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))

+		$menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

 

-    return $menu;

+	return $menu;

 

 }

 

@@ -342,18 +342,18 @@ 
 function geodir_menu_items($items, $args)

 {

 

-    $location = $args->theme_location;

+	$location = $args->theme_location;

 

-    $geodir_theme_location = get_option('geodir_theme_location_nav');

+	$geodir_theme_location = get_option('geodir_theme_location_nav');

 

-    if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

+	if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

 

-        $items = $items . geodir_add_nav_menu_items();

-        return $items;

+		$items = $items . geodir_add_nav_menu_items();

+		return $items;

 

-    } else {

-        return $items;

-    }

+	} else {

+		return $items;

+	}

 }

 

 /**

@@ -368,25 +368,25 @@ 
  */

 function geodir_get_category_all_array()

 {

-    global $wpdb;

-    $return_array = array();

-

-    $taxonomies = geodir_get_taxonomies();

-    $taxonomies = implode("','", $taxonomies);

-    $taxonomies = "'" . $taxonomies . "'";

-

-    $pn_categories = $wpdb->get_results(

-        $wpdb->prepare(

-            "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

-            array($wpdb->terms . term_id)

-        )

-    );

-

-    foreach ($pn_categories as $pn_categories_obj) {

-        $return_array[] = array("id" => $pn_categories_obj->cat_ID,

-            "title" => $pn_categories_obj->name,);

-    }

-    return $return_array;

+	global $wpdb;

+	$return_array = array();

+

+	$taxonomies = geodir_get_taxonomies();

+	$taxonomies = implode("','", $taxonomies);

+	$taxonomies = "'" . $taxonomies . "'";

+

+	$pn_categories = $wpdb->get_results(

+		$wpdb->prepare(

+			"SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

+			array($wpdb->terms . term_id)

+		)

+	);

+

+	foreach ($pn_categories as $pn_categories_obj) {

+		$return_array[] = array("id" => $pn_categories_obj->cat_ID,

+			"title" => $pn_categories_obj->name,);

+	}

+	return $return_array;

 }

 

 

@@ -401,41 +401,41 @@ 
  */

 function geodir_get_current_posttype()

 {

-    global $wp_query, $geodir_post_type;

+	global $wp_query, $geodir_post_type;

 

-    $geodir_post_type = get_query_var('post_type');

+	$geodir_post_type = get_query_var('post_type');

 

-    if (geodir_is_page('add-listing') || geodir_is_page('preview')) {

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

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

-        elseif (isset($_REQUEST['listing_type']))

-            $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);

-    }

+	if (geodir_is_page('add-listing') || geodir_is_page('preview')) {

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

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

+		elseif (isset($_REQUEST['listing_type']))

+			$geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);

+	}

 

-    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))

-        $geodir_post_type = sanitize_text_field($_REQUEST['stype']);

+	if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))

+		$geodir_post_type = sanitize_text_field($_REQUEST['stype']);

 

-    if (is_tax())

-        $geodir_post_type = geodir_get_taxonomy_posttype();

+	if (is_tax())

+		$geodir_post_type = geodir_get_taxonomy_posttype();

 

 

-    $all_postypes = geodir_get_posttypes();

-    $all_postypes = stripslashes_deep($all_postypes);

+	$all_postypes = geodir_get_posttypes();

+	$all_postypes = stripslashes_deep($all_postypes);

 

-    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

-        $geodir_post_type = '';

+	if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

+		$geodir_post_type = '';

 

-    if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

-        $geodir_post_type = sanitize_text_field($_REQUEST['stype']);

-    }

+	if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

+		$geodir_post_type = sanitize_text_field($_REQUEST['stype']);

+	}

 

 

-    /**

-     * Filter the default CPT return.

-     *

-     * @since 1.6.9

-     */

-    return apply_filters('geodir_get_current_posttype',$geodir_post_type);

+	/**

+	 * Filter the default CPT return.

+	 *

+	 * @since 1.6.9

+	 */

+	return apply_filters('geodir_get_current_posttype',$geodir_post_type);

 }

 

 /**

@@ -449,22 +449,22 @@ 
  */

 function geodir_get_default_posttype()

 {

-    $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

-

-    $stype = false;

-    foreach ( $post_types as $post_type => $info ) {

-        global $wpdb;

-        $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-        if ( $has_posts ) {

-            $stype = $post_type; break;

-        }

-    }

-

-    if(!$stype){

-        $stype = 'gd_place';

-    }

-

-    return $stype;

+	$post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

+

+	$stype = false;

+	foreach ( $post_types as $post_type => $info ) {

+		global $wpdb;

+		$has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

+		if ( $has_posts ) {

+			$stype = $post_type; break;

+		}

+	}

+

+	if(!$stype){

+		$stype = 'gd_place';

+	}

+

+	return $stype;

 }

 

 /**

@@ -478,21 +478,21 @@ 
  */

 function geodir_get_posttypes($output = 'names')

 {

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

-    $post_types = stripslashes_deep($post_types);

-    if (!empty($post_types)) {

-        switch ($output):

-            case 'object':

-            case 'Object':

-                $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types;

-                break;

-            case 'array':

-            case 'Array':

-                $post_types = (array)$post_types;

-                break;

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

+	$post_types = stripslashes_deep($post_types);

+	if (!empty($post_types)) {

+		switch ($output):

+			case 'object':

+			case 'Object':

+				$post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types;

+				break;

+			case 'array':

+			case 'Array':

+				$post_types = (array)$post_types;

+				break;

 			case 'options':

-                $post_types = (array)$post_types;

+				$post_types = (array)$post_types;

 				

 				$options = array();

 				if (!empty($post_types)) {

@@ -501,17 +501,17 @@ 
 					}

 				}

 				$post_types = $options;

-                break;

-            default:

-                $post_types = array_keys($post_types);

-                break;

-        endswitch;

-    }

-

-    if (!empty($post_types))

-        return $post_types;

-    else

-        return array();

+				break;

+			default:

+				$post_types = array_keys($post_types);

+				break;

+		endswitch;

+	}

+

+	if (!empty($post_types))

+		return $post_types;

+	else

+		return array();

 }

 

 /**

@@ -524,108 +524,108 @@ 
  */

 function geodir_get_posttype_info($post_type = '')

 {

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

-    $post_types = stripslashes_deep($post_types);

-    if (!empty($post_types) && $post_type != '') {

-        return $post_types[$post_type];

-    } else

-        return false;

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

+	$post_types = stripslashes_deep($post_types);

+	if (!empty($post_types) && $post_type != '') {

+		return $post_types[$post_type];

+	} else

+		return false;

 }

 

 if (!function_exists('geodir_get_taxonomies')) {

-    /**

-     * Get all custom taxonomies.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $post_type The post type.

-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

-     * @return array|bool Taxonomies on success. false on failure.

-     */

-    function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false)

-    {

+	/**

+	 * Get all custom taxonomies.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $post_type The post type.

+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

+	 * @return array|bool Taxonomies on success. false on failure.

+	 */

+	function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false)

+	{

 

-        $taxonomies = array();

-        $gd_taxonomies = array();

+		$taxonomies = array();

+		$gd_taxonomies = array();

 

-        if ($taxonomies = get_option('geodir_taxonomies')) {

+		if ($taxonomies = get_option('geodir_taxonomies')) {

 

 

-            $gd_taxonomies = array_keys($taxonomies);

+			$gd_taxonomies = array_keys($taxonomies);

 

 

-            if ($post_type != '')

-                $gd_taxonomies = array();

+			if ($post_type != '')

+				$gd_taxonomies = array();

 

-            $i = 0;

-            foreach ($taxonomies as $taxonomy => $args) {

+			$i = 0;

+			foreach ($taxonomies as $taxonomy => $args) {

 

-                if ($post_type != '' && $args['object_type'] == $post_type)

-                    $gd_taxonomies[] = $taxonomy;

+				if ($post_type != '' && $args['object_type'] == $post_type)

+					$gd_taxonomies[] = $taxonomy;

 

-                if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {

-                    if (array_search($taxonomy, $gd_taxonomies) !== false)

-                        unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);

-                }

+				if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {

+					if (array_search($taxonomy, $gd_taxonomies) !== false)

+						unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);

+				}

 

-            }

+			}

 

-            $gd_taxonomies = array_values($gd_taxonomies);

-        }

-

-        /**

-         * Filter the taxonomies.

-         *

-         * @since 1.0.0

-         * @param array $gd_taxonomies The taxonomy array.

-         */

-        $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);

-

-        if (!empty($taxonomies)) {

-            return $taxonomies;

-        } else {

-            return false;

-        }

-    }

+			$gd_taxonomies = array_values($gd_taxonomies);

+		}

+

+		/**

+		 * Filter the taxonomies.

+		 *

+		 * @since 1.0.0

+		 * @param array $gd_taxonomies The taxonomy array.

+		 */

+		$taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);

+

+		if (!empty($taxonomies)) {

+			return $taxonomies;

+		} else {

+			return false;

+		}

+	}

 }

 

 if (!function_exists(' geodir_get_categories_dl')) {

-    /**

-     * Get categories dropdown HTML.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $post_type The post type.

-     * @param string $selected The selected value.

-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

-     * @param bool $echo Prints the HTML when set to true. Default: true.

-     * @return void|string Dropdown HTML.

-     */

-    function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)

-    {

-

-        $html = '';

-        $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);

-

-        $categories = get_terms($taxonomies);

-

-        $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

-

-        foreach ($categories as $category_obj) {

-            $select_opt = '';

-            if ($selected == $category_obj->term_id) {

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

-            }

-            $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

-                . ucfirst($category_obj->name) . '</option>';

-        }

-

-        if ($echo)

-            echo $html;

-        else

-            return $html;

-    }

+	/**

+	 * Get categories dropdown HTML.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $post_type The post type.

+	 * @param string $selected The selected value.

+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

+	 * @param bool $echo Prints the HTML when set to true. Default: true.

+	 * @return void|string Dropdown HTML.

+	 */

+	function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)

+	{

+

+		$html = '';

+		$taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);

+

+		$categories = get_terms($taxonomies);

+

+		$html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

+

+		foreach ($categories as $category_obj) {

+			$select_opt = '';

+			if ($selected == $category_obj->term_id) {

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

+			}

+			$html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

+				. ucfirst($category_obj->name) . '</option>';

+		}

+

+		if ($echo)

+			echo $html;

+		else

+			return $html;

+	}

 }

 

 

@@ -640,28 +640,28 @@ 
 function geodir_get_listing_slug($object_type = '')

 {

 

-    $listing_slug = '';

+	$listing_slug = '';

 

-    $post_types = get_option('geodir_post_types');

-    $taxonomies = get_option('geodir_taxonomies');

+	$post_types = get_option('geodir_post_types');

+	$taxonomies = get_option('geodir_taxonomies');

 

 

-    if ($object_type != '') {

-        if (!empty($post_types) && array_key_exists($object_type, $post_types)) {

+	if ($object_type != '') {

+		if (!empty($post_types) && array_key_exists($object_type, $post_types)) {

 

-            $object_info = $post_types[$object_type];

-            $listing_slug = $object_info['listing_slug'];

-        } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {

-            $object_info = $taxonomies[$object_type];

-            $listing_slug = $object_info['listing_slug'];

-        }

+			$object_info = $post_types[$object_type];

+			$listing_slug = $object_info['listing_slug'];

+		} elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {

+			$object_info = $taxonomies[$object_type];

+			$listing_slug = $object_info['listing_slug'];

+		}

 

-    }

+	}

 

-    if (!empty($listing_slug))

-        return $listing_slug;

-    else

-        return false;

+	if (!empty($listing_slug))

+		return $listing_slug;

+	else

+		return false;

 }

 

 

@@ -676,212 +676,212 @@ 
  */

 function geodir_get_taxonomy_posttype($taxonomy = '')

 {

-    global $wp_query;

-

-    $post_type = array();

-    $taxonomies = array();

-

-    if (!empty($taxonomy)) {

-        $taxonomies[] = $taxonomy;

-    } elseif (isset($wp_query->tax_query->queries)) {

-        $tax_arr = $wp_query->tax_query->queries;

-        //if tax query has 'relation' set then it will break wp_list_pluck so we remove it

-        if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}

-        $taxonomies = wp_list_pluck($tax_arr, 'taxonomy');

-    }

-

-    if (!empty($taxonomies)) {

-        foreach (geodir_get_posttypes() as $pt) {

-            $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);

-            if (array_intersect($taxonomies, $object_taxonomies))

-                $post_type[] = $pt;

-        }

-    }

-

-    if (!empty($post_type))

-        return $post_type[0];

-    else

-        return false;

+	global $wp_query;

+

+	$post_type = array();

+	$taxonomies = array();

+

+	if (!empty($taxonomy)) {

+		$taxonomies[] = $taxonomy;

+	} elseif (isset($wp_query->tax_query->queries)) {

+		$tax_arr = $wp_query->tax_query->queries;

+		//if tax query has 'relation' set then it will break wp_list_pluck so we remove it

+		if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}

+		$taxonomies = wp_list_pluck($tax_arr, 'taxonomy');

+	}

+

+	if (!empty($taxonomies)) {

+		foreach (geodir_get_posttypes() as $pt) {

+			$object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);

+			if (array_intersect($taxonomies, $object_taxonomies))

+				$post_type[] = $pt;

+		}

+	}

+

+	if (!empty($post_type))

+		return $post_type[0];

+	else

+		return false;

 }

 

 if (!function_exists('geodir_custom_taxonomy_walker')) {

-    /**

-     * Custom taxonomy walker function.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $cat_taxonomy The taxonomy name.

-     * @param int $cat_parent The parent term ID.

-     * @param bool $hide_empty Hide empty taxonomies? Default: false.

-     * @param int $pading CSS padding in pixels.

-     * @return string|void taxonomy HTML.

-     */

-    function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)

-    {

-        global $cat_display, $post_cat, $exclude_cats;

-

-        $search_terms = trim($post_cat, ",");

-

-        $search_terms = explode(",", $search_terms);

-

-        $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));

-

-        $display = '';

-        $onchange = '';

-        $term_check = '';

-        $main_list_class = '';

-        $out = '';

-        //If there are terms, start displaying

-        if (count($cat_terms) > 0) {

-            //Displaying as a list

-            $p = $pading * 20;

-            $pading++;

-

-

-            if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

-                if ($cat_parent == 0) {

-                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

-                    $main_list_class = 'class="main_list_selecter"';

-                } else {

-                    //$display = 'display:none';

-                    $list_class = 'sub_list gd-sub-cats-list';

-                }

-            }

+	/**

+	 * Custom taxonomy walker function.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $cat_taxonomy The taxonomy name.

+	 * @param int $cat_parent The parent term ID.

+	 * @param bool $hide_empty Hide empty taxonomies? Default: false.

+	 * @param int $pading CSS padding in pixels.

+	 * @return string|void taxonomy HTML.

+	 */

+	function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)

+	{

+		global $cat_display, $post_cat, $exclude_cats;

+

+		$search_terms = trim($post_cat, ",");

+

+		$search_terms = explode(",", $search_terms);

+

+		$cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));

+

+		$display = '';

+		$onchange = '';

+		$term_check = '';

+		$main_list_class = '';

+		$out = '';

+		//If there are terms, start displaying

+		if (count($cat_terms) > 0) {

+			//Displaying as a list

+			$p = $pading * 20;

+			$pading++;

+

+

+			if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

+				if ($cat_parent == 0) {

+					$list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

+					$main_list_class = 'class="main_list_selecter"';

+				} else {

+					//$display = 'display:none';

+					$list_class = 'sub_list gd-sub-cats-list';

+				}

+			}

 

-            if ($cat_display == 'checkbox' || $cat_display == 'radio') {

-                $p = 0;

-                $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

-            }

+			if ($cat_display == 'checkbox' || $cat_display == 'radio') {

+				$p = 0;

+				$out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+			}

 

-            foreach ($cat_terms as $cat_term) {

+			foreach ($cat_terms as $cat_term) {

 

-                $checked = '';

+				$checked = '';

 

-                if (in_array($cat_term->term_id, $search_terms)) {

-                    if ($cat_display == 'select' || $cat_display == 'multiselect')

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

-                    else

-                        $checked = 'checked="checked"';

-                }

+				if (in_array($cat_term->term_id, $search_terms)) {

+					if ($cat_display == 'select' || $cat_display == 'multiselect')

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

+					else

+						$checked = 'checked="checked"';

+				}

 

-                if ($cat_display == 'radio')

-                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

-                elseif ($cat_display == 'select' || $cat_display == 'multiselect')

-                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>';

+				if ($cat_display == 'radio')

+					$out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

+				elseif ($cat_display == 'select' || $cat_display == 'multiselect')

+					$out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>';

 

-                else {

-                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

-                }

+				else {

+					$out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

+				}

 

-                // Call recurson to print sub cats

-                $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);

+				// Call recurson to print sub cats

+				$out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);

 

-            }

+			}

 

-            if ($cat_display == 'checkbox' || $cat_display == 'radio')

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

+			if ($cat_display == 'checkbox' || $cat_display == 'radio')

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

 

-            return $out;

-        }

-        return;

-    }

+			return $out;

+		}

+		return;

+	}

 }

 

 if (!function_exists('geodir_custom_taxonomy_walker2')) {

-    /**

-     * Custom taxonomy walker function.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $post WordPress Post object.

-     * @global object $gd_session GeoDirectory Session object.

-     * @param string $cat_taxonomy The taxonomy name.

-     * @param string $cat_limit Number of categories to display.

-     */

-    function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')

-    {

-        $post_category = '';

-        $post_category_str = '';

-        global $exclude_cats, $gd_session;

-

-        $cat_exclude = '';

-        if (is_array($exclude_cats) && !empty($exclude_cats))

-            $cat_exclude = serialize($exclude_cats);

-

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

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

-

-            if (!is_array($post->post_category[$cat_taxonomy]))

-                $post_category = $post->post_category[$cat_taxonomy];

-

-            $post_categories = $post->post_category_str;

-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))

-                $post_category_str = $post_categories[$cat_taxonomy];

-

-        } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {

-            global $post;

-

-            $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);

-            if (empty($post_category) && isset($post->{$cat_taxonomy})) {

-                $post_category = $post->{$cat_taxonomy};

-            }

+	/**

+	 * Custom taxonomy walker function.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $post WordPress Post object.

+	 * @global object $gd_session GeoDirectory Session object.

+	 * @param string $cat_taxonomy The taxonomy name.

+	 * @param string $cat_limit Number of categories to display.

+	 */

+	function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')

+	{

+		$post_category = '';

+		$post_category_str = '';

+		global $exclude_cats, $gd_session;

+

+		$cat_exclude = '';

+		if (is_array($exclude_cats) && !empty($exclude_cats))

+			$cat_exclude = serialize($exclude_cats);

+

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

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

+

+			if (!is_array($post->post_category[$cat_taxonomy]))

+				$post_category = $post->post_category[$cat_taxonomy];

+

+			$post_categories = $post->post_category_str;

+			if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))

+				$post_category_str = $post_categories[$cat_taxonomy];

+

+		} elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {

+			global $post;

+

+			$post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);

+			if (empty($post_category) && isset($post->{$cat_taxonomy})) {

+				$post_category = $post->{$cat_taxonomy};

+			}

 

-            $post_categories = get_post_meta($post->ID, 'post_categories', true);

+			$post_categories = get_post_meta($post->ID, 'post_categories', true);

 

-            if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {

-                foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {

-                    if (is_numeric($cat_part)) {

-                        $cat_part_arr[] = $cat_part;

-                    }

-                }

-                if (is_array($cat_part_arr)) {

-                    $post_category = implode(',', $cat_part_arr);

-                }

-            }

+			if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {

+				foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {

+					if (is_numeric($cat_part)) {

+						$cat_part_arr[] = $cat_part;

+					}

+				}

+				if (is_array($cat_part_arr)) {

+					$post_category = implode(',', $cat_part_arr);

+				}

+			}

 

-            if (!empty($post_category)) {

-                $cat1 = array_filter(explode(',', $post_category));

-                $post_category = ',' . implode(',', $cat1) . ',';

+			if (!empty($post_category)) {

+				$cat1 = array_filter(explode(',', $post_category));

+				$post_category = ',' . implode(',', $cat1) . ',';

 

-            }

+			}

 

-            if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {

+			if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {

 

-                $post_category_upd = explode(',', $post_category);

-                $post_category_change = '';

-                foreach ($post_category_upd as $cat) {

+				$post_category_upd = explode(',', $post_category);

+				$post_category_change = '';

+				foreach ($post_category_upd as $cat) {

 

-                    if (!in_array($cat, $exclude_cats) && $cat != '') {

-                        $post_category_change .= ',' . $cat;

-                    }

-                }

-                $post_category = $post_category_change;

-            }

+					if (!in_array($cat, $exclude_cats) && $cat != '') {

+						$post_category_change .= ',' . $cat;

+					}

+				}

+				$post_category = $post_category_change;

+			}

 

 

-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

-                $post_category_str = $post_categories[$cat_taxonomy];

-            }

-        }

+			if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

+				$post_category_str = $post_categories[$cat_taxonomy];

+			}

+		}

 

-        echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

 

-        echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

 

-        echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

+		echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

 

 

-        ?>

+		?>

         <div class="cat_sublist">

             <?php

 

-            $post_id = isset($post->ID) ? $post->ID : '';

+			$post_id = isset($post->ID) ? $post->ID : '';

 

-            if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {

+			if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {

 

-                geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);

-            }

-            ?>

+				geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);

+			}

+			?>

         </div>

         <script type="text/javascript">

 

@@ -1004,22 +1004,22 @@ 
 

         </script>

         <?php

-        if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

-            $post_cat_str = $post_categories[$cat_taxonomy];

-            $post_cat_array = explode("#", $post_cat_str);

-            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)

-                $style = "display:none;";

-        }

-        ?>

+		if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

+			$post_cat_str = $post_categories[$cat_taxonomy];

+			$post_cat_array = explode("#", $post_cat_str);

+			if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)

+				$style = "display:none;";

+		}

+		?>

         <div class="main_cat_list" style=" <?php if (isset($style)) {

-            echo $style;

-        }?> ">

+			echo $style;

+		}?> ">

             <?php geodir_get_catlist($cat_taxonomy, 0);  // print main categories list

-            ?>

+			?>

         </div>

     <?php

 

-    }

+	}

 }

 

 /**

@@ -1036,23 +1036,23 @@ 
  */

 function geodir_addpost_categories_html($request_taxonomy, $parrent, $selected = false, $main_selected = true, $default = false, $exclude = '')

 {

-    global $exclude_cats;

+	global $exclude_cats;

 

-    if ($exclude != '') {

-        $exclude_cats = maybe_unserialize(base64_decode($exclude));

+	if ($exclude != '') {

+		$exclude_cats = maybe_unserialize(base64_decode($exclude));

 

-        if(is_array( $exclude_cats)){

-            $exclude_cats = array_map( 'intval', $exclude_cats );

-        }else{

-            $exclude_cats = intval($exclude_cats);

-        }

+		if(is_array( $exclude_cats)){

+			$exclude_cats = array_map( 'intval', $exclude_cats );

+		}else{

+			$exclude_cats = intval($exclude_cats);

+		}

 

-    }

+	}

 

-    if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||

-        (!is_array($exclude_cats) || empty($exclude_cats))

-    ) {

-        ?>

+	if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||

+		(!is_array($exclude_cats) || empty($exclude_cats))

+	) {

+		?>

 

         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>

 

@@ -1081,8 +1081,8 @@ 
 

             <br/>

             <?php

-            $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));

-            if (!empty($cat_terms)) { ?>

+			$cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));

+			if (!empty($cat_terms)) { ?>

                 <span> <?php printf(__('Add listing in category', 'geodirectory')); ?></span>

                 <?php geodir_get_catlist($request_taxonomy, $parrent, $selected) ?>

             <?php } ?>

@@ -1104,53 +1104,53 @@ 
 function geodir_editpost_categories_html($request_taxonomy, $request_postid, $post_categories)

 {

 

-    if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {

-        $post_cat_str = $post_categories[$request_taxonomy];

-        $post_cat_array = explode("#", $post_cat_str);

-        if (is_array($post_cat_array)) {

-            $post_cat_array = array_unique( $post_cat_array );

+	if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {

+		$post_cat_str = $post_categories[$request_taxonomy];

+		$post_cat_array = explode("#", $post_cat_str);

+		if (is_array($post_cat_array)) {

+			$post_cat_array = array_unique( $post_cat_array );

 

 			foreach ($post_cat_array as $post_cat_html) {

 

-                $post_cat_info = explode(":", $post_cat_html);

-                $post_maincat_str = $post_cat_info[0];

+				$post_cat_info = explode(":", $post_cat_html);

+				$post_maincat_str = $post_cat_info[0];

 

-                if (!empty($post_maincat_str)) {

-                    $post_maincat_info = explode(",", $post_maincat_str);

-                    $post_maincat_id = $post_maincat_info[0];

-                    ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

-                    (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

-                }

-                $post_sub_catid = '';

-                if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                    $post_sub_catid = (int)$post_cat_info[1];

-                }

+				if (!empty($post_maincat_str)) {

+					$post_maincat_info = explode(",", $post_maincat_str);

+					$post_maincat_id = $post_maincat_info[0];

+					($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

+					(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

+				}

+				$post_sub_catid = '';

+				if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

+					$post_sub_catid = (int)$post_cat_info[1];

+				}

 

-                geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

+				geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

 

-            }

-        } else {

+			}

+		} else {

 

-            $post_cat_info = explode(":", $post_cat_str);

-            $post_maincat_str = $post_cat_info[0];

+			$post_cat_info = explode(":", $post_cat_str);

+			$post_maincat_str = $post_cat_info[0];

 

-            $post_sub_catid = '';

+			$post_sub_catid = '';

 

-            if (!empty($post_maincat_str)) {

-                $post_maincat_info = explode(",", $post_maincat_str);

-                $post_maincat_id = $post_maincat_info[0];

-                ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

-                (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

-            }

+			if (!empty($post_maincat_str)) {

+				$post_maincat_info = explode(",", $post_maincat_str);

+				$post_maincat_id = $post_maincat_info[0];

+				($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

+				(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

+			}

 

-            if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                $post_sub_catid = (int)$post_cat_info[1];

-            }

+			if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

+				$post_sub_catid = (int)$post_cat_info[1];

+			}

 

-            geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

+			geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

 

-        }

-    }

+		}

+	}

 }

 

 /**

@@ -1164,35 +1164,35 @@ 
  */

 function geodir_get_catlist($cat_taxonomy, $parrent = 0, $selected = false)

 {

-    global $exclude_cats;

+	global $exclude_cats;

 

-    $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));

+	$cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));

 

-    if (!empty($cat_terms)) {

-        $onchange = '';

-        $onchange = ' onchange="show_subcatlist(this.value, this)" ';

+	if (!empty($cat_terms)) {

+		$onchange = '';

+		$onchange = ' onchange="show_subcatlist(this.value, this)" ';

 

-        $option_selected = '';

-        if (!$selected)

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

+		$option_selected = '';

+		if (!$selected)

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

 

-        echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';

+		echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';

 

-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

+		echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

 

-        foreach ($cat_terms as $cat_term) {

-            $option_selected = '';

-            if ($selected == $cat_term->term_id)

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

+		foreach ($cat_terms as $cat_term) {

+			$option_selected = '';

+			if ($selected == $cat_term->term_id)

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

 

-            // Count child terms

-            $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

-            $has_child = !empty( $child_terms ) ? 't' : 'f';

+			// Count child terms

+			$child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

+			$has_child = !empty( $child_terms ) ? 't' : 'f';

 

-            echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>';

-        }

-        echo '</select>';

-    }

+			echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>';

+		}

+		echo '</select>';

+	}

 }

 

 /**

@@ -1208,28 +1208,28 @@ 
  */

 function geodir_custom_update_messages($messages)

 {

-    global $post, $post_ID;

-

-    $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');

-

-    foreach ($post_types as $post_type => $post_object) {

-

-        $messages[$post_type] = array(

-            0 => '', // Unused. Messages start at index 1.

-            1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

-            2 => __('Custom field updated.', 'geodirectory'),

-            3 => __('Custom field deleted.', 'geodirectory'),

-            4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),

-            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,

-            6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

-            7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),

-            8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

-            9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

-            10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

-        );

-    }

-

-    return $messages;

+	global $post, $post_ID;

+

+	$post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');

+

+	foreach ($post_types as $post_type => $post_object) {

+

+		$messages[$post_type] = array(

+			0 => '', // Unused. Messages start at index 1.

+			1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

+			2 => __('Custom field updated.', 'geodirectory'),

+			3 => __('Custom field deleted.', 'geodirectory'),

+			4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),

+			5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,

+			6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

+			7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),

+			8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

+			9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

+			10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

+		);

+	}

+

+	return $messages;

 }

 

 

@@ -1244,182 +1244,182 @@ 
 function geodir_register_defaults()

 {

 

-    global $wpdb;

-

-    $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';

-

-    if (!$listing_slug = get_option('geodir_listing_prefix'))

-        $listing_slug = 'places';

-

-    /**

-     * Taxonomies

-     **/

-    //if ( ! taxonomy_exists('gd_place_tags') )

-    {

-

-        $gd_placetags = array();

-        $gd_placetags['object_type'] = 'gd_place';

-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';

-        $gd_placetags['args'] = array(

-            'public' => true,

-            'hierarchical' => false,

-            'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),

-            'query_var' => true,

-

-            'labels' => array(

-                'name' => __('Place Tags', 'geodirectory'),

-                'singular_name' => __('Place Tag', 'geodirectory'),

-                'search_items' => __('Search Place Tags', 'geodirectory'),

-                'popular_items' => __('Popular Place Tags', 'geodirectory'),

-                'all_items' => __('All Place Tags', 'geodirectory'),

-                'edit_item' => __('Edit Place Tag', 'geodirectory'),

-                'update_item' => __('Update Place Tag', 'geodirectory'),

-                'add_new_item' => __('Add New Place Tag', 'geodirectory'),

-                'new_item_name' => __('New Place Tag Name', 'geodirectory'),

-                'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),

-                'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),

-                'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),

-            ),

-        );

-

-

-        $geodir_taxonomies = get_option('geodir_taxonomies');

-        $geodir_taxonomies['gd_place_tags'] = $gd_placetags;

-        update_option('geodir_taxonomies', $geodir_taxonomies);

-

-

-        // Update post types and delete tmp options

-        flush_rewrite_rules();

-

-    }

-

-    //if ( ! taxonomy_exists('gd_placecategory') )

-    {

-

-        $gd_placecategory = array();

-        $gd_placecategory['object_type'] = 'gd_place';

-        $gd_placecategory['listing_slug'] = $listing_slug;

-        $gd_placecategory['args'] = array(

-            'public' => true,

-            'hierarchical' => true,

-            'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),

-            'query_var' => true,

-            'labels' => array(

-                'name' => __('Place Categories', 'geodirectory'),

-                'singular_name' => __('Place Category', 'geodirectory'),

-                'search_items' => __('Search Place Categories', 'geodirectory'),

-                'popular_items' => __('Popular Place Categories', 'geodirectory'),

-                'all_items' => __('All Place Categories', 'geodirectory'),

-                'edit_item' => __('Edit Place Category', 'geodirectory'),

-                'update_item' => __('Update Place Category', 'geodirectory'),

-                'add_new_item' => __('Add New Place Category', 'geodirectory'),

-                'new_item_name' => __('New Place Category', 'geodirectory'),

-                'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),

-            ),

-        );

-

-

-        $geodir_taxonomies = get_option('geodir_taxonomies');

-        $geodir_taxonomies['gd_placecategory'] = $gd_placecategory;

-        update_option('geodir_taxonomies', $geodir_taxonomies);

-

-

-        flush_rewrite_rules();

-    }

-

-    /**

-     * Post Types

-     **/

-

-    //if ( ! post_type_exists('gd_place') )

-    {

-

-        $labels = array(

-            'name' => __('Places', 'geodirectory'),

-            'singular_name' => __('Place', 'geodirectory'),

-            'add_new' => __('Add New', 'geodirectory'),

-            'add_new_item' => __('Add New Place', 'geodirectory'),

-            'edit_item' => __('Edit Place', 'geodirectory'),

-            'new_item' => __('New Place', 'geodirectory'),

-            'view_item' => __('View Place', 'geodirectory'),

-            'search_items' => __('Search Places', 'geodirectory'),

-            'not_found' => __('No Place Found', 'geodirectory'),

-            'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));

-

-        $place_default = array(

-            'labels' => $labels,

-            'can_export' => true,

-            'capability_type' => 'post',

-            'description' => 'Place post type.',

-            'has_archive' => $listing_slug,

-            'hierarchical' => false,

-            'map_meta_cap' => true,

-            'menu_icon' => $menu_icon,

-            'public' => true,

-            'query_var' => true,

-            'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

-            'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),

-            'taxonomies' => array('gd_placecategory', 'gd_place_tags'));

-

-        //Update custom post types

-        $geodir_post_types = get_option('geodir_post_types');

-        $geodir_post_types['gd_place'] = $place_default;

-        update_option('geodir_post_types', $geodir_post_types);

-

-        // Update post types and delete tmp options

-        flush_rewrite_rules();

-    }

-

-

-    geodir_register_taxonomies();

-    geodir_register_post_types();

-

-    //die;

+	global $wpdb;

+

+	$menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';

+

+	if (!$listing_slug = get_option('geodir_listing_prefix'))

+		$listing_slug = 'places';

+

+	/**

+	 * Taxonomies

+	 **/

+	//if ( ! taxonomy_exists('gd_place_tags') )

+	{

+

+		$gd_placetags = array();

+		$gd_placetags['object_type'] = 'gd_place';

+		$gd_placetags['listing_slug'] = $listing_slug . '/tags';

+		$gd_placetags['args'] = array(

+			'public' => true,

+			'hierarchical' => false,

+			'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),

+			'query_var' => true,

+

+			'labels' => array(

+				'name' => __('Place Tags', 'geodirectory'),

+				'singular_name' => __('Place Tag', 'geodirectory'),

+				'search_items' => __('Search Place Tags', 'geodirectory'),

+				'popular_items' => __('Popular Place Tags', 'geodirectory'),

+				'all_items' => __('All Place Tags', 'geodirectory'),

+				'edit_item' => __('Edit Place Tag', 'geodirectory'),

+				'update_item' => __('Update Place Tag', 'geodirectory'),

+				'add_new_item' => __('Add New Place Tag', 'geodirectory'),

+				'new_item_name' => __('New Place Tag Name', 'geodirectory'),

+				'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),

+				'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),

+				'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),

+			),

+		);

+

+

+		$geodir_taxonomies = get_option('geodir_taxonomies');

+		$geodir_taxonomies['gd_place_tags'] = $gd_placetags;

+		update_option('geodir_taxonomies', $geodir_taxonomies);

+

+

+		// Update post types and delete tmp options

+		flush_rewrite_rules();

+

+	}

+

+	//if ( ! taxonomy_exists('gd_placecategory') )

+	{

+

+		$gd_placecategory = array();

+		$gd_placecategory['object_type'] = 'gd_place';

+		$gd_placecategory['listing_slug'] = $listing_slug;

+		$gd_placecategory['args'] = array(

+			'public' => true,

+			'hierarchical' => true,

+			'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),

+			'query_var' => true,

+			'labels' => array(

+				'name' => __('Place Categories', 'geodirectory'),

+				'singular_name' => __('Place Category', 'geodirectory'),

+				'search_items' => __('Search Place Categories', 'geodirectory'),

+				'popular_items' => __('Popular Place Categories', 'geodirectory'),

+				'all_items' => __('All Place Categories', 'geodirectory'),

+				'edit_item' => __('Edit Place Category', 'geodirectory'),

+				'update_item' => __('Update Place Category', 'geodirectory'),

+				'add_new_item' => __('Add New Place Category', 'geodirectory'),

+				'new_item_name' => __('New Place Category', 'geodirectory'),

+				'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),

+			),

+		);

+

+

+		$geodir_taxonomies = get_option('geodir_taxonomies');

+		$geodir_taxonomies['gd_placecategory'] = $gd_placecategory;

+		update_option('geodir_taxonomies', $geodir_taxonomies);

+

+

+		flush_rewrite_rules();

+	}

+

+	/**

+	 * Post Types

+	 **/

+

+	//if ( ! post_type_exists('gd_place') )

+	{

+

+		$labels = array(

+			'name' => __('Places', 'geodirectory'),

+			'singular_name' => __('Place', 'geodirectory'),

+			'add_new' => __('Add New', 'geodirectory'),

+			'add_new_item' => __('Add New Place', 'geodirectory'),

+			'edit_item' => __('Edit Place', 'geodirectory'),

+			'new_item' => __('New Place', 'geodirectory'),

+			'view_item' => __('View Place', 'geodirectory'),

+			'search_items' => __('Search Places', 'geodirectory'),

+			'not_found' => __('No Place Found', 'geodirectory'),

+			'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));

+

+		$place_default = array(

+			'labels' => $labels,

+			'can_export' => true,

+			'capability_type' => 'post',

+			'description' => 'Place post type.',

+			'has_archive' => $listing_slug,

+			'hierarchical' => false,

+			'map_meta_cap' => true,

+			'menu_icon' => $menu_icon,

+			'public' => true,

+			'query_var' => true,

+			'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

+			'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),

+			'taxonomies' => array('gd_placecategory', 'gd_place_tags'));

+

+		//Update custom post types

+		$geodir_post_types = get_option('geodir_post_types');

+		$geodir_post_types['gd_place'] = $place_default;

+		update_option('geodir_post_types', $geodir_post_types);

+

+		// Update post types and delete tmp options

+		flush_rewrite_rules();

+	}

+

+

+	geodir_register_taxonomies();

+	geodir_register_post_types();

+

+	//die;

 

 }

 

 $gd_wpml_get_languages = "";

 function gd_wpml_get_lang_from_url($url) {

-    global $sitepress, $gd_wpml_get_languages;

+	global $sitepress, $gd_wpml_get_languages;

     

-    if (geodir_is_wpml()) {

-        return $sitepress->get_language_from_url($url);

-    }

+	if (geodir_is_wpml()) {

+		return $sitepress->get_language_from_url($url);

+	}

     

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

-        return $_REQUEST['lang'];

-    }

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

+		return $_REQUEST['lang'];

+	}

 

-    $url = str_replace(array("http://","https://"),"",$url);

+	$url = str_replace(array("http://","https://"),"",$url);

 

-    // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

-    $site_url = str_replace(array("http://","https://"),"",site_url());

+	// site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

+	$site_url = str_replace(array("http://","https://"),"",site_url());

 

-    $url = str_replace($site_url,"",$url);

+	$url = str_replace($site_url,"",$url);

 

-    $segments = explode('/', trim($url, '/'));

+	$segments = explode('/', trim($url, '/'));

 

-    if ($gd_wpml_get_languages) {

-        $langs = $gd_wpml_get_languages;

-    } else {

-        $gd_wpml_get_languages = $sitepress->get_active_languages();

-    }

+	if ($gd_wpml_get_languages) {

+		$langs = $gd_wpml_get_languages;

+	} else {

+		$gd_wpml_get_languages = $sitepress->get_active_languages();

+	}

 

-    if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {

-        return $segments[0];

-    }

+	if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {

+		return $segments[0];

+	}

 

-    return false;

+	return false;

 }

 

 function gd_wpml_slug_translation_turned_on($post_type) {

 

-    global $sitepress;

-    $settings = $sitepress->get_settings();

-    return isset($settings['posts_slug_translation']['types'][$post_type])

-    && $settings['posts_slug_translation']['types'][$post_type]

-    && isset($settings['posts_slug_translation']['on'])

-    && $settings['posts_slug_translation']['on'];

+	global $sitepress;

+	$settings = $sitepress->get_settings();

+	return isset($settings['posts_slug_translation']['types'][$post_type])

+	&& $settings['posts_slug_translation']['types'][$post_type]

+	&& isset($settings['posts_slug_translation']['on'])

+	&& $settings['posts_slug_translation']['on'];

 }

 

 

@@ -1446,158 +1446,158 @@ 
  */

 function geodir_listing_permalink_structure($post_link, $post_obj, $leavename, $sample)

 {

-    //echo $post_link."<br />".$sample ;

+	//echo $post_link."<br />".$sample ;

 

 

-    global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache;

-    if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

-    } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {

-        return $post_link;

-    } else {

-        $orig_post = $post;

-        $post = $post_obj;

-    }

+	global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache;

+	if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

+	} elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {

+		return $post_link;

+	} else {

+		$orig_post = $post;

+		$post = $post_obj;

+	}

 

-    if (in_array($post->post_type, geodir_get_posttypes())) {

+	if (in_array($post->post_type, geodir_get_posttypes())) {

 

-        // if we dont have a GD post then try to grab it

-        if(!isset($post->default_category)){

-            $gd_post = geodir_get_post_info($post->ID);

-            if(!empty($gd_post)){

-                $post = $gd_post;

-            }

-        }

+		// if we dont have a GD post then try to grab it

+		if(!isset($post->default_category)){

+			$gd_post = geodir_get_post_info($post->ID);

+			if(!empty($gd_post)){

+				$post = $gd_post;

+			}

+		}

 

 

-        $post_types = get_option('geodir_post_types');

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

+		$post_types = get_option('geodir_post_types');

+		$slug = $post_types[$post->post_type]['rewrite']['slug'];

 

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

-        if(function_exists('icl_object_id')){

-            if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

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

+		if(function_exists('icl_object_id')){

+			if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

 

-                $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

-                    $slug,

-                    'WordPress',

-                    'URL slug: ' . $slug,

-                    $language_code);

+				$org_slug = $slug;

+				$slug = apply_filters( 'wpml_translate_single_string',

+					$slug,

+					'WordPress',

+					'URL slug: ' . $slug,

+					$language_code);

 

-                if(!$slug){$slug = $org_slug;}

+				if(!$slug){$slug = $org_slug;}

 

-            }

-        }

+			}

+		}

 

-        if (function_exists('geodir_location_geo_home_link')) {

-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

-        }

+		if (function_exists('geodir_location_geo_home_link')) {

+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+		}

         

-        // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.

-        $site_url = trailingslashit(get_bloginfo('url'));

+		// Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.

+		$site_url = trailingslashit(get_bloginfo('url'));

         

-        if (function_exists('geodir_location_geo_home_link')) {

-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

-        }

-

-        $fix_url = strpos($post_link, $site_url) === 0 ? true : false;

-        if ($fix_url) {

-            $post_link = str_replace($site_url, '', $post_link);

-        }

-

-        $post_link = trailingslashit(

-            preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

-        );

-

-        if ($fix_url) {

-            $post_link = $site_url . $post_link;

-        }

-

-        if (isset($comment_post_cache[$post->ID])) {

-            $post = $comment_post_cache[$post->ID];

-        }

-        if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {

-            $post_id = $post->ID;

-            if (isset($orig_post)) {

-                $post = $orig_post;

-            }

-            return $gd_permalink_cache[$post_id];

-        }

+		if (function_exists('geodir_location_geo_home_link')) {

+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+		}

 

-        if (!isset($post->post_locations)) {

-            $post_type = $post->post_type;

-            $ID = $post->ID;

-            $post2 = $wpdb->get_row(

-                $wpdb->prepare(

-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

-                    array($post->ID)

-                )

-            );

+		$fix_url = strpos($post_link, $site_url) === 0 ? true : false;

+		if ($fix_url) {

+			$post_link = str_replace($site_url, '', $post_link);

+		}

 

-            $post = (object)array_merge((array)$post, (array)$post2);

+		$post_link = trailingslashit(

+			preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

+		);

 

-            $comment_post_cache[$post->ID] = $post;

-        }

+		if ($fix_url) {

+			$post_link = $site_url . $post_link;

+		}

 

+		if (isset($comment_post_cache[$post->ID])) {

+			$post = $comment_post_cache[$post->ID];

+		}

+		if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {

+			$post_id = $post->ID;

+			if (isset($orig_post)) {

+				$post = $orig_post;

+			}

+			return $gd_permalink_cache[$post_id];

+		}

 

+		if (!isset($post->post_locations)) {

+			$post_type = $post->post_type;

+			$ID = $post->ID;

+			$post2 = $wpdb->get_row(

+				$wpdb->prepare(

+					"SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+					array($post->ID)

+				)

+			);

 

-        if (false !== strpos($post_link, '%gd_taxonomy%')) {

+			$post = (object)array_merge((array)$post, (array)$post2);

 

-            if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {

-                $location_request = '';

+			$comment_post_cache[$post->ID] = $post;

+		}

 

 

-                if (!empty($post->post_locations)) {

-                    $geodir_arr_locations = explode(',', $post->post_locations);

-                    if (count($geodir_arr_locations) == 3) {

-                        $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

-                        $post->city_slug = str_replace(']', '', $post->city_slug);

-                        $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

-                        $post->region_slug = str_replace(']', '', $post->region_slug);

-                        $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

-                        $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                        $post_location = (object)array('country_slug' => $post->country_slug,

-                            'region_slug' => $post->region_slug,

-                            'city_slug' => $post->city_slug

-                        );

+		if (false !== strpos($post_link, '%gd_taxonomy%')) {

 

-                    } else

-                        $post_location = geodir_get_location();

+			if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {

+				$location_request = '';

 

 

-                } else {

+				if (!empty($post->post_locations)) {

+					$geodir_arr_locations = explode(',', $post->post_locations);

+					if (count($geodir_arr_locations) == 3) {

+						$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

+						$post->city_slug = str_replace(']', '', $post->city_slug);

+						$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

+						$post->region_slug = str_replace(']', '', $post->region_slug);

+						$post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

+						$post->country_slug = str_replace(']', '', $post->country_slug);

 

-                    $post_location_sql = $wpdb->get_results(

-                        $wpdb->prepare(

-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

-                            array($post->ID)

-                        )

-                    );

-

-                    if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {

-

-                        $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);

-                        if (count($geodir_arr_locations) == 3) {

-                            $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

-                            $post->city_slug = str_replace(']', '', $post->city_slug);

-                            $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

-                            $post->region_slug = str_replace(']', '', $post->region_slug);

-                            $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

-                            $post->country_slug = str_replace(']', '', $post->country_slug);

-

-                            $post_location = (object)array('country_slug' => $post->country_slug,

-                                'region_slug' => $post->region_slug,

-                                'city_slug' => $post->city_slug

-                            );

+						$post_location = (object)array('country_slug' => $post->country_slug,

+							'region_slug' => $post->region_slug,

+							'city_slug' => $post->city_slug

+						);

 

-                        }

-                    } else

-                        $post_location = geodir_get_location();

-                }

+					} else

+						$post_location = geodir_get_location();

 

 

-                if (!empty($post_location)) {

-                    $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : '';

+				} else {

+

+					$post_location_sql = $wpdb->get_results(

+						$wpdb->prepare(

+							"SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+							array($post->ID)

+						)

+					);

+

+					if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {

+

+						$geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);

+						if (count($geodir_arr_locations) == 3) {

+							$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

+							$post->city_slug = str_replace(']', '', $post->city_slug);

+							$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

+							$post->region_slug = str_replace(']', '', $post->region_slug);

+							$post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

+							$post->country_slug = str_replace(']', '', $post->country_slug);

+

+							$post_location = (object)array('country_slug' => $post->country_slug,

+								'region_slug' => $post->region_slug,

+								'city_slug' => $post->city_slug

+							);

+

+						}

+					} else

+						$post_location = geodir_get_location();

+				}

+

+

+				if (!empty($post_location)) {

+					$country_slug = isset($post_location->country_slug) ? $post_location->country_slug : '';

 					$region_slug = isset($post_location->region_slug) ? $post_location->region_slug : '';

 					$city_slug = isset($post_location->city_slug) ? $post_location->city_slug : '';

 					

@@ -1615,89 +1615,89 @@ 
 					$location_slug[] = $city_slug;

 					

 					$location_request .= implode('/', $location_slug) . '/';

-                }

-            }

+				}

+			}

 

-            if (get_option('geodir_add_categories_url')) {

+			if (get_option('geodir_add_categories_url')) {

 

-                $term_request = '';

-                $taxonomies = geodir_get_taxonomies($post->post_type);

+				$term_request = '';

+				$taxonomies = geodir_get_taxonomies($post->post_type);

 

-                $taxonomies = end($taxonomies);

+				$taxonomies = end($taxonomies);

 

-                if (!empty($post->default_category)) {

-                    $post_terms = $post->default_category;

-                } else {

-                    $post_terms = '';

-

-                    if(isset($_POST['post_default_category']) && $_POST['post_default_category']){

-                        $post_terms = absint($_POST['post_default_category']);

-                    }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]){

-                        $post_terms = explode(",", trim($_POST['post_category'][$taxonomies], ","));

-                        $post_terms = absint($post_terms[0]);

-                    }elseif (isset($post->{$taxonomies})) {

-                        $post_terms = explode(",", trim($post->{$taxonomies}, ","));

-                        $post_terms = $post_terms[0];

-                    }

+				if (!empty($post->default_category)) {

+					$post_terms = $post->default_category;

+				} else {

+					$post_terms = '';

+

+					if(isset($_POST['post_default_category']) && $_POST['post_default_category']){

+						$post_terms = absint($_POST['post_default_category']);

+					}elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]){

+						$post_terms = explode(",", trim($_POST['post_category'][$taxonomies], ","));

+						$post_terms = absint($post_terms[0]);

+					}elseif (isset($post->{$taxonomies})) {

+						$post_terms = explode(",", trim($post->{$taxonomies}, ","));

+						$post_terms = $post_terms[0];

+					}

 

-                    if (!$post_terms)

-                        $post_terms = geodir_get_post_meta($post->ID, 'default_category', true);

+					if (!$post_terms)

+						$post_terms = geodir_get_post_meta($post->ID, 'default_category', true);

 

-                    if (!$post_terms) {

-                        $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);

+					if (!$post_terms) {

+						$post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);

 

-                        if ($post_terms) {

-                            $post_terms = explode(",", trim($post_terms, ","));

-                            $post_terms = $post_terms[0];

-                        }

-                    }

-                }

+						if ($post_terms) {

+							$post_terms = explode(",", trim($post_terms, ","));

+							$post_terms = $post_terms[0];

+						}

+					}

+				}

 

-                $term = get_term_by('id', $post_terms, $taxonomies);

+				$term = get_term_by('id', $post_terms, $taxonomies);

 

-                if (!empty($term))

-                    $term_request = $term->slug;

-                //$term_request = $term->slug.'/';

-            }

+				if (!empty($term))

+					$term_request = $term->slug;

+				//$term_request = $term->slug.'/';

+			}

 

-            $request_term = '';

-            $listingurl_separator = '';

-            //$detailurl_separator = get_option('geodir_detailurl_separator');

-            $detailurl_separator = '';

-            if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {

-                $request_term = $location_request;

-                //$listingurl_separator = get_option('geodir_listingurl_separator');

-                //$request_term .= $listingurl_separator.'/'.$term_request;

-                $request_term .= $term_request;

+			$request_term = '';

+			$listingurl_separator = '';

+			//$detailurl_separator = get_option('geodir_detailurl_separator');

+			$detailurl_separator = '';

+			if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {

+				$request_term = $location_request;

+				//$listingurl_separator = get_option('geodir_listingurl_separator');

+				//$request_term .= $listingurl_separator.'/'.$term_request;

+				$request_term .= $term_request;

 

-            } else {

-                if (isset($location_request) && $location_request != '') $request_term = $location_request;

+			} else {

+				if (isset($location_request) && $location_request != '') $request_term = $location_request;

 

-                if (isset($term_request) && $term_request != '') $request_term .= $term_request;

-            }

-            $request_term = trim($request_term, '/');

+				if (isset($term_request) && $term_request != '') $request_term .= $term_request;

+			}

+			$request_term = trim($request_term, '/');

             

-            // Fix with WPML the location terms added twice when CPT slug is translated.

-            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {

-                $post_link = str_replace('%gd_taxonomy%/', '', $post_link);

-            }

+			// Fix with WPML the location terms added twice when CPT slug is translated.

+			if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {

+				$post_link = str_replace('%gd_taxonomy%/', '', $post_link);

+			}

             

-            if (!empty($request_term))

-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

-            else

-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

-            //echo $post_link ;

-        }

-        // temp cache the permalink

-        if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {

-            $gd_permalink_cache[$post->ID] = $post_link;

-        }

-    }

-    if (isset($orig_post)) {

-        $post = $orig_post;

-    }

-

-    return $post_link;

+			if (!empty($request_term))

+				$post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+			else

+				$post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+			//echo $post_link ;

+		}

+		// temp cache the permalink

+		if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {

+			$gd_permalink_cache[$post->ID] = $post_link;

+		}

+	}

+	if (isset($orig_post)) {

+		$post = $orig_post;

+	}

+

+	return $post_link;

 }

 

 /**

@@ -1713,99 +1713,99 @@ 
  * @return string The term link.

  */

 function geodir_term_link($termlink, $term, $taxonomy) {

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

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

 

-    if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {

-        global $geodir_add_location_url, $gd_session;

-        $include_location = false;

-        $request_term = array();

-        $add_location_url = get_option('geodir_add_location_url');

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

+	if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {

+		global $geodir_add_location_url, $gd_session;

+		$include_location = false;

+		$request_term = array();

+		$add_location_url = get_option('geodir_add_location_url');

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

 

-        $listing_slug = geodir_get_listing_slug($taxonomy);

+		$listing_slug = geodir_get_listing_slug($taxonomy);

 

-        if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {

-            if ($geodir_add_location_url && $add_location_url) {

-                $include_location = true;

-            }

-        } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {

-            $include_location = true;

-        } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {

-            $include_location = true;

-        }

-

-        if ($include_location) {

-            global $post;

+		if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {

+			if ($geodir_add_location_url && $add_location_url) {

+				$include_location = true;

+			}

+		} elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {

+			$include_location = true;

+		} elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {

+			$include_location = true;

+		}

+

+		if ($include_location) {

+			global $post;

             

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

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

             

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

-                $location_terms = array(

-                    'gd_country' => $post->country_slug,

-                    'gd_region' => $post->region_slug,

-                    'gd_city' => $post->city_slug

-                );

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

+				$location_terms = array(

+					'gd_country' => $post->country_slug,

+					'gd_region' => $post->region_slug,

+					'gd_city' => $post->city_slug

+				);

                 

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

-                    $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

-                }

-            } else {

-                $location_terms = geodir_get_current_location_terms('query_vars');

-            }

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

+					$location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

+				}

+			} else {

+				$location_terms = geodir_get_current_location_terms('query_vars');

+			}

 

-            $geodir_show_location_url = get_option('geodir_show_location_url');

-            $location_terms = geodir_remove_location_terms($location_terms);

+			$geodir_show_location_url = get_option('geodir_show_location_url');

+			$location_terms = geodir_remove_location_terms($location_terms);

 

-            if (!empty($location_terms)) {

-                $url_separator = '';

+			if (!empty($location_terms)) {

+				$url_separator = '';

 

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

-                    $old_listing_slug = '/' . $listing_slug . '/';

-                    $request_term = implode("/", $location_terms);

-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

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

+					$old_listing_slug = '/' . $listing_slug . '/';

+					$request_term = implode("/", $location_terms);

+					$new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

 

-                    $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

-                } else {

-                    $termlink = geodir_getlink($termlink, $request_term);

-                }

-            }

-        }

+					$termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

+				} else {

+					$termlink = geodir_getlink($termlink, $request_term);

+				}

+			}

+		}

 

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

-        /* we can replace this with the below function

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

+		/* we can replace this with the below function

         if(function_exists('icl_object_id')){

             global $sitepress;

             $post_type = str_replace("category","",$taxonomy);

             $termlink = $sitepress->post_type_archive_link_filter( $termlink, $post_type);

         }*/

 

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

-        if (function_exists('icl_object_id')) {

-            $post_types = get_option('geodir_post_types');

-            $post_type = str_replace("category","",$taxonomy);

-            $post_type = str_replace("_tags","",$post_type);

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

-            if (gd_wpml_slug_translation_turned_on($post_type)) {

-                global $sitepress;

-                $default_lang = $sitepress->get_default_language();

-                $language_code = gd_wpml_get_lang_from_url($termlink);

-                if (!$language_code ) {

-                    $language_code  = $default_lang;

-                }

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

+		if (function_exists('icl_object_id')) {

+			$post_types = get_option('geodir_post_types');

+			$post_type = str_replace("category","",$taxonomy);

+			$post_type = str_replace("_tags","",$post_type);

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

+			if (gd_wpml_slug_translation_turned_on($post_type)) {

+				global $sitepress;

+				$default_lang = $sitepress->get_default_language();

+				$language_code = gd_wpml_get_lang_from_url($termlink);

+				if (!$language_code ) {

+					$language_code  = $default_lang;

+				}

 

-                $org_slug = $slug;

-                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);

+				$org_slug = $slug;

+				$slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);

 

-                if (!$slug) {

-                    $slug = $org_slug;

-                }

+				if (!$slug) {

+					$slug = $org_slug;

+				}

 

-                $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug  ,$termlink, 1));

-            }

-        }

-    }

+				$termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug  ,$termlink, 1));

+			}

+		}

+	}

     

-    return $termlink;

+	return $termlink;

 }

 

 /**

@@ -1831,14 +1831,14 @@ 
 	if (in_array($post_type, geodir_get_posttypes())) {

 		if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {

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

-                $location_terms = array(

-                    'gd_country' => $post->country_slug,

-                    'gd_region' => $post->region_slug,

-                    'gd_city' => $post->city_slug

-                );

-            } else {

-                $location_terms = geodir_get_current_location_terms('query_vars');

-            }

+				$location_terms = array(

+					'gd_country' => $post->country_slug,

+					'gd_region' => $post->region_slug,

+					'gd_city' => $post->city_slug

+				);

+			} else {

+				$location_terms = geodir_get_current_location_terms('query_vars');

+			}

 			

 			$location_terms = geodir_remove_location_terms($location_terms);

 			

@@ -1870,17 +1870,17 @@ 
  * @return void|string Label.

  */

 function get_post_type_singular_label($post_type, $echo = false, $translate = false) {

-    $obj_post_type = get_post_type_object($post_type);

-    if (!is_object($obj_post_type)) {

-        return;

-    }

+	$obj_post_type = get_post_type_object($post_type);

+	if (!is_object($obj_post_type)) {

+		return;

+	}

     

-    $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;

+	$label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

+	if ($echo)

+		echo $label;

+	else

+		return $label;

 }

 

 /**

@@ -1895,19 +1895,19 @@ 
  * @return void|string Label.

  */

 function get_post_type_plural_label($post_type, $echo = false, $translate = false) {

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

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

-        return false;

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

+		return false;

 

-    $obj_post_type = get_post_type_object($post_type);

+	$obj_post_type = get_post_type_object($post_type);

     

-    $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;

+	$label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

+	if ($echo)

+		echo $label;

+	else

+		return $label;

 }

 

 /**

@@ -1925,51 +1925,51 @@ 
  */

 function geodir_term_exists($term, $taxonomy = '', $parent = 0)

 {

-    global $wpdb;

-

-    $select = "SELECT term_id FROM $wpdb->terms as t WHERE ";

-    $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";

-

-    if (is_int($term)) {

-        if (0 == $term)

-            return 0;

-        $where = 't.term_id = %d';

-        if (!empty($taxonomy))

-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

-        else

-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));

-    }

+	global $wpdb;

+

+	$select = "SELECT term_id FROM $wpdb->terms as t WHERE ";

+	$tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";

+

+	if (is_int($term)) {

+		if (0 == $term)

+			return 0;

+		$where = 't.term_id = %d';

+		if (!empty($taxonomy))

+			return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

+		else

+			return $wpdb->get_var($wpdb->prepare($select . $where, $term));

+	}

 

-    $term = trim(wp_unslash($term));

+	$term = trim(wp_unslash($term));

 

-    if ('' === $slug = sanitize_title($term))

-        return 0;

+	if ('' === $slug = sanitize_title($term))

+		return 0;

 

-    $where = 't.slug = %s';

+	$where = 't.slug = %s';

 

-    $where_fields = array($slug);

-    if (!empty($taxonomy)) {

-        $parent = (int)$parent;

-        if ($parent > 0) {

-            $where_fields[] = $parent;

-            $else_where_fields[] = $parent;

-            $where .= ' AND tt.parent = %d';

+	$where_fields = array($slug);

+	if (!empty($taxonomy)) {

+		$parent = (int)$parent;

+		if ($parent > 0) {

+			$where_fields[] = $parent;

+			$else_where_fields[] = $parent;

+			$where .= ' AND tt.parent = %d';

 

-        }

+		}

 

-        $where_fields[] = $taxonomy;

+		$where_fields[] = $taxonomy;

 

 

-        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))

-            return $result;

+		if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))

+			return $result;

 

-        return false;

-    }

+		return false;

+	}

 

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))

-        return $result;

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))

+		return $result;

 

-    return false;

+	return false;

 }

 

 /**

@@ -1981,7 +1981,7 @@ 
 function geodir_get_term_icon_rebuild()

 {

 

-    update_option('gd_term_icons', '');

+	update_option('gd_term_icons', '');

 

 }

 

@@ -1999,61 +1999,61 @@ 
  */

 function geodir_get_term_icon($term_id = false, $rebuild = false)

 {

-    global $wpdb;

-    if (!$rebuild) {

-        $terms_icons = get_option('gd_term_icons');

-    } else {

-        $terms_icons = array();

-    }

-

-    if (empty($terms_icons)) {

-        $terms_icons = array();

-        $default_icon_url = get_option('geodir_default_marker_icon');

-        $taxonomy = geodir_get_taxonomies();

-        $post_types = geodir_get_posttypes();

-        $tax_arr = array();

-        foreach ($post_types as $post_type) {

-            $tax_arr[] = "'" . $post_type . "category'";

-        }

-        $tax_c = implode(',', $tax_arr);

-        $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

-        //$terms = get_terms( $taxonomy );

-

-        if($terms) {

-            foreach ($terms as $term) {

-                $post_type = str_replace("category", "", $term->taxonomy);

-                $a_terms[$post_type][] = $term;

+	global $wpdb;

+	if (!$rebuild) {

+		$terms_icons = get_option('gd_term_icons');

+	} else {

+		$terms_icons = array();

+	}

 

-            }

-        }

+	if (empty($terms_icons)) {

+		$terms_icons = array();

+		$default_icon_url = get_option('geodir_default_marker_icon');

+		$taxonomy = geodir_get_taxonomies();

+		$post_types = geodir_get_posttypes();

+		$tax_arr = array();

+		foreach ($post_types as $post_type) {

+			$tax_arr[] = "'" . $post_type . "category'";

+		}

+		$tax_c = implode(',', $tax_arr);

+		$terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

+		//$terms = get_terms( $taxonomy );

 

-        if($a_terms) {

-            foreach ($a_terms as $pt => $t2) {

+		if($terms) {

+			foreach ($terms as $term) {

+				$post_type = str_replace("category", "", $term->taxonomy);

+				$a_terms[$post_type][] = $term;

 

-                foreach ($t2 as $term) {

-                    $term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);

-                    if ($term_icon) {

-                        $term_icon_url = $term_icon["src"];

-                    } else {

-                        $term_icon_url = $default_icon_url;

-                    }

-                    $terms_icons[$term->term_id] = $term_icon_url;

-                }

-            }

-        }

+			}

+		}

 

-        update_option('gd_term_icons', $terms_icons);

-    }

+		if($a_terms) {

+			foreach ($a_terms as $pt => $t2) {

 

-    if ($term_id && isset($terms_icons[$term_id])) {

-        return $terms_icons[$term_id];

-    } elseif ($term_id && !isset($terms_icons[$term_id])) {

-        return get_option('geodir_default_marker_icon');

-    }

+				foreach ($t2 as $term) {

+					$term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);

+					if ($term_icon) {

+						$term_icon_url = $term_icon["src"];

+					} else {

+						$term_icon_url = $default_icon_url;

+					}

+					$terms_icons[$term->term_id] = $term_icon_url;

+				}

+			}

+		}

+

+		update_option('gd_term_icons', $terms_icons);

+	}

 

-    if (is_ssl()) {

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

-    }

+	if ($term_id && isset($terms_icons[$term_id])) {

+		return $terms_icons[$term_id];

+	} elseif ($term_id && !isset($terms_icons[$term_id])) {

+		return get_option('geodir_default_marker_icon');

+	}

+

+	if (is_ssl()) {

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

+	}

 

-    return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

+	return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

 }
\ No newline at end of file

Spacing +128 added lines, -128 removed lines

@@ -60,16 +60,16 @@ 
                              * @since 1.0.0

                              * @param string $menu_class The menu HTML class.

                              */

-                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                             /**

                              * Filter the menu a class.

                              *

                              * @since 1.0.0

                              */

                             $a_class = apply_filters('geodir_menu_a_class', '');

-                            $items .= '<li class="' . $li_class . '">

-									<a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '">

-										' . __(ucfirst($args->labels->name),'geodirectory') . '

+                            $items .= '<li class="'.$li_class.'">

+									<a href="' . get_post_type_archive_link($post_type).'" class="'.$a_class.'">

+										' . __(ucfirst($args->labels->name), 'geodirectory').'

 									</a>

 								</li>';

                         }

@@ -88,14 +88,14 @@ 
              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings '.$menu_class);

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);

             /**

              * Filter the sub menu ul class.

              *

@@ -114,9 +114,9 @@ 
              * @since 1.0.0

              */

             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

-            $items .= '<li class="' . $li_class . '">

-					<a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>

-					<ul class="' . $sub_ul_class . '">';

+            $items .= '<li class="'.$li_class.'">

+					<a href="#" class="' . $a_class.'">'.__('Listing', 'geodirectory').'</a>

+					<ul class="' . $sub_ul_class.'">';

             $post_types = geodir_get_posttypes('object');

 

             $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

@@ -133,9 +133,9 @@ 
                                 if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

                                     $menu_class = 'current-menu-item';

 

-                                $items .= '<li class="' . $sub_li_class . '">

-														<a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '">

-															' . __(ucfirst($args->labels->name),'geodirectory') . '

+                                $items .= '<li class="'.$sub_li_class.'">

+														<a href="' . get_post_type_archive_link($post_type).'" class="'.$sub_a_class.'">

+															' . __(ucfirst($args->labels->name), 'geodirectory').'

 														</a>

 													</li>';

                             }

@@ -151,7 +151,7 @@ 
              *

              * @since 1.5.9

              */

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

+            $items .= apply_filters('geodir_menu_after_sub_ul', '');

             $items .= '</li>';

         }

     }

@@ -184,7 +184,7 @@ 
                                      * @since 1.0.0

                                      * @param string $menu_class The menu HTML class.

                                      */

-                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                                     /**

                                      * Filter the menu a class.

                                      *

@@ -192,9 +192,9 @@ 
                                      */

                                     $a_class = apply_filters('geodir_menu_a_class', '');

                                     $cpt_name = __($args->labels->singular_name, 'geodirectory');

-                                    $items .= '<li class="' . $li_class . '">

-											<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '">

-												' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

+                                    $items .= '<li class="'.$li_class.'">

+											<a href="' . geodir_get_addlisting_link($post_type).'" class="'.$a_class.'">

+												' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'

 											</a>

 										</li>';

                                 }

@@ -218,14 +218,14 @@ 
              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing '.$menu_class);

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);

             /**

              * Filter the sub menu ul class.

              *

@@ -244,9 +244,9 @@ 
              * @since 1.0.0

              */

             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

-            $items .= '<li  class="' . $li_class . '">

-					<a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>

-					<ul class="' . $sub_ul_class . '">';

+            $items .= '<li  class="'.$li_class.'">

+					<a href="#" class="' . $a_class.'">'.__('Add Listing', 'geodirectory').'</a>

+					<ul class="' . $sub_ul_class.'">';

 

             $post_types = geodir_get_posttypes('object');

 

@@ -269,11 +269,11 @@ 
                                          * @since 1.0.0

                                          * @param string $menu_class The menu HTML class.

                                          */

-                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                                         $cpt_name = __($args->labels->singular_name, 'geodirectory');

-                                        $items .= '<li class="' . $li_class . '">

-														<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '">

-															' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

+                                        $items .= '<li class="'.$li_class.'">

+														<a href="' . geodir_get_addlisting_link($post_type).'" class="'.$sub_a_class.'">

+															' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'

 														</a>

 													</li>';

                                     }

@@ -285,7 +285,7 @@ 
             }

 

             $items .= '	</ul> ';

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

+            $items .= apply_filters('geodir_menu_after_sub_ul', '');

             $items .= '</li>';

 

         }

@@ -313,14 +313,14 @@ 
     $geodir_theme_location = get_option('geodir_theme_location_nav');

     $geodir_theme_location_nav = array();

     if (empty($locations) && empty($geodir_theme_location)) {

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);

         $geodir_theme_location_nav[] = $args['theme_location'];

         update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

     }

     //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.

 //		$menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);

     else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);

 

     return $menu;

 

@@ -348,7 +348,7 @@ 
 

     if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

 

-        $items = $items . geodir_add_nav_menu_items();

+        $items = $items.geodir_add_nav_menu_items();

         return $items;

 

     } else {

@@ -373,12 +373,12 @@ 
 

     $taxonomies = geodir_get_taxonomies();

     $taxonomies = implode("','", $taxonomies);

-    $taxonomies = "'" . $taxonomies . "'";

+    $taxonomies = "'".$taxonomies."'";

 

     $pn_categories = $wpdb->get_results(

         $wpdb->prepare(

             "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

-            array($wpdb->terms . term_id)

+            array($wpdb->terms.term_id)

         )

     );

 

@@ -407,7 +407,7 @@ 
 

     if (geodir_is_page('add-listing') || geodir_is_page('preview')) {

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

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

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

         elseif (isset($_REQUEST['listing_type']))

             $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);

     }

@@ -425,7 +425,7 @@ 
     if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

         $geodir_post_type = '';

 

-    if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

+    if (defined('DOING_AJAX') && isset($_REQUEST['stype'])) {

         $geodir_post_type = sanitize_text_field($_REQUEST['stype']);

     }

 

@@ -435,7 +435,7 @@ 
      *

      * @since 1.6.9

      */

-    return apply_filters('geodir_get_current_posttype',$geodir_post_type);

+    return apply_filters('geodir_get_current_posttype', $geodir_post_type);

 }

 

 /**

@@ -449,18 +449,18 @@ 
  */

 function geodir_get_default_posttype()

 {

-    $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

+    $post_types = apply_filters('geodir_get_default_posttype', geodir_get_posttypes('object'));

 

     $stype = false;

-    foreach ( $post_types as $post_type => $info ) {

+    foreach ($post_types as $post_type => $info) {

         global $wpdb;

-        $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-        if ( $has_posts ) {

+        $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));

+        if ($has_posts) {

             $stype = $post_type; break;

         }

     }

 

-    if(!$stype){

+    if (!$stype) {

         $stype = 'gd_place';

     }

 

@@ -485,14 +485,14 @@ 
         switch ($output):

             case 'object':

             case 'Object':

-                $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types;

+                $post_types = json_decode(json_encode($post_types), FALSE); //(object)$post_types;

                 break;

             case 'array':

             case 'Array':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

                 break;

 			case 'options':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

 				

 				$options = array();

 				if (!empty($post_types)) {

@@ -610,15 +610,15 @@ 
 

         $categories = get_terms($taxonomies);

 

-        $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

+        $html .= '<option value="0">'.__('All', 'geodirectory').'</option>';

 

         foreach ($categories as $category_obj) {

             $select_opt = '';

             if ($selected == $category_obj->term_id) {

                 $select_opt = 'selected="selected"';

             }

-            $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

-                . ucfirst($category_obj->name) . '</option>';

+            $html .= '<option '.$select_opt.' value="'.$category_obj->term_id.'">'

+                . ucfirst($category_obj->name).'</option>';

         }

 

         if ($echo)

@@ -686,7 +686,7 @@ 
     } elseif (isset($wp_query->tax_query->queries)) {

         $tax_arr = $wp_query->tax_query->queries;

         //if tax query has 'relation' set then it will break wp_list_pluck so we remove it

-        if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}

+        if (isset($tax_arr['relation'])) {unset($tax_arr['relation']); }

         $taxonomies = wp_list_pluck($tax_arr, 'taxonomy');

     }

 

@@ -740,7 +740,7 @@ 
 

             if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

                 if ($cat_parent == 0) {

-                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

+                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-'.$cat_display;

                     $main_list_class = 'class="main_list_selecter"';

                 } else {

                     //$display = 'display:none';

@@ -750,7 +750,7 @@ 
 

             if ($cat_display == 'checkbox' || $cat_display == 'radio') {

                 $p = 0;

-                $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+                $out = '<div class="'.$list_class.' gd-cat-row-'.$cat_parent.'" style="margin-left:'.$p.'px;'.$display.';">';

             }

 

             foreach ($cat_terms as $cat_term) {

@@ -765,12 +765,12 @@ 
                 }

 

                 if ($cat_display == 'radio')

-                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

+                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category['.$cat_term->taxonomy.'][]" '.$main_list_class.' alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.ucfirst($cat_term->name).'</span>';

                 elseif ($cat_display == 'select' || $cat_display == 'multiselect')

-                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>';

+                    $out .= '<option '.$main_list_class.' style="margin-left:'.$p.'px;" alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' >'.$term_check.ucfirst($cat_term->name).'</option>';

 

                 else {

-                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

+                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category['.$cat_term->taxonomy.'][]" '.$main_list_class.' alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.ucfirst($cat_term->name).'</span>';

                 }

 

                 // Call recurson to print sub cats

@@ -809,7 +809,7 @@ 
             $cat_exclude = serialize($exclude_cats);

 

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

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

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

 

             if (!is_array($post->post_category[$cat_taxonomy]))

                 $post_category = $post->post_category[$cat_taxonomy];

@@ -841,7 +841,7 @@ 
 

             if (!empty($post_category)) {

                 $cat1 = array_filter(explode(',', $post_category));

-                $post_category = ',' . implode(',', $cat1) . ',';

+                $post_category = ','.implode(',', $cat1).',';

 

             }

 

@@ -852,7 +852,7 @@ 
                 foreach ($post_category_upd as $cat) {

 

                     if (!in_array($cat, $exclude_cats) && $cat != '') {

-                        $post_category_change .= ',' . $cat;

+                        $post_category_change .= ','.$cat;

                     }

                 }

                 $post_category = $post_category_change;

@@ -864,11 +864,11 @@ 
             }

         }

 

-        echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="cat_limit" value="'.$cat_limit.'" name="cat_limit['.$cat_taxonomy.']"  />';

 

-        echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="post_category" value="'.$post_category.'" name="post_category['.$cat_taxonomy.']"  />';

 

-        echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="post_category_str" value="'.$post_category_str.'" name="post_category_str['.$cat_taxonomy.']"  />';

 

 

         ?>

@@ -887,14 +887,14 @@ 
 

             function show_subcatlist(main_cat, catObj) {

                 if (main_cat != '') {

-					var url = '<?php echo geodir_get_ajax_url();?>';

-                    var cat_taxonomy = '<?php echo $cat_taxonomy;?>';

-                    var cat_exclude = '<?php echo base64_encode($cat_exclude);?>';

+					var url = '<?php echo geodir_get_ajax_url(); ?>';

+                    var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';

+                    var cat_exclude = '<?php echo base64_encode($cat_exclude); ?>';

                     var cat_limit = jQuery('#' + cat_taxonomy).find('#cat_limit').val();

-					<?php if ((int)$cat_limit > 0) { ?>

+					<?php if ((int) $cat_limit > 0) { ?>

 					var selected = parseInt(jQuery('#' + cat_taxonomy).find('.cat_sublist > div.post_catlist_item').length);

 					if (cat_limit != '' && selected > 0 && selected >= cat_limit && cat_limit != 0) {

-						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int)$cat_limit));?>");

+						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int) $cat_limit)); ?>");

 						return false;

 					}

 					<?php } ?>

@@ -933,7 +933,7 @@ 
             }

 

             function update_listing_cat(el) {

-                var cat_taxonomy = '<?php echo $cat_taxonomy;?>';

+                var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';

                 var cat_ids = '';

                 var main_cat = '';

                 var sub_cat = '';

@@ -1014,7 +1014,7 @@ 
         <div class="main_cat_list" style=" <?php if (isset($style)) {

             echo $style;

         }?> ">

-            <?php geodir_get_catlist($cat_taxonomy, 0);  // print main categories list

+            <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list

             ?>

         </div>

     <?php

@@ -1041,9 +1041,9 @@ 
     if ($exclude != '') {

         $exclude_cats = maybe_unserialize(base64_decode($exclude));

 

-        if(is_array( $exclude_cats)){

-            $exclude_cats = array_map( 'intval', $exclude_cats );

-        }else{

+        if (is_array($exclude_cats)) {

+            $exclude_cats = array_map('intval', $exclude_cats);

+        } else {

             $exclude_cats = intval($exclude_cats);

         }

 

@@ -1057,25 +1057,25 @@ 
         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>

 

         <div class="post_catlist_item" style="border:1px solid #CCCCCC; margin:5px auto; padding:5px;">

-            <img alt="move icon" src="<?php echo geodir_plugin_url() . '/geodirectory-assets/images/move.png';?>"

+            <img alt="move icon" src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png'; ?>"

                  onclick="jQuery(this).closest('div').remove();update_listing_cat(this);" align="right"/>

             <?php /* ?>

 		<img src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png';?>" onclick="jQuery(this).closest('div').remove();show_subcatlist();" align="right" /> 

 		<?php */ ?>

 

-            <input type="checkbox" value="<?php echo $main_cat->term_id;?>" class="listing_main_cat"

+            <input type="checkbox" value="<?php echo $main_cat->term_id; ?>" class="listing_main_cat"

                    onchange="if(jQuery(this).is(':checked')){jQuery(this).closest('div').find('.post_default_category').prop('checked',false).show();}else{jQuery(this).closest('div').find('.post_default_category').prop('checked',false).hide();};update_listing_cat()"

                    checked="checked" disabled="disabled"/>

        <span> 

-        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

+        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>

         </span>

             <br/>

 

             <div class="post_default_category">

-                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>"

-                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?>   />

+                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id; ?>"

+                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" '; ?>   />

         <span> 

-        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

+        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>

         </span>

             </div>

 

@@ -1108,7 +1108,7 @@ 
         $post_cat_str = $post_categories[$request_taxonomy];

         $post_cat_array = explode("#", $post_cat_str);

         if (is_array($post_cat_array)) {

-            $post_cat_array = array_unique( $post_cat_array );

+            $post_cat_array = array_unique($post_cat_array);

 

 			foreach ($post_cat_array as $post_cat_html) {

 

@@ -1123,7 +1123,7 @@ 
                 }

                 $post_sub_catid = '';

                 if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                    $post_sub_catid = (int)$post_cat_info[1];

+                    $post_sub_catid = (int) $post_cat_info[1];

                 }

 

                 geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1144,7 +1144,7 @@ 
             }

 

             if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                $post_sub_catid = (int)$post_cat_info[1];

+                $post_sub_catid = (int) $post_cat_info[1];

             }

 

             geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1176,9 +1176,9 @@ 
         if (!$selected)

             $option_slected = ' selected="selected" ';

 

-        echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';

+        echo '<select field_type="select" id="'.sanitize_text_field($cat_taxonomy).'" class="chosen_select" '.$onchange.' option-ajaxChosen="false" >';

 

-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

+        echo '<option value="" '.$option_selected.' >'.__('Select Category', 'geodirectory').'</option>';

 

         foreach ($cat_terms as $cat_term) {

             $option_selected = '';

@@ -1186,10 +1186,10 @@ 
                 $option_selected = ' selected="selected" ';

 

             // Count child terms

-            $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

-            $has_child = !empty( $child_terms ) ? 't' : 'f';

+            $child_terms = get_terms($cat_taxonomy, array('parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1));

+            $has_child = !empty($child_terms) ? 't' : 'f';

 

-            echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>';

+            echo '<option  '.$option_selected.' alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" _hc="'.$has_child.'" >'.ucfirst($cat_term->name).'</option>';

         }

         echo '</select>';

     }

@@ -1220,7 +1220,7 @@ 
             2 => __('Custom field updated.', 'geodirectory'),

             3 => __('Custom field deleted.', 'geodirectory'),

             4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),

-            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,

+            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int) $_GET['revision'], false)) : false,

             6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

             7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),

             8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

@@ -1246,7 +1246,7 @@ 
 

     global $wpdb;

 

-    $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';

+    $menu_icon = geodir_plugin_url().'/geodirectory-assets/images/favicon.ico';

 

     if (!$listing_slug = get_option('geodir_listing_prefix'))

         $listing_slug = 'places';

@@ -1259,11 +1259,11 @@ 
 

         $gd_placetags = array();

         $gd_placetags['object_type'] = 'gd_place';

-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';

+        $gd_placetags['listing_slug'] = $listing_slug.'/tags';

         $gd_placetags['args'] = array(

             'public' => true,

             'hierarchical' => false,

-            'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),

+            'rewrite' => array('slug' => $listing_slug.'/tags', 'with_front' => false, 'hierarchical' => true),

             'query_var' => true,

 

             'labels' => array(

@@ -1357,7 +1357,7 @@ 
             'menu_icon' => $menu_icon,

             'public' => true,

             'query_var' => true,

-            'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

+            'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

             'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),

             'taxonomies' => array('gd_placecategory', 'gd_place_tags'));

 

@@ -1390,12 +1390,12 @@ 
         return $_REQUEST['lang'];

     }

 

-    $url = str_replace(array("http://","https://"),"",$url);

+    $url = str_replace(array("http://", "https://"), "", $url);

 

     // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

-    $site_url = str_replace(array("http://","https://"),"",site_url());

+    $site_url = str_replace(array("http://", "https://"), "", site_url());

 

-    $url = str_replace($site_url,"",$url);

+    $url = str_replace($site_url, "", $url);

 

     $segments = explode('/', trim($url, '/'));

 

@@ -1461,9 +1461,9 @@ 
     if (in_array($post->post_type, geodir_get_posttypes())) {

 

         // if we dont have a GD post then try to grab it

-        if(!isset($post->default_category)){

+        if (!isset($post->default_category)) {

             $gd_post = geodir_get_post_info($post->ID);

-            if(!empty($gd_post)){

+            if (!empty($gd_post)) {

                 $post = $gd_post;

             }

         }

@@ -1473,17 +1473,17 @@ 
         $slug = $post_types[$post->post_type]['rewrite']['slug'];

 

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

-        if(function_exists('icl_object_id')){

-            if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

+        if (function_exists('icl_object_id')) {

+            if (gd_wpml_slug_translation_turned_on($post->post_type) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

 

                 $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

+                $slug = apply_filters('wpml_translate_single_string',

                     $slug,

                     'WordPress',

-                    'URL slug: ' . $slug,

+                    'URL slug: '.$slug,

                     $language_code);

 

-                if(!$slug){$slug = $org_slug;}

+                if (!$slug) {$slug = $org_slug; }

 

             }

         }

@@ -1505,11 +1505,11 @@ 
         }

 

         $post_link = trailingslashit(

-            preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

+            preg_replace("/".preg_quote($slug, "/")."/", $slug."/%gd_taxonomy%", $post_link, 1)

         );

 

         if ($fix_url) {

-            $post_link = $site_url . $post_link;

+            $post_link = $site_url.$post_link;

         }

 

         if (isset($comment_post_cache[$post->ID])) {

@@ -1528,12 +1528,12 @@ 
             $ID = $post->ID;

             $post2 = $wpdb->get_row(

                 $wpdb->prepare(

-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                    "SELECT * from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                     array($post->ID)

                 )

             );

 

-            $post = (object)array_merge((array)$post, (array)$post2);

+            $post = (object) array_merge((array) $post, (array) $post2);

 

             $comment_post_cache[$post->ID] = $post;

         }

@@ -1542,7 +1542,7 @@ 
 

         if (false !== strpos($post_link, '%gd_taxonomy%')) {

 

-            if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {

+            if (apply_filters("geodir_add_location_url_to_url", get_option('geodir_add_location_url'), $post->post_type, $post)) {

                 $location_request = '';

 

 

@@ -1556,7 +1556,7 @@ 
                         $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                         $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                        $post_location = (object)array('country_slug' => $post->country_slug,

+                        $post_location = (object) array('country_slug' => $post->country_slug,

                             'region_slug' => $post->region_slug,

                             'city_slug' => $post->city_slug

                         );

@@ -1569,7 +1569,7 @@ 
 

                     $post_location_sql = $wpdb->get_results(

                         $wpdb->prepare(

-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                            "SELECT post_locations from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                             array($post->ID)

                         )

                     );

@@ -1585,7 +1585,7 @@ 
                             $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                             $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                            $post_location = (object)array('country_slug' => $post->country_slug,

+                            $post_location = (object) array('country_slug' => $post->country_slug,

                                 'region_slug' => $post->region_slug,

                                 'city_slug' => $post->city_slug

                             );

@@ -1614,7 +1614,7 @@ 
 					}

 					$location_slug[] = $city_slug;

 					

-					$location_request .= implode('/', $location_slug) . '/';

+					$location_request .= implode('/', $location_slug).'/';

                 }

             }

 

@@ -1630,9 +1630,9 @@ 
                 } else {

                     $post_terms = '';

 

-                    if(isset($_POST['post_default_category']) && $_POST['post_default_category']){

+                    if (isset($_POST['post_default_category']) && $_POST['post_default_category']) {

                         $post_terms = absint($_POST['post_default_category']);

-                    }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]){

+                    }elseif (isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {

                         $post_terms = explode(",", trim($_POST['post_category'][$taxonomies], ","));

                         $post_terms = absint($post_terms[0]);

                     }elseif (isset($post->{$taxonomies})) {

@@ -1678,14 +1678,14 @@ 
             $request_term = trim($request_term, '/');

             

             // Fix with WPML the location terms added twice when CPT slug is translated.

-            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {

+            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/'.$request_term.$detailurl_separator) !== false) {

                 $post_link = str_replace('%gd_taxonomy%/', '', $post_link);

             }

             

             if (!empty($request_term))

-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+                $post_link = str_replace('%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);

             else

-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+                $post_link = str_replace('/%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);

             //echo $post_link ;

         }

         // temp cache the permalink

@@ -1760,9 +1760,9 @@ 
                 $url_separator = '';

 

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

-                    $old_listing_slug = '/' . $listing_slug . '/';

+                    $old_listing_slug = '/'.$listing_slug.'/';

                     $request_term = implode("/", $location_terms);

-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

+                    $new_listing_slug = '/'.$listing_slug.'/'.$request_term.'/';

 

                     $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

                 } else {

@@ -1782,25 +1782,25 @@ 
         // Alter the CPT slug if WPML is set to do so

         if (function_exists('icl_object_id')) {

             $post_types = get_option('geodir_post_types');

-            $post_type = str_replace("category","",$taxonomy);

-            $post_type = str_replace("_tags","",$post_type);

+            $post_type = str_replace("category", "", $taxonomy);

+            $post_type = str_replace("_tags", "", $post_type);

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

             if (gd_wpml_slug_translation_turned_on($post_type)) {

                 global $sitepress;

                 $default_lang = $sitepress->get_default_language();

                 $language_code = gd_wpml_get_lang_from_url($termlink);

-                if (!$language_code ) {

-                    $language_code  = $default_lang;

+                if (!$language_code) {

+                    $language_code = $default_lang;

                 }

 

                 $org_slug = $slug;

-                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);

+                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: '.$slug, $language_code);

 

                 if (!$slug) {

                     $slug = $org_slug;

                 }

 

-                $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug  ,$termlink, 1));

+                $termlink = trailingslashit(preg_replace("/".preg_quote($org_slug, "/")."/", $slug, $termlink, 1));

             }

         }

     }

@@ -1830,7 +1830,7 @@ 
 	

 	if (in_array($post_type, geodir_get_posttypes())) {

 		if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {

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

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

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

@@ -1847,7 +1847,7 @@ 
 					$location_terms = implode("/", $location_terms);

 					$location_terms = rtrim($location_terms, '/');

 					

-					$link .= urldecode($location_terms) . '/';

+					$link .= urldecode($location_terms).'/';

 				} else {

 					$link = geodir_getlink($link, $location_terms);

 				}

@@ -1935,9 +1935,9 @@ 
             return 0;

         $where = 't.term_id = %d';

         if (!empty($taxonomy))

-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

+            return $wpdb->get_row($wpdb->prepare($tax_select.$where." AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

         else

-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));

+            return $wpdb->get_var($wpdb->prepare($select.$where, $term));

     }

 

     $term = trim(wp_unslash($term));

@@ -1949,7 +1949,7 @@ 
 

     $where_fields = array($slug);

     if (!empty($taxonomy)) {

-        $parent = (int)$parent;

+        $parent = (int) $parent;

         if ($parent > 0) {

             $where_fields[] = $parent;

             $else_where_fields[] = $parent;

@@ -2013,13 +2013,13 @@ 
         $post_types = geodir_get_posttypes();

         $tax_arr = array();

         foreach ($post_types as $post_type) {

-            $tax_arr[] = "'" . $post_type . "category'";

+            $tax_arr[] = "'".$post_type."category'";

         }

         $tax_c = implode(',', $tax_arr);

         $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

         //$terms = get_terms( $taxonomy );

 

-        if($terms) {

+        if ($terms) {

             foreach ($terms as $term) {

                 $post_type = str_replace("category", "", $term->taxonomy);

                 $a_terms[$post_type][] = $term;

@@ -2027,7 +2027,7 @@ 
             }

         }

 

-        if($a_terms) {

+        if ($a_terms) {

             foreach ($a_terms as $pt => $t2) {

 

                 foreach ($t2 as $term) {

@@ -2052,7 +2052,7 @@ 
     }

 

     if (is_ssl()) {

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

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

     }

 

     return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

geodirectory-functions/comments_functions.php

Indentation +453 added lines, -453 removed lines

@@ -31,13 +31,13 @@ 
  */

 function geodir_comment_meta_row_action($a)

 {

-    global $comment;

+	global $comment;

 

-    $rating = geodir_get_commentoverall($comment->comment_ID);

-    if ($rating != 0) {

-        echo geodir_get_rating_stars($rating, $comment->comment_ID);

-    }

-    return $a;

+	$rating = geodir_get_commentoverall($comment->comment_ID);

+	if ($rating != 0) {

+		echo geodir_get_rating_stars($rating, $comment->comment_ID);

+	}

+	return $a;

 }

 

 add_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');

@@ -52,7 +52,7 @@ 
  */

 function geodir_comment_add_meta_box($comment)

 {

-    add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');

+	add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');

 }

 

 /**

@@ -66,7 +66,7 @@ 
  * @param object $comment The comment object.

  */

 function geodir_comment_rating_meta($comment) {

-    $post_type = get_post_type($comment->comment_post_ID);

+	$post_type = get_post_type($comment->comment_post_ID);

 	if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {

 		$rating = geodir_get_commentoverall($comment->comment_ID);

 		

@@ -106,24 +106,24 @@ 
  * @global object $post The post object.

  */

 function geodir_comment_rating_fields() {

-    global $post;

+	global $post;

 

-    $post_types = geodir_get_posttypes();

+	$post_types = geodir_get_posttypes();

 

-    if (!empty($post->post_type) && in_array($post->post_type, $post_types) && !(!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type))) {

-        $star_texts = array();

-        $star_texts[] = __('Terrible', 'geodirectory');

-        $star_texts[] = __('Poor', 'geodirectory');

-        $star_texts[] = __('Average', 'geodirectory');

-        $star_texts[] = __('Very Good', 'geodirectory');

-        $star_texts[] = __('Excellent', 'geodirectory');

+	if (!empty($post->post_type) && in_array($post->post_type, $post_types) && !(!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type))) {

+		$star_texts = array();

+		$star_texts[] = __('Terrible', 'geodirectory');

+		$star_texts[] = __('Poor', 'geodirectory');

+		$star_texts[] = __('Average', 'geodirectory');

+		$star_texts[] = __('Very Good', 'geodirectory');

+		$star_texts[] = __('Excellent', 'geodirectory');

         

-        $gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts);

-        echo $gd_rating_html;

-        ?>

+		$gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts);

+		echo $gd_rating_html;

+		?>

         <input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="0"/>

         <?php

-    }

+	}

 }

 

 add_filter('comment_reply_link', 'geodir_comment_replaylink');

@@ -139,12 +139,12 @@ 
 function geodir_comment_replaylink($link)

 {

 

-    if (strpos($link, 'wp-login.php?') !== false) {

-        $link = str_replace(wp_login_url(),geodir_login_url(),$link);

-    }

-    $link = '<div class="gd_comment_replaylink">' . $link . '</div>';

+	if (strpos($link, 'wp-login.php?') !== false) {

+		$link = str_replace(wp_login_url(),geodir_login_url(),$link);

+	}

+	$link = '<div class="gd_comment_replaylink">' . $link . '</div>';

 

-    return $link;

+	return $link;

 }

 

 add_filter('cancel_comment_reply_link', 'geodir_cancle_replaylink');

@@ -159,9 +159,9 @@ 
 function geodir_cancle_replaylink($link)

 {

 

-    $link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

+	$link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

 

-    return $link;

+	return $link;

 }

 

 add_action('comment_post', 'geodir_save_rating');

@@ -177,32 +177,32 @@ 
  */

 function geodir_save_rating($comment = 0)

 {

-    global $wpdb, $user_ID, $plugin_prefix;

+	global $wpdb, $user_ID, $plugin_prefix;

 

-    $comment_info = get_comment($comment);

+	$comment_info = get_comment($comment);

 

-    $post_id = $comment_info->comment_post_ID;

-    $status = $comment_info->comment_approved;

-    $rating_ip = getenv("REMOTE_ADDR");

+	$post_id = $comment_info->comment_post_ID;

+	$status = $comment_info->comment_approved;

+	$rating_ip = getenv("REMOTE_ADDR");

 	

-    $post = geodir_get_post_info($post_id);

-    if (empty($post)) {

-        return;

-    }

-

-    if ($post->post_status == 'publish') {

-        $post_status = '1';

-    } else {

-        $post_status = '0';

-    }

+	$post = geodir_get_post_info($post_id);

+	if (empty($post)) {

+		return;

+	}

+

+	if ($post->post_status == 'publish') {

+		$post_status = '1';

+	} else {

+		$post_status = '0';

+	}

 	

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

-        $overall_rating = $_REQUEST['geodir_overallrating'];

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

+		$overall_rating = $_REQUEST['geodir_overallrating'];

         

 		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

-            $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

+			$overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

+			$sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

 					post_id		= %d,

 					post_type = %s,

 					post_title	= %s,

@@ -220,35 +220,35 @@ 
 					post_latitude	= %s,

 					comment_content	= %s 

 					",

-                array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)

-            );

-

-            $wpdb->query($sqlqry);

-

-            /**

-             * Called after saving the comment.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param array $_REQUEST {

-             *    Attributes of the $_REQUEST variable.

-             *

-             *    @type string $geodir_overallrating Overall rating.

-             *    @type string $comment Comment text.

-             *    @type string $submit Submit button text.

-             *    @type string $comment_post_ID Comment post ID.

-             *    @type string $comment_parent Comment Parent ID.

-             *    @type string $_wp_unfiltered_html_comment Unfiltered html comment string.

-             *

-             * }

-             */

-            do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');

-

-            if ($status) {

-                geodir_update_postrating($post_id);

-            }

-        }

-    }

+				array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)

+			);

+

+			$wpdb->query($sqlqry);

+

+			/**

+			 * Called after saving the comment.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param array $_REQUEST {

+			 *    Attributes of the $_REQUEST variable.

+			 *

+			 *    @type string $geodir_overallrating Overall rating.

+			 *    @type string $comment Comment text.

+			 *    @type string $submit Submit button text.

+			 *    @type string $comment_post_ID Comment post ID.

+			 *    @type string $comment_parent Comment Parent ID.

+			 *    @type string $_wp_unfiltered_html_comment Unfiltered html comment string.

+			 *

+			 * }

+			 */

+			do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');

+

+			if ($status) {

+				geodir_update_postrating($post_id);

+			}

+		}

+	}

 }

 

 

@@ -266,51 +266,51 @@ 
  */

 function geodir_update_rating_status_change($comment_id, $status)

 {

-    if ($status == 'delete') {

-        return;

-    }

-    global $wpdb, $plugin_prefix, $user_ID;

+	if ($status == 'delete') {

+		return;

+	}

+	global $wpdb, $plugin_prefix, $user_ID;

 

-    $comment_info = get_comment($comment_id);

+	$comment_info = get_comment($comment_id);

 

-    $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';

+	$post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';

 

-    if (!empty($comment_info))

-        $status = $comment_info->comment_approved;

+	if (!empty($comment_info))

+		$status = $comment_info->comment_approved;

 

-    if ($status == 'approve' || $status == 1) {

-        $status = 1;

-    } else {

-        $status = 0;

-    }

+	if ($status == 'approve' || $status == 1) {

+		$status = 1;

+	} else {

+		$status = 0;

+	}

 

-    $comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : '';

-    $old_rating = geodir_get_commentoverall($comment_info_ID);

+	$comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : '';

+	$old_rating = geodir_get_commentoverall($comment_info_ID);

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

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

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

 

-    if ($comment_id) {

+	if ($comment_id) {

 

-        $overall_rating = $old_rating;

+		$overall_rating = $old_rating;

 

-        if (isset($old_rating)) {

+		if (isset($old_rating)) {

 

-            $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+			$sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content = %s 

 						WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id));

 

-            $wpdb->query($sqlqry);

+			$wpdb->query($sqlqry);

 

-            //update rating

-            geodir_update_postrating($post_id, $post_type);

+			//update rating

+			geodir_update_postrating($post_id, $post_type);

 

-        }

+		}

 

-    }

+	}

 

 }

 

@@ -329,41 +329,41 @@ 
 function geodir_update_rating($comment_id = 0)

 {

 

-    global $wpdb, $plugin_prefix, $user_ID;

+	global $wpdb, $plugin_prefix, $user_ID;

 

-    $comment_info = get_comment($comment_id);

+	$comment_info = get_comment($comment_id);

 

-    $post_id = $comment_info->comment_post_ID;

-    $status = $comment_info->comment_approved;

-    $old_rating = geodir_get_commentoverall($comment_info->comment_ID);

+	$post_id = $comment_info->comment_post_ID;

+	$status = $comment_info->comment_approved;

+	$old_rating = geodir_get_commentoverall($comment_info->comment_ID);

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

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

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

 

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

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

 

-        $overall_rating = $_REQUEST['geodir_overallrating'];

+		$overall_rating = $_REQUEST['geodir_overallrating'];

 

-        if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

-            $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

+		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+			$overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            if (isset($old_rating)) {

+			if (isset($old_rating)) {

 

-                $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+				$sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content	= %s 

 						WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id));

 

-                $wpdb->query($sqlqry);

+				$wpdb->query($sqlqry);

 

-                //update rating

-                geodir_update_postrating($post_id, $post_type);

+				//update rating

+				geodir_update_postrating($post_id, $post_type);

 

-            }

-        }

-    }

+			}

+		}

+	}

 

 

 }

@@ -379,19 +379,19 @@ 
  */

 function geodir_comment_delete_comment($comment_id)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $review_info = geodir_get_review($comment_id);

-    if ($review_info) {

-        geodir_update_postrating($review_info->post_id);

-    }

+	$review_info = geodir_get_review($comment_id);

+	if ($review_info) {

+		geodir_update_postrating($review_info->post_id);

+	}

 

-    $wpdb->query(

-        $wpdb->prepare(

-            "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

-            array($comment_id)

-        )

-    );

+	$wpdb->query(

+		$wpdb->prepare(

+			"DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

+			array($comment_id)

+		)

+	);

 

 }

 

@@ -407,21 +407,21 @@ 
  * @return string The comment content.

  */

 function geodir_wrap_comment_text($content, $comment = '') {

-    if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {

-        if (!is_admin()) {

-            return '<div class="description">' . $content . '</div>';

-        } else {

-            return $content;

-        }

-    } else {

-        $rating = 0;

-        if (!empty($comment))

-            $rating = geodir_get_commentoverall($comment->comment_ID);

-        if ($rating != 0 && !is_admin()) {

-            return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

-        } else

-            return $content;

-    }

+	if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {

+		if (!is_admin()) {

+			return '<div class="description">' . $content . '</div>';

+		} else {

+			return $content;

+		}

+	} else {

+		$rating = 0;

+		if (!empty($comment))

+			$rating = geodir_get_commentoverall($comment->comment_ID);

+		if ($rating != 0 && !is_admin()) {

+			return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

+		} else

+			return $content;

+	}

 }

 

 

@@ -438,41 +438,41 @@ 
  */

 function geodir_update_postrating($post_id = 0, $post_type = '', $delete = false)

 {

-    global $wpdb, $plugin_prefix, $comment;

-    if (!$post_type) {

-        $post_type = get_post_type($post_id);

-    }

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

-    $post_newrating = geodir_get_post_rating($post_id, 1);

-    $post_newrating_count = geodir_get_review_count_total($post_id);

+	global $wpdb, $plugin_prefix, $comment;

+	if (!$post_type) {

+		$post_type = get_post_type($post_id);

+	}

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

+	$post_newrating = geodir_get_post_rating($post_id, 1);

+	$post_newrating_count = geodir_get_review_count_total($post_id);

 

 

-    //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

+	//$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+	if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

 

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $detail_table . " SET

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $detail_table . " SET

 						overall_rating = %f,

 						rating_count = %f

 						where post_id = %d",

-                array($post_newrating, $post_newrating_count, $post_id)

-            )

-        );

-

-        update_post_meta($post_id, 'overall_rating', $post_newrating);

-        update_post_meta($post_id, 'rating_count', $post_newrating_count);

-    }

-    /**

-     * Called after Updating post overall rating and rating count.

-     *

-     * @since 1.0.0

-     * @since 1.4.3 Added `$post_id` param.

-     * @package GeoDirectory

-     * @param int $post_id The post ID.

-     */

-    do_action('geodir_update_postrating',$post_id);

+				array($post_newrating, $post_newrating_count, $post_id)

+			)

+		);

+

+		update_post_meta($post_id, 'overall_rating', $post_newrating);

+		update_post_meta($post_id, 'rating_count', $post_newrating_count);

+	}

+	/**

+	 * Called after Updating post overall rating and rating count.

+	 *

+	 * @since 1.0.0

+	 * @since 1.4.3 Added `$post_id` param.

+	 * @package GeoDirectory

+	 * @param int $post_id The post ID.

+	 */

+	do_action('geodir_update_postrating',$post_id);

 

 }

 

@@ -490,29 +490,29 @@ 
  */

 function geodir_get_postoverall($post_id = 0)

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_type = get_post_type($post_id);

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

+	$post_type = get_post_type($post_id);

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

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+	if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

 

-        $post_ratings = $wpdb->get_var(

-            $wpdb->prepare(

-                "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

-                array($post_id)

-            )

-        );

+		$post_ratings = $wpdb->get_var(

+			$wpdb->prepare(

+				"SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

+				array($post_id)

+			)

+		);

 

 

-    } else {

-        $post_ratings = get_post_meta($post_id, 'overall_rating');

-    }

+	} else {

+		$post_ratings = get_post_meta($post_id, 'overall_rating');

+	}

 

-    if ($post_ratings)

-        return $post_ratings;

-    else

-        return false;

+	if ($post_ratings)

+		return $post_ratings;

+	else

+		return false;

 }

 

 

@@ -529,19 +529,19 @@ 
  */

 function geodir_get_review($comment_id = 0)

 {

-    global $wpdb;

-

-    $reatings = $wpdb->get_row(

-        $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

-            array($comment_id)

-        )

-    );

-

-    if (!empty($reatings))

-        return $reatings;

-    else

-        return false;

+	global $wpdb;

+

+	$reatings = $wpdb->get_row(

+		$wpdb->prepare(

+			"SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+			array($comment_id)

+		)

+	);

+

+	if (!empty($reatings))

+		return $reatings;

+	else

+		return false;

 }

 

 /**

@@ -557,19 +557,19 @@ 
  */

 function geodir_get_review_total($post_id = 0)

 {

-    global $wpdb;

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -585,18 +585,18 @@ 
  */

 function geodir_get_review_count_by_user_id($user_id = 0)

 {

-    global $wpdb;

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

-            array($user_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

+			array($user_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -614,27 +614,27 @@ 
  */

 function geodir_get_post_rating($post_id = 0, $force_query = 0)

 {

-    global $wpdb, $post;

-

-    if (isset($post->ID) && $post->ID == $post_id && !$force_query) {

-        if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {

-            return $post->overall_rating;

-        } else {

-            return 0;

-        }

-    }

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb, $post;

+

+	if (isset($post->ID) && $post->ID == $post_id && !$force_query) {

+		if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {

+			return $post->overall_rating;

+		} else {

+			return 0;

+		}

+	}

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -650,19 +650,19 @@ 
  */

 function geodir_get_review_count_total($post_id = 0)

 {

-    global $wpdb;

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -679,20 +679,20 @@ 
  */

 function geodir_get_comments_number($post_id = 0)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

 

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -708,19 +708,19 @@ 
  */

 function geodir_get_commentoverall($comment_id = 0)

 {

-    global $wpdb;

-

-    $reatings = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

-            array($comment_id)

-        )

-    );

-

-    if ($reatings)

-        return $reatings;

-    else

-        return false;

+	global $wpdb;

+

+	$reatings = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+			array($comment_id)

+		)

+	);

+

+	if ($reatings)

+		return $reatings;

+	else

+		return false;

 }

 

 /**

@@ -734,7 +734,7 @@ 
  */

 function geodir_get_commentoverall_number($post_id = 0)

 {

-    return geodir_get_post_rating($post_id);

+	return geodir_get_post_rating($post_id);

 }

 

 

@@ -752,102 +752,102 @@ 
  */

 function geodir_comment_template($comment_template)

 {

-    global $post;

+	global $post;

 

-    $post_types = geodir_get_posttypes();

+	$post_types = geodir_get_posttypes();

 

-    if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {

-        return;

-    }

-    if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business

-        if (geodir_cpt_has_rating_disabled($post->post_type)) {

-            return $comment_template;

-        }

+	if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {

+		return;

+	}

+	if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business

+		if (geodir_cpt_has_rating_disabled($post->post_type)) {

+			return $comment_template;

+		}

         

-        $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

-        if (!$template) {

-            $template = dirname(__FILE__) . '/reviews.php';

-        }

-        return $template;

-    }

+		$template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

+		if (!$template) {

+			$template = dirname(__FILE__) . '/reviews.php';

+		}

+		return $template;

+	}

 }

 

 add_filter("comments_template", "geodir_comment_template");

 

 

 if (!function_exists('geodir_comment')) {

-    /**

-     * Comment HTML markup.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

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

-     * @param object $comment The comment object.

-     * @param string|array $args {

-     *     Optional. Formatting options.

-     *

-     *     @type object $walker            Instance of a Walker class to list comments. Default null.

-     *     @type int    $max_depth         The maximum comments depth. Default empty.

-     *     @type string $style             The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'.

-     *     @type string $callback          Callback function to use. Default null.

-     *     @type string $end-callback      Callback function to use at the end. Default null.

-     *     @type string $type              Type of comments to list.

-     *                                     Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'.

-     *     @type int    $page              Page ID to list comments for. Default empty.

-     *     @type int    $per_page          Number of comments to list per page. Default empty.

-     *     @type int    $avatar_size       Height and width dimensions of the avatar size. Default 32.

-     *     @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'.

-     *     @type bool   $reverse_children  Whether to reverse child comments in the list. Default null.

-     *     @type string $format            How to format the comments list.

-     *                                     Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.

-     *     @type bool   $short_ping        Whether to output short pings. Default false.

-     *     @type bool   $echo              Whether to echo the output or return it. Default true.

-     * }

-     * @param int $depth Depth of comment.

-     */

-    function geodir_comment($comment, $args, $depth)

-    {

-        $GLOBALS['comment'] = $comment;

-        switch ($comment->comment_type) :

-            case 'pingback' :

-            case 'trackback' :

-                // Display trackbacks differently than normal comments.

-                ?>

+	/**

+	 * Comment HTML markup.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

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

+	 * @param object $comment The comment object.

+	 * @param string|array $args {

+	 *     Optional. Formatting options.

+	 *

+	 *     @type object $walker            Instance of a Walker class to list comments. Default null.

+	 *     @type int    $max_depth         The maximum comments depth. Default empty.

+	 *     @type string $style             The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'.

+	 *     @type string $callback          Callback function to use. Default null.

+	 *     @type string $end-callback      Callback function to use at the end. Default null.

+	 *     @type string $type              Type of comments to list.

+	 *                                     Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'.

+	 *     @type int    $page              Page ID to list comments for. Default empty.

+	 *     @type int    $per_page          Number of comments to list per page. Default empty.

+	 *     @type int    $avatar_size       Height and width dimensions of the avatar size. Default 32.

+	 *     @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'.

+	 *     @type bool   $reverse_children  Whether to reverse child comments in the list. Default null.

+	 *     @type string $format            How to format the comments list.

+	 *                                     Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.

+	 *     @type bool   $short_ping        Whether to output short pings. Default false.

+	 *     @type bool   $echo              Whether to echo the output or return it. Default true.

+	 * }

+	 * @param int $depth Depth of comment.

+	 */

+	function geodir_comment($comment, $args, $depth)

+	{

+		$GLOBALS['comment'] = $comment;

+		switch ($comment->comment_type) :

+			case 'pingback' :

+			case 'trackback' :

+				// Display trackbacks differently than normal comments.

+				?>

                 <li <?php comment_class('geodir-comment'); ?> id="comment-<?php comment_ID(); ?>">

                 <p><?php _e('Pingback:', 'geodirectory'); ?> <?php comment_author_link(); ?> <?php edit_comment_link(__('(Edit)', 'geodirectory'), '<span class="edit-link">', '</span>'); ?></p>

                 <?php

-                break;

-            default :

-                // Proceed with normal comments.

-                global $post;

-                ?>

+				break;

+			default :

+				// Proceed with normal comments.

+				global $post;

+				?>

             <li <?php comment_class('geodir-comment'); ?> id="li-comment-<?php comment_ID(); ?>">

                 <article id="comment-<?php comment_ID(); ?>" class="comment">

                     <header class="comment-meta comment-author vcard">

                         <?php

-                        /**

-                         * Filter to modify comment avatar size

-                         *

-                         * You can use this filter to change comment avatar size.

-                         *

-                         * @since 1.0.0

-                         * @package GeoDirectory

-                         */

-                        $avatar_size = apply_filters('geodir_comment_avatar_size', 44);

-                        echo get_avatar($comment, $avatar_size);

-                        printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

-                            get_comment_author_link(),

-                            // If current post author is also comment author, make it known visually.

-                            ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

-                        );

-                        echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

-                        printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

-                            esc_url(get_comment_link($comment->comment_ID)),

-                            get_comment_time('c'),

-                            /* translators: 1: date, 2: time */

-                            sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())

-                        );

-                        ?>

+						/**

+						 * Filter to modify comment avatar size

+						 *

+						 * You can use this filter to change comment avatar size.

+						 *

+						 * @since 1.0.0

+						 * @package GeoDirectory

+						 */

+						$avatar_size = apply_filters('geodir_comment_avatar_size', 44);

+						echo get_avatar($comment, $avatar_size);

+						printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

+							get_comment_author_link(),

+							// If current post author is also comment author, make it known visually.

+							($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

+						);

+						echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

+						printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

+							esc_url(get_comment_link($comment->comment_ID)),

+							get_comment_time('c'),

+							/* translators: 1: date, 2: time */

+							sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())

+						);

+						?>

                     </header>

                     <!-- .comment-meta -->

 

@@ -871,47 +871,47 @@ 
                 </article>

                 <!-- #comment-## -->

                 <?php

-                break;

-        endswitch; // end comment_type check

-    }

+				break;

+		endswitch; // end comment_type check

+	}

 }

 

 

 add_filter('get_comments_number', 'geodir_fix_comment_count', 10, 2);

 if (!function_exists('geodir_fix_comment_count')) {

-    /**

-     * Fix comment count by not listing replies as reviews

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

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

-     * @param int $count The comment count.

-     * @param int $post_id The post ID.

-     * @todo $post is unreachable since the function return the count before that variable.

-     * @return bool|null|string The comment count.

-     */

-    function geodir_fix_comment_count($count, $post_id)

-    {

-        if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {

-            global $post;

-            $post_types = geodir_get_posttypes();

-

-            if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {

-                $review_count = geodir_get_review_count_total($post_id);

-                return $review_count;

-

-                if ($post && isset($post->rating_count)) {

-                    return $post->rating_count;

-                } else {

-                    return geodir_get_comments_number($post_id);

-                }

-            } else {

-                return $count;

-            }

-        } else {

-            return $count;

-        }

-    }

+	/**

+	 * Fix comment count by not listing replies as reviews

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

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

+	 * @param int $count The comment count.

+	 * @param int $post_id The post ID.

+	 * @todo $post is unreachable since the function return the count before that variable.

+	 * @return bool|null|string The comment count.

+	 */

+	function geodir_fix_comment_count($count, $post_id)

+	{

+		if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {

+			global $post;

+			$post_types = geodir_get_posttypes();

+

+			if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {

+				$review_count = geodir_get_review_count_total($post_id);

+				return $review_count;

+

+				if ($post && isset($post->rating_count)) {

+					return $post->rating_count;

+				} else {

+					return geodir_get_comments_number($post_id);

+				}

+			} else {

+				return $count;

+			}

+		} else {

+			return $count;

+		}

+	}

 }

 

 /**

@@ -929,14 +929,14 @@ 
  */

 function geodir_get_rating_stars($rating, $post_id, $small = false)

 {

-    if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {

-        return NULL;

-    }

-    $a_rating = $rating / 5 * 100;

-

-    if ($small) {

-        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

-    } else {

+	if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {

+		return NULL;

+	}

+	$a_rating = $rating / 5 * 100;

+

+	if ($small) {

+		$r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

+	} else {

 		if (function_exists('geodir_reviewrating_draw_overall_rating')) {

 			// Show rating stars from review rating manager

 			$r_html = geodir_reviewrating_draw_overall_rating($rating);

@@ -953,8 +953,8 @@ 
 			}

 			$r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>';

 		}

-    }

-    return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

+	}

+	return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

 }

 

 /**

@@ -968,23 +968,23 @@ 
 function geodir_is_reviews_show($pageview = '')

 {

 

-    $active_tabs = get_option('geodir_detail_page_tabs_excluded');

-

-    $is_display = true;

-    if (!empty($active_tabs) && in_array('reviews', $active_tabs))

-        $is_display = false;

-

-    /**

-     * Filter to change display value.

-     *

-     * You can use this filter to change the is_display value.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param bool $is_display Display ratings when set to true.

-     * @param string $pageview The view template. Ex: listview, gridview etc.

-     */

-    return apply_filters('geodir_is_reviews_show', $is_display, $pageview);

+	$active_tabs = get_option('geodir_detail_page_tabs_excluded');

+

+	$is_display = true;

+	if (!empty($active_tabs) && in_array('reviews', $active_tabs))

+		$is_display = false;

+

+	/**

+	 * Filter to change display value.

+	 *

+	 * You can use this filter to change the is_display value.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param bool $is_display Display ratings when set to true.

+	 * @param string $pageview The view template. Ex: listview, gridview etc.

+	 */

+	return apply_filters('geodir_is_reviews_show', $is_display, $pageview);

 }

 

 

@@ -992,9 +992,9 @@ 
  * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types

  */

 if(function_exists('dsq_can_replace')) {

-    remove_filter('comments_template', 'dsq_comments_template');

-    add_filter('comments_template', 'dsq_comments_template', 100);

-    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

+	remove_filter('comments_template', 'dsq_comments_template');

+	add_filter('comments_template', 'dsq_comments_template', 100);

+	add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

 }

 

 

@@ -1008,14 +1008,14 @@ 
  * @return string `1` if active `0` if disabled.

  */

 function geodir_option_disqus_active($disqus_active){

-    global $post;

-    $all_postypes = geodir_get_posttypes();

+	global $post;

+	$all_postypes = geodir_get_posttypes();

 

-    if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

-        $disqus_active = '0';

-    }

+	if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

+		$disqus_active = '0';

+	}

 

-    return $disqus_active;

+	return $disqus_active;

 }

 

 /**

@@ -1029,22 +1029,22 @@ 
  * @return array Modified tabs array.

  */

 function geodir_detail_reviews_tab_title($tabs_arr) {

-    $post_type = geodir_get_current_posttype();

+	$post_type = geodir_get_current_posttype();

 

-    if (!empty($tabs_arr) && !empty($tabs_arr['reviews']) && isset($tabs_arr['reviews']['heading_text']) && $post_type != '' && geodir_cpt_has_rating_disabled($post_type)) {

-        $label_reviews = __('Comments', 'geodirectory');

+	if (!empty($tabs_arr) && !empty($tabs_arr['reviews']) && isset($tabs_arr['reviews']['heading_text']) && $post_type != '' && geodir_cpt_has_rating_disabled($post_type)) {

+		$label_reviews = __('Comments', 'geodirectory');

         

-        if (defined('GEODIR_CP_VERSION')) {

-            $post_types = geodir_get_posttypes('array');

+		if (defined('GEODIR_CP_VERSION')) {

+			$post_types = geodir_get_posttypes('array');

             

-            if (!empty($post_types[$post_type]['labels']['label_reviews'])) {

-                $label_reviews = stripslashes(__($post_types[$post_type]['labels']['label_reviews'], 'geodirectory'));

-            }

-        }

+			if (!empty($post_types[$post_type]['labels']['label_reviews'])) {

+				$label_reviews = stripslashes(__($post_types[$post_type]['labels']['label_reviews'], 'geodirectory'));

+			}

+		}

         

-        $tabs_arr['reviews']['heading_text'] = $label_reviews;

-    }

+		$tabs_arr['reviews']['heading_text'] = $label_reviews;

+	}

     

-    return $tabs_arr;

+	return $tabs_arr;

 }

 add_filter('geodir_detail_page_tab_list_extend', 'geodir_detail_reviews_tab_title', 1000, 1);
\ No newline at end of file

Spacing +44 added lines, -44 removed lines

@@ -67,10 +67,10 @@ 
  */

 function geodir_comment_rating_meta($comment) {

     $post_type = get_post_type($comment->comment_post_ID);

-	if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {

+	if (in_array($post_type, (array) geodir_get_posttypes()) && (int) $comment->comment_parent == 0 && !(!empty($post_type) && geodir_cpt_has_rating_disabled($post_type))) {

 		$rating = geodir_get_commentoverall($comment->comment_ID);

 		

-		if ((int)get_option('geodir_reviewrating_enable_font_awesome') == 1) {

+		if ((int) get_option('geodir_reviewrating_enable_font_awesome') == 1) {

 			$star_texts = array();

 			$star_texts[] = __('Terrible', 'geodirectory');

 			$star_texts[] = __('Poor', 'geodirectory');

@@ -81,13 +81,13 @@ 
 			echo geodir_font_awesome_rating_form_html('', $star_texts, $rating);

 		} else {			

 			if ($rating) {

-				echo '<div class="gd_rating" data-average="' . $rating . '" data-id="5">';

+				echo '<div class="gd_rating" data-average="'.$rating.'" data-id="5">';

 

 			} else {

 				echo '<div class="gd_rating" data-average="0" data-id="5"></div>';

 			}

 		}

-		echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="' . $rating . '"  />';

+		echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="'.$rating.'"  />';

 	}

 }

 

@@ -140,9 +140,9 @@ 
 {

 

     if (strpos($link, 'wp-login.php?') !== false) {

-        $link = str_replace(wp_login_url(),geodir_login_url(),$link);

+        $link = str_replace(wp_login_url(), geodir_login_url(), $link);

     }

-    $link = '<div class="gd_comment_replaylink">' . $link . '</div>';

+    $link = '<div class="gd_comment_replaylink">'.$link.'</div>';

 

     return $link;

 }

@@ -159,7 +159,7 @@ 
 function geodir_cancle_replaylink($link)

 {

 

-    $link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

+    $link = '<span class="gd-cancel-replaylink">'.$link.'</span>';

 

     return $link;

 }

@@ -199,10 +199,10 @@ 
     if (isset($_REQUEST['geodir_overallrating'])) {

         $overall_rating = $_REQUEST['geodir_overallrating'];

         

-		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+		if (isset($comment_info->comment_parent) && (int) $comment_info->comment_parent == 0) {

             $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

+            $sqlqry = $wpdb->prepare("INSERT INTO ".GEODIR_REVIEW_TABLE." SET

 					post_id		= %d,

 					post_type = %s,

 					post_title	= %s,

@@ -289,7 +289,7 @@ 
 

     $post_type = get_post_type($post_id);

 

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

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

 

     if ($comment_id) {

 

@@ -297,7 +297,7 @@ 
 

         if (isset($old_rating)) {

 

-            $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+            $sqlqry = $wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content = %s 

@@ -339,18 +339,18 @@ 
 

     $post_type = get_post_type($post_id);

 

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

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

 

     if (isset($_REQUEST['geodir_overallrating'])) {

 

         $overall_rating = $_REQUEST['geodir_overallrating'];

 

-        if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+        if (isset($comment_info->comment_parent) && (int) $comment_info->comment_parent == 0) {

             $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

             if (isset($old_rating)) {

 

-                $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+                $sqlqry = $wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content	= %s 

@@ -388,7 +388,7 @@ 
 

     $wpdb->query(

         $wpdb->prepare(

-            "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

+            "DELETE FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d",

             array($comment_id)

         )

     );

@@ -407,9 +407,9 @@ 
  * @return string The comment content.

  */

 function geodir_wrap_comment_text($content, $comment = '') {

-    if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int)$comment->comment_post_ID)) {

+    if (!empty($comment->comment_post_ID) && geodir_cpt_has_rating_disabled((int) $comment->comment_post_ID)) {

         if (!is_admin()) {

-            return '<div class="description">' . $content . '</div>';

+            return '<div class="description">'.$content.'</div>';

         } else {

             return $content;

         }

@@ -418,7 +418,7 @@ 
         if (!empty($comment))

             $rating = geodir_get_commentoverall($comment->comment_ID);

         if ($rating != 0 && !is_admin()) {

-            return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

+            return '<div><div class="gd-rating-text">'.__('Overall Rating', 'geodirectory').': <div class="rating">'.$rating.'</div></div>'.geodir_get_rating_stars($rating, $comment->comment_ID).'</div><div class="description">'.$content.'</div>';

         } else

             return $content;

     }

@@ -442,18 +442,18 @@ 
     if (!$post_type) {

         $post_type = get_post_type($post_id);

     }

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

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

     $post_newrating = geodir_get_post_rating($post_id, 1);

     $post_newrating_count = geodir_get_review_count_total($post_id);

 

 

     //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+    if ($wpdb->get_var("SHOW TABLES LIKE '".$detail_table."'") == $detail_table) {

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $detail_table . " SET

+                "UPDATE ".$detail_table." SET

 						overall_rating = %f,

 						rating_count = %f

 						where post_id = %d",

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

      * @param int $post_id The post ID.

      */

-    do_action('geodir_update_postrating',$post_id);

+    do_action('geodir_update_postrating', $post_id);

 

 }

 

@@ -493,13 +493,13 @@ 
     global $wpdb, $plugin_prefix;

 

     $post_type = get_post_type($post_id);

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

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

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+    if ($wpdb->get_var("SHOW TABLES LIKE '".$detail_table."'") == $detail_table) {

 

         $post_ratings = $wpdb->get_var(

             $wpdb->prepare(

-                "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

+                "SELECT overall_rating FROM ".$detail_table." WHERE post_id = %d",

                 array($post_id)

             )

         );

@@ -533,7 +533,7 @@ 
 

     $reatings = $wpdb->get_row(

         $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+            "SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id = %d",

             array($comment_id)

         )

     );

@@ -561,7 +561,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT SUM(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -588,7 +588,7 @@ 
     global $wpdb;

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE user_id = %d AND status=1 AND overall_rating>0",

             array($user_id)

         )

     );

@@ -626,7 +626,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COALESCE(avg(overall_rating),0) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -654,7 +654,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -683,7 +683,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -712,7 +712,7 @@ 
 

     $reatings = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+            "SELECT overall_rating FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id = %d",

             array($comment_id)

         )

     );

@@ -766,7 +766,7 @@ 
         

         $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

         if (!$template) {

-            $template = dirname(__FILE__) . '/reviews.php';

+            $template = dirname(__FILE__).'/reviews.php';

         }

         return $template;

     }

@@ -838,7 +838,7 @@ 
                         printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

                             get_comment_author_link(),

                             // If current post author is also comment author, make it known visually.

-                            ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

+                            ($comment->user_id === $post->post_author) ? '<span>'.__('Post author', 'geodirectory').'</span>' : ''

                         );

                         echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

                         printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

@@ -896,7 +896,7 @@ 
             global $post;

             $post_types = geodir_get_posttypes();

 

-            if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int)$post_id)) {

+            if (in_array(get_post_type($post_id), $post_types) && !geodir_cpt_has_rating_disabled((int) $post_id)) {

                 $review_count = geodir_get_review_count_total($post_id);

                 return $review_count;

 

@@ -929,29 +929,29 @@ 
  */

 function geodir_get_rating_stars($rating, $post_id, $small = false)

 {

-    if (!empty($post_id) && geodir_cpt_has_rating_disabled((int)$post_id)) {

+    if (!empty($post_id) && geodir_cpt_has_rating_disabled((int) $post_id)) {

         return NULL;

     }

     $a_rating = $rating / 5 * 100;

 

     if ($small) {

-        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

+        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="'.$rating.'" data-id="'.$post_id.'"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: '.$a_rating.'%;"></div><div class="geodir_Star_small"></div></div></div>';

     } else {

 		if (function_exists('geodir_reviewrating_draw_overall_rating')) {

 			// Show rating stars from review rating manager

 			$r_html = geodir_reviewrating_draw_overall_rating($rating);

 		} else {

-			$rating_img = '<img alt="rating icon" src="' . get_option('geodir_default_rating_star_icon') . '" />';

+			$rating_img = '<img alt="rating icon" src="'.get_option('geodir_default_rating_star_icon').'" />';

 			

 			/* fix rating star for safari */

 			$star_width = 23 * 5;

 			

 			if ($star_width > 0) {

-				$attach_style = 'max-width:' . $star_width . 'px';

+				$attach_style = 'max-width:'.$star_width.'px';

 			} else {

 				$attach_style = '';

 			}

-			$r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>';

+			$r_html = '<div class="geodir-rating" style="'.$attach_style.'"><div class="gd_rating_show" data-average="'.$rating.'" data-id="'.$post_id.'"><div class="geodir_RatingAverage" style="width: '.$a_rating.'%;"></div><div class="geodir_Star">'.$rating_img.$rating_img.$rating_img.$rating_img.$rating_img.'</div></div></div>';

 		}

     }

     return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

@@ -991,10 +991,10 @@ 
 /*

  * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types

  */

-if(function_exists('dsq_can_replace')) {

+if (function_exists('dsq_can_replace')) {

     remove_filter('comments_template', 'dsq_comments_template');

     add_filter('comments_template', 'dsq_comments_template', 100);

-    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

+    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active', 10, 1);

 }

 

 

@@ -1007,11 +1007,11 @@ 
  * @param string $disqus_active Hook called before DB call for option so this is empty.

  * @return string `1` if active `0` if disabled.

  */

-function geodir_option_disqus_active($disqus_active){

+function geodir_option_disqus_active($disqus_active) {

     global $post;

     $all_postypes = geodir_get_posttypes();

 

-    if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

+    if (isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {

         $disqus_active = '0';

     }