GeoDirectory / geodirectory

geodirectory-functions/helper_functions.php

Braces +4 added lines, -4 removed lines

@@ -146,7 +146,7 @@ 
 
     if (geodir_is_wpml()){
         $home_url = icl_get_home_url();
-    }else{
+    } else{
         $home_url = home_url();
     }
 
@@ -159,7 +159,7 @@ 
         $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";
     }
 
@@ -202,7 +202,7 @@ 
 
     if (geodir_is_wpml()){
         $home_url = icl_get_home_url();
-    }else{
+    } else{
         $home_url = home_url();
     }
 
@@ -215,7 +215,7 @@ 
         $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);
     }
 

Doc Comments +1 added lines, -1 removed lines

@@ -1173,7 +1173,7 @@
  *
  * @param string $str The string being decoded.
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
- * @return string The width of string.
+ * @return integer The width of string.
  */
 function geodir_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
 	if ( function_exists( 'mb_strwidth' ) ) {

Indentation +395 added lines, -395 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 (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
-    }
+	if (geodir_is_wpml()) {
+		$gd_page_id =  geodir_wpml_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 (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
-    }
+	if (geodir_is_wpml()) {
+		$gd_page_id =  geodir_wpml_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 (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
-    }
+	if (geodir_is_wpml()) {
+		$gd_page_id =  geodir_wpml_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 (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
-    }
+	if (geodir_is_wpml()) {
+		$gd_page_id =  geodir_wpml_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 (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
-    }
+	if (geodir_is_wpml()) {
+		$gd_page_id =  geodir_wpml_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 (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
-    }
+	if (geodir_is_wpml()) {
+		$gd_page_id =  geodir_wpml_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 (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
-    }
+	if (geodir_is_wpml()) {
+		$gd_page_id =  geodir_wpml_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 (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-    }
-
-    if (geodir_is_wpml()){
-        $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 (geodir_is_wpml()) {
+		$gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+	}
+
+	if (geodir_is_wpml()){
+		$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 (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
-    }
-
-    if (function_exists('geodir_location_geo_home_link')) {
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
-    }
-
-    if (geodir_is_wpml()){
-        $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 (geodir_is_wpml()) {
+		$gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+	}
+
+	if (function_exists('geodir_location_geo_home_link')) {
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
+	}
+
+	if (geodir_is_wpml()){
+		$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 ));
 }
 
 /*
@@ -660,44 +660,44 @@ 
  * @return string The formatted date.
  */
 function geodir_date( $date_input, $date_to, $date_from = '', $locale = false ) {
-    if ( empty( $date_input ) || empty( $date_to ) ) {
-        return NULL;
-    }
+	if ( empty( $date_input ) || empty( $date_to ) ) {
+		return NULL;
+	}
     
-    $date_input = geodir_maybe_untranslate_date( $date_input );
+	$date_input = geodir_maybe_untranslate_date( $date_input );
     
-    $timestamp = 0;
-    if (!empty( $date_from ) && function_exists( 'date_create_from_format' ) ) {
-        $datetime = date_create_from_format( $date_from, $date_input );
-        if ( !empty( $datetime ) ) {
-            $timestamp = $datetime->getTimestamp();
-        }
-    }
+	$timestamp = 0;
+	if (!empty( $date_from ) && function_exists( 'date_create_from_format' ) ) {
+		$datetime = date_create_from_format( $date_from, $date_input );
+		if ( !empty( $datetime ) ) {
+			$timestamp = $datetime->getTimestamp();
+		}
+	}
     
-    if ( empty( $timestamp ) ) {
-        $date = strpos( $date_input, '/' ) !== false ? str_replace( '/', '-', $date_input ) : $date_input;
-        $timestamp = strtotime( $date );
-    }
+	if ( empty( $timestamp ) ) {
+		$date = strpos( $date_input, '/' ) !== false ? str_replace( '/', '-', $date_input ) : $date_input;
+		$timestamp = strtotime( $date );
+	}
     
-    $date = date_i18n( $date_to, $timestamp );
+	$date = date_i18n( $date_to, $timestamp );
     
-    if ( !$locale ) {
-        $date = geodir_maybe_untranslate_date( $date );
-    }
+	if ( !$locale ) {
+		$date = geodir_maybe_untranslate_date( $date );
+	}
     
-    /**
-     * 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.
-     * @param bool $locale True to retrieve the date in localized format.
-     */
-    return apply_filters( 'geodir_date', $date, $date_input, $date_to, $date_from, $locale );
+	/**
+	 * 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.
+	 * @param bool $locale True to retrieve the date in localized format.
+	 */
+	return apply_filters( 'geodir_date', $date, $date_input, $date_to, $date_from, $locale );
 }
 
 /**
@@ -722,91 +722,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;
 }
 
 /**
@@ -830,28 +830,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);
 }
 
 /**
@@ -872,80 +872,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;
 }
 
 /**
@@ -958,21 +958,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(){
@@ -1090,11 +1090,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;
 }
 
 /**
@@ -1108,11 +1108,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 );
 }
 
 /**
@@ -1128,11 +1128,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 );
 }
 
 /**
@@ -1148,11 +1148,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 );
 }
 
 /**
@@ -1169,15 +1169,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 );
 }
 
 /**
@@ -1210,20 +1210,20 @@ 
  * @return string The resulting string.
  */
 function geodir_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        $first_letter = geodir_strtoupper( geodir_utf8_substr( $str, 0, 1, $encoding ), $encoding );
-        $str_end = "";
+	if ( function_exists( 'mb_strlen' ) ) {
+		$first_letter = geodir_strtoupper( geodir_utf8_substr( $str, 0, 1, $encoding ), $encoding );
+		$str_end = "";
         
-        if ( $lower_str_end ) {
-            $str_end = geodir_strtolower( geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
-        } else {
-            $str_end = geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding );
-        }
+		if ( $lower_str_end ) {
+			$str_end = geodir_strtolower( geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
+		} else {
+			$str_end = geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding );
+		}
         
-        return $first_letter . $str_end;
-    }
+		return $first_letter . $str_end;
+	}
 
-    return ucfirst( $str );
+	return ucfirst( $str );
 }
 
 function geodir_total_listings_count($post_type = false)

Spacing +137 added lines, -137 removed lines

@@ -13,11 +13,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_add_listing_page_id(){
+function geodir_add_listing_page_id() {
     $gd_page_id = get_option('geodir_add_listing_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -30,11 +30,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_preview_page_id(){
+function geodir_preview_page_id() {
     $gd_page_id = get_option('geodir_preview_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -47,11 +47,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_success_page_id(){
+function geodir_success_page_id() {
     $gd_page_id = get_option('geodir_success_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -64,11 +64,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_location_page_id(){
+function geodir_location_page_id() {
     $gd_page_id = get_option('geodir_location_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -81,11 +81,11 @@ 
  * @since 1.5.4
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_home_page_id(){
+function geodir_home_page_id() {
     $gd_page_id = get_option('geodir_home_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -98,11 +98,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_info_page_id(){
+function geodir_info_page_id() {
     $gd_page_id = get_option('geodir_info_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -115,11 +115,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_page_id(){
+function geodir_login_page_id() {
     $gd_page_id = get_option('geodir_login_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -133,20 +133,20 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_url($args=array()){
+function geodir_login_url($args = array()) {
     $gd_page_id = get_option('geodir_login_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
     }
 
-    if (geodir_is_wpml()){
+    if (geodir_is_wpml()) {
         $home_url = icl_get_home_url();
-    }else{
+    } else {
         $home_url = home_url();
     }
 
@@ -154,17 +154,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $login_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $login_url = trailingslashit($home_url)."?geodir_signup=true";
     }
 
-    if($args){
-        $login_url = add_query_arg($args,$login_url );
+    if ($args) {
+        $login_url = add_query_arg($args, $login_url);
     }
 
     /**
@@ -178,7 +178,7 @@ 
      * @param array $args The array of query args used.
      * @param int $gd_page_id The page id of the GD login page.
      */
-	    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
+	    return apply_filters('geodir_login_url', $login_url, $args, $gd_page_id);
 }
 
 /**
@@ -189,20 +189,20 @@ 
  * @since 1.5.16 Added WPML lang code to url.
  * @return string Info page url.
  */
-function geodir_info_url($args=array()){
+function geodir_info_url($args = array()) {
     $gd_page_id = get_option('geodir_info_page');
 
     if (geodir_is_wpml()) {
-        $gd_page_id =  geodir_wpml_object_id($gd_page_id, 'page', true);
+        $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
     }
 
-    if (geodir_is_wpml()){
+    if (geodir_is_wpml()) {
         $home_url = icl_get_home_url();
-    }else{
+    } else {
         $home_url = home_url();
     }
 
@@ -210,17 +210,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $info_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else {
         $info_url = trailingslashit($home_url);
     }
 
-    if($args){
-        $info_url = add_query_arg($args,$info_url );
+    if ($args) {
+        $info_url = add_query_arg($args, $info_url);
     }
 
     return $info_url;
@@ -238,7 +238,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_ucwords($string, $charset='UTF-8') {
+function geodir_ucwords($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_TITLE, $charset);
     } else {
@@ -258,7 +258,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtolower($string, $charset='UTF-8') {
+function geodir_strtolower($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_LOWER, $charset);
     } else {
@@ -278,7 +278,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtoupper($string, $charset='UTF-8') {
+function geodir_strtoupper($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_UPPER, $charset);
     } else {
@@ -309,7 +309,7 @@ 
 	
 	$url = trim($parts[0]);
 	if ($formatted && $url != '') {
-		$url = str_replace( ' ', '%20', $url );
+		$url = str_replace(' ', '%20', $url);
 		$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 		
 		if (0 !== stripos($url, 'mailto:')) {
@@ -319,8 +319,8 @@ 
 		
 		$url = str_replace(';//', '://', $url);
 		
-		if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
-			$url = 'http://' . $url;
+		if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
+			$url = 'http://'.$url;
 		}
 		
 		$url = wp_kses_normalize_entities($url);
@@ -462,7 +462,7 @@ 
  * @package GeoDirectory
  */
 function _gd_die_handler() {
-    if ( defined( 'GD_TESTING_MODE' ) ) {
+    if (defined('GD_TESTING_MODE')) {
         return '_gd_die_handler';
     } else {
         die();
@@ -480,10 +480,10 @@ 
  * @param string $title   Optional. Error title.
  * @param int $status     Optional. Status code.
  */
-function gd_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+function gd_die($message = '', $title = '', $status = 400) {
+    add_filter('wp_die_ajax_handler', '_gd_die_handler', 10, 3);
+    add_filter('wp_die_handler', '_gd_die_handler', 10, 3);
+    wp_die($message, $title, array('response' => $status));
 }
 
 /*
@@ -493,7 +493,7 @@ 
  * @param string $php_format The PHP date format.
  * @return string The jQuery format date string.
  */
-function geodir_date_format_php_to_jqueryui( $php_format ) {
+function geodir_date_format_php_to_jqueryui($php_format) {
 	$symbols = array(
 		// Day
 		'd' => 'dd',
@@ -533,27 +533,27 @@ 
 	$jqueryui_format = "";
 	$escaping = false;
 
-	for ( $i = 0; $i < strlen( $php_format ); $i++ ) {
+	for ($i = 0; $i < strlen($php_format); $i++) {
 		$char = $php_format[$i];
 
 		// PHP date format escaping character
-		if ( $char === '\\' ) {
+		if ($char === '\\') {
 			$i++;
 
-			if ( $escaping ) {
+			if ($escaping) {
 				$jqueryui_format .= $php_format[$i];
 			} else {
-				$jqueryui_format .= '\'' . $php_format[$i];
+				$jqueryui_format .= '\''.$php_format[$i];
 			}
 
 			$escaping = true;
 		} else {
-			if ( $escaping ) {
+			if ($escaping) {
 				$jqueryui_format .= "'";
 				$escaping = false;
 			}
 
-			if ( isset( $symbols[$char] ) ) {
+			if (isset($symbols[$char])) {
 				$jqueryui_format .= $symbols[$char];
 			} else {
 				$jqueryui_format .= $char;
@@ -591,7 +591,7 @@ 
 		'December',
 	);
 
-	$non_english_long_months  = array(
+	$non_english_long_months = array(
 		__('January'),
 		__('February'),
 		__('March'),
@@ -605,10 +605,10 @@ 
 		__('November'),
 		__('December'),
 	);
-	$date = str_replace($non_english_long_months,$english_long_months,$date);
+	$date = str_replace($non_english_long_months, $english_long_months, $date);
     
-	if ( !empty( $wp_locale ) ) {
-		$date = str_replace( array_values( $wp_locale->month_genitive ), $english_long_months, $date );
+	if (!empty($wp_locale)) {
+		$date = str_replace(array_values($wp_locale->month_genitive), $english_long_months, $date);
 	}
 
 	$english_short_months = array(
@@ -627,21 +627,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;
@@ -659,30 +659,30 @@ 
  * @param bool $locale True to retrieve the date in localized format. Default false.
  * @return string The formatted date.
  */
-function geodir_date( $date_input, $date_to, $date_from = '', $locale = false ) {
-    if ( empty( $date_input ) || empty( $date_to ) ) {
+function geodir_date($date_input, $date_to, $date_from = '', $locale = false) {
+    if (empty($date_input) || empty($date_to)) {
         return NULL;
     }
     
-    $date_input = geodir_maybe_untranslate_date( $date_input );
+    $date_input = geodir_maybe_untranslate_date($date_input);
     
     $timestamp = 0;
-    if (!empty( $date_from ) && function_exists( 'date_create_from_format' ) ) {
-        $datetime = date_create_from_format( $date_from, $date_input );
-        if ( !empty( $datetime ) ) {
+    if (!empty($date_from) && function_exists('date_create_from_format')) {
+        $datetime = date_create_from_format($date_from, $date_input);
+        if (!empty($datetime)) {
             $timestamp = $datetime->getTimestamp();
         }
     }
     
-    if ( empty( $timestamp ) ) {
-        $date = strpos( $date_input, '/' ) !== false ? str_replace( '/', '-', $date_input ) : $date_input;
-        $timestamp = strtotime( $date );
+    if (empty($timestamp)) {
+        $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input;
+        $timestamp = strtotime($date);
     }
     
-    $date = date_i18n( $date_to, $timestamp );
+    $date = date_i18n($date_to, $timestamp);
     
-    if ( !$locale ) {
-        $date = geodir_maybe_untranslate_date( $date );
+    if (!$locale) {
+        $date = geodir_maybe_untranslate_date($date);
     }
     
     /**
@@ -697,7 +697,7 @@ 
      * @param string $date_from The source date format.
      * @param bool $locale True to retrieve the date in localized format.
      */
-    return apply_filters( 'geodir_date', $date, $date_input, $date_to, $date_from, $locale );
+    return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from, $locale);
 }
 
 /**
@@ -722,7 +722,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(
@@ -784,7 +784,7 @@ 
         $length = $truncateLength;
 
         foreach ($openTags as $tag) {
-            $suffix .= '</' . $tag . '>';
+            $suffix .= '</'.$tag.'>';
         }
     } else {
         if (geodir_strlen($text, $options) <= $length) {
@@ -806,7 +806,7 @@ 
         }
     }
 
-    return $prefix . $result . $suffix;
+    return $prefix.$result.$suffix;
 }
 
 /**
@@ -843,7 +843,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'));
@@ -904,7 +904,7 @@ 
     }
 
     if (empty($options['html'])) {
-        return (string)$substr($text, $start, $length);
+        return (string) $substr($text, $start, $length);
     }
 
     $totalOffset = 0;
@@ -929,7 +929,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;
             }
@@ -975,39 +975,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',
@@ -1035,14 +1035,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',
@@ -1052,14 +1052,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' => '',
 					),
@@ -1071,7 +1071,7 @@ 
 	}
 
 
-	update_option('geodir_post_types',$cpts_restore);
+	update_option('geodir_post_types', $cpts_restore);
 
 }
 
@@ -1089,12 +1089,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;
 }
 
 /**
@@ -1107,12 +1107,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);
 }
 
 /**
@@ -1127,12 +1127,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);
 }
 
 /**
@@ -1147,12 +1147,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);
 }
 
 /**
@@ -1168,16 +1168,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);
 }
 
 /**
@@ -1190,12 +1190,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);
 }
 
 /**
@@ -1209,21 +1209,21 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The resulting string.
  */
-function geodir_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        $first_letter = geodir_strtoupper( geodir_utf8_substr( $str, 0, 1, $encoding ), $encoding );
+function geodir_utf8_ucfirst($str, $lower_str_end = false, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        $first_letter = geodir_strtoupper(geodir_utf8_substr($str, 0, 1, $encoding), $encoding);
         $str_end = "";
         
-        if ( $lower_str_end ) {
-            $str_end = geodir_strtolower( geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
+        if ($lower_str_end) {
+            $str_end = geodir_strtolower(geodir_utf8_substr($str, 1, geodir_utf8_strlen($str, $encoding), $encoding), $encoding);
         } else {
-            $str_end = geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding );
+            $str_end = geodir_utf8_substr($str, 1, geodir_utf8_strlen($str, $encoding), $encoding);
         }
         
-        return $first_letter . $str_end;
+        return $first_letter.$str_end;
     }
 
-    return ucfirst( $str );
+    return ucfirst($str);
 }
 
 function geodir_total_listings_count($post_type = false)
@@ -1233,13 +1233,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-templates/listing-filter-form.php

Indentation +36 added lines, -36 removed lines

@@ -13,26 +13,26 @@ 
 global $wp_query, $current_term, $query;

 

 if (function_exists('geodir_location_geo_home_link')) {

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

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

 }

 

 if (geodir_is_wpml() && defined('DOING_AJAX') && DOING_AJAX){

-    $search_url = icl_get_home_url();

+	$search_url = icl_get_home_url();

 } else {

-    $search_url = get_home_url();

+	$search_url = get_home_url();

 }

 

 $search_url = trailingslashit($search_url);

 

 if (function_exists('geodir_location_geo_home_link')) {

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

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

 }

 

 $new_style = get_option('geodir_show_search_old_search_from') ? false : true;

 $form_class = 'geodir-listing-search';

 

 if($new_style){

-    $form_class .= ' gd-search-bar-style';

+	$form_class .= ' gd-search-bar-style';

 }

 ?>

 <form class="<?php

@@ -49,56 +49,56 @@ 
     <div class="geodir-loc-bar">

 

         <?php

-        /**

-         * Called inside the search form but before any of the fields.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_search_form') ?>

+		/**

+		 * Called inside the search form but before any of the fields.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_before_search_form') ?>

 

         <div class="clearfix geodir-loc-bar-in">

             <div class="geodir-search">

 

                 <?php

 

-                /**

-                 * Adds the input fields to the search form.

-                 *

-                 * @since 1.6.9

-                 */

-                do_action('geodir_search_form_inputs');

+				/**

+				 * Adds the input fields to the search form.

+				 *

+				 * @since 1.6.9

+				 */

+				do_action('geodir_search_form_inputs');

 

 

 

-                /**

-                 * Called on the GD search form just before the search button.

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_before_search_button');

+				/**

+				 * Called on the GD search form just before the search button.

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_before_search_button');

 

                 

-                /**

-                 * Called on the GD search form just after the search button.

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_after_search_button');

+				/**

+				 * Called on the GD search form just after the search button.

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_after_search_button');

 

                 

-                ?>

+				?>

             </div>

 

 

         </div>

 

         <?php

-        /**

-         * Called inside the search form but after all the input fields.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_after_search_form') ?>

+		/**

+		 * Called inside the search form but after all the input fields.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_after_search_form') ?>

 

 

     </div>

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
     remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

 }

 

-if (geodir_is_wpml() && defined('DOING_AJAX') && DOING_AJAX){

+if (geodir_is_wpml() && defined('DOING_AJAX') && DOING_AJAX) {

     $search_url = icl_get_home_url();

 } else {

     $search_url = get_home_url();

@@ -31,7 +31,7 @@ 
 $new_style = get_option('geodir_show_search_old_search_from') ? false : true;

 $form_class = 'geodir-listing-search';

 

-if($new_style){

+if ($new_style) {

     $form_class .= ' gd-search-bar-style';

 }

 ?>

geodirectory-admin/option-pages/title_meta_settings_array.php

Indentation +367 added lines, -367 removed lines

@@ -10,7 +10,7 @@ 
 
 $gd_wpseo_use = '';
 if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
-    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
+	$gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
 }
 
 /**
@@ -21,375 +21,375 @@ 
  */
 $geodir_settings['title_meta_settings'] = apply_filters('geodir_title_meta_settings', array(
 
-    /* Listing Permalink Settings start */
-    array('name' => __('Title / Meta', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set page title and meta', 'id' => 'geodir_title_meta_settings '),
+	/* Listing Permalink Settings start */
+	array('name' => __('Title / Meta', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set page title and meta', 'id' => 'geodir_title_meta_settings '),
 
-    array('name' => $gd_wpseo_use.__('Available Variables', 'geodirectory'),
-        'desc' => '%%title%%, %%sitename%%, %%sitedesc%%, %%excerpt%%, %%pt_single%%, %%pt_plural%%, %%category%%, %%id%%, %%sep%%, %%location%%, %%in_location%%, %%in_location_single%%, %%location_single%%, %%location_country%%, %%in_location_country%%, %%location_region%%, %%in_location_region%%, %%location_city%%, %%in_location_city%%, %%location_sep%%, %%search_term%%, %%search_near%%, %%name%%, %%page%%, %%pagenumber%%, %%pagetotal%%',
-        'type' => 'sectionstart',
-        'id' => 'geodir_meta_vars'),
+	array('name' => $gd_wpseo_use.__('Available Variables', 'geodirectory'),
+		'desc' => '%%title%%, %%sitename%%, %%sitedesc%%, %%excerpt%%, %%pt_single%%, %%pt_plural%%, %%category%%, %%id%%, %%sep%%, %%location%%, %%in_location%%, %%in_location_single%%, %%location_single%%, %%location_country%%, %%in_location_country%%, %%location_region%%, %%in_location_region%%, %%location_city%%, %%in_location_city%%, %%location_sep%%, %%search_term%%, %%search_near%%, %%name%%, %%page%%, %%pagenumber%%, %%pagetotal%%',
+		'type' => 'sectionstart',
+		'id' => 'geodir_meta_vars'),
 
-    array('type' => 'sectionend', 'id' => 'geodir_meta_vars'),
+	array('type' => 'sectionend', 'id' => 'geodir_meta_vars'),
     
-    array('name' => __('Title & Metas Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_titles_and_metas'),
-
-    array(  
-        'name' => __( 'Disable overwrite by Yoast SEO titles & metas on GD pages', 'geodirectory' ),
-        'desc' => __( 'This allows to disable overwriting by Yoast SEO titles & metas on GD pages. If ticked then GD pages will use titles & metas settings from GeoDirectory > Titles & Metas. Otherwise it will use titles & metas settings from SEO > Titles & Metas.', 'geodirectory' ),
-        'id' => 'geodir_disable_yoast_meta',
-        'type' => 'checkbox',
-        'std' => '0'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_titles_and_metas'),
-
-    array('name' => __('Homepage Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_home_meta'),
-
-    array(
-        'name' => __('Homepage meta title', 'geodirectory'),
-        'desc' => __('This will use the title of the page set as frontpage if left blank.', 'geodirectory'),
-        'id' => 'geodir_meta_title_homepage',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => '',
-        'placeholder' => ''
-    ),
-
-    array(
-        'name' => __('Homepage meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the homepage.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_homepage',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_home_meta'),
-
-    // details page meta
-    array('name' => __('Details Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_details_meta'),
-
-    array(
-        'name' => __('Details page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the details page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_detail',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Details page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the details page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_detail',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%excerpt%%', 'geodirectory'),
-        'placeholder' => '%%excerpt%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_details_meta'),
-
-    // CPT page meta
-    array('name' => __('Post Type Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Post type page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the post type pages.', 'geodirectory'),
-        'id' => 'geodir_meta_title_pt',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% %%in_location%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Post type page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the post type pages.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_pt',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% %%in_location%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% %%in_location%%'
-    ),
-
-    array(
-        'name' => __('Post type page title', 'geodirectory'),
-        'desc' => __('Enter the title for the post type pages.', 'geodirectory'),
-        'id' => 'geodir_page_title_pt',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('All %%pt_plural%% %%in_location_single%%', 'geodirectory'),
-        'placeholder' => 'All %%pt_plural%% %%in_location_single%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_pt_meta'),
-
-    // Cat listing page meta
-    array('name' => __('Listing Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Listing page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the category listing pages.', 'geodirectory'),
-        'id' => 'geodir_meta_title_listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%category%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%category%% %%in_location%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Listing page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the category listing pages.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_listing',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('Posts related to Category: %%category%% %%in_location%%', 'geodirectory'),
-        'placeholder' => 'Posts related to Category: %%category%% %%in_location%%'
-    ),
-
-    array(
-        'name' => __('Category listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the category listing pages.', 'geodirectory'),
-        'id' => 'geodir_page_title_cat-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('All %%category%% %%in_location_single%%', 'geodirectory'),
-        'placeholder' => 'All %%category%% %%in_location_single%%'
-    ),
-
-    array(
-        'name' => __('Tag listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the tag listing pages.', 'geodirectory'),
-        'id' => 'geodir_page_title_tag-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Tag: %%tag%% %%in_location_single%%', 'geodirectory'),
-        'placeholder' => 'Tag: %%tag%% %%in_location_single%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    // location page meta
-    array('name' => __('Location Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Location page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the location pages.', 'geodirectory'),
-        'id' => 'geodir_meta_title_location',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%location%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%location%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Location page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the location pages.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_location',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%location%%', 'geodirectory'),
-        'placeholder' => '%%location%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    // Search page meta
-    array('name' => __('Search Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Search page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the search page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_search',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Search page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the search page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_search',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    //Add listing page meta
-    array('name' => __('Add Listing Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Add listing page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the add listing page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_add-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Add %%pt_single%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => 'Add %%pt_single%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Add listing page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the add listing page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_add-listing',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => __('Add %%pt_single%%', 'geodirectory'),
-        'placeholder' => 'Add %%pt_single%%'
-    ),
-
-    array(
-        'name' => __('Add listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the add listing page.', 'geodirectory'),
-        'id' => 'geodir_page_title_add-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Add %%pt_single%%', 'geodirectory'),
-        'placeholder' => 'Add %%pt_single%%'
-    ),
-
-    array(
-        'name' => __('Edit listing page title', 'geodirectory'),
-        'desc' => __('Enter the title for the edit listing page.', 'geodirectory'),
-        'id' => 'geodir_page_title_edit-listing',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Edit %%pt_single%%', 'geodirectory'),
-        'placeholder' => 'Edit %%pt_single%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    //Author page meta
-    array('name' => __('Author Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pt_meta'),
-
-    array(
-        'name' => __('Author page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the author page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_author',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('Author: %%name%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => 'Author: %%name%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Author page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the author page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_author',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array(
-        'name' => __('Author page title', 'geodirectory'),
-        'desc' => __('Enter the title for the author page.', 'geodirectory'),
-        'id' => 'geodir_page_title_author',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%pt_plural%% by: %%name%%', 'geodirectory'),
-        'placeholder' => '%%pt_plural%% by: %%name%%'
-    ),
-
-    array(
-        'name' => __('Author favorite page title', 'geodirectory'),
-        'desc' => __('Enter the title for the author favorite page.', 'geodirectory'),
-        'id' => 'geodir_page_title_favorite',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%name%%: Favorite %%pt_plural%%', 'geodirectory'),
-        'placeholder' => '%%name%%: Favorite %%pt_plural%%'
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
-
-    //Login page meta
-    array('name' => __('Login Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_login_meta'),
-
-    array(
-        'name' => __('Login page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the login page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_login',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Login page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the login page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_login',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
-
-    //Listing success page meta
-    array('name' => __('Listing Success Page Meta Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_login_meta'),
-
-    array(
-        'name' => __('Listing success page meta title', 'geodirectory'),
-        'desc' => __('Enter the meta title for the listing success page.', 'geodirectory'),
-        'id' => 'geodir_meta_title_listing-success',
-        'type' => 'text',
-        'css' => 'width:100%;',
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
-    ),
-
-    array(
-        'name' => __('Listing success page meta description', 'geodirectory'),
-        'desc' => __('Enter the meta description for the listing success page.', 'geodirectory'),
-        'id' => 'geodir_meta_desc_listing-success',
-        'type' => 'textarea',
-        'css' => 'width:100%;',
-        'std' => ''
-    ),
-
-    array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
+	array('name' => __('Title & Metas Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_titles_and_metas'),
+
+	array(  
+		'name' => __( 'Disable overwrite by Yoast SEO titles & metas on GD pages', 'geodirectory' ),
+		'desc' => __( 'This allows to disable overwriting by Yoast SEO titles & metas on GD pages. If ticked then GD pages will use titles & metas settings from GeoDirectory > Titles & Metas. Otherwise it will use titles & metas settings from SEO > Titles & Metas.', 'geodirectory' ),
+		'id' => 'geodir_disable_yoast_meta',
+		'type' => 'checkbox',
+		'std' => '0'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_titles_and_metas'),
+
+	array('name' => __('Homepage Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_home_meta'),
+
+	array(
+		'name' => __('Homepage meta title', 'geodirectory'),
+		'desc' => __('This will use the title of the page set as frontpage if left blank.', 'geodirectory'),
+		'id' => 'geodir_meta_title_homepage',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => '',
+		'placeholder' => ''
+	),
+
+	array(
+		'name' => __('Homepage meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the homepage.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_homepage',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_home_meta'),
+
+	// details page meta
+	array('name' => __('Details Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_details_meta'),
+
+	array(
+		'name' => __('Details page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the details page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_detail',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Details page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the details page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_detail',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%excerpt%%', 'geodirectory'),
+		'placeholder' => '%%excerpt%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_details_meta'),
+
+	// CPT page meta
+	array('name' => __('Post Type Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Post type page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the post type pages.', 'geodirectory'),
+		'id' => 'geodir_meta_title_pt',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% %%in_location%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Post type page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the post type pages.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_pt',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% %%in_location%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% %%in_location%%'
+	),
+
+	array(
+		'name' => __('Post type page title', 'geodirectory'),
+		'desc' => __('Enter the title for the post type pages.', 'geodirectory'),
+		'id' => 'geodir_page_title_pt',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('All %%pt_plural%% %%in_location_single%%', 'geodirectory'),
+		'placeholder' => 'All %%pt_plural%% %%in_location_single%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_pt_meta'),
+
+	// Cat listing page meta
+	array('name' => __('Listing Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Listing page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the category listing pages.', 'geodirectory'),
+		'id' => 'geodir_meta_title_listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%category%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%category%% %%in_location%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Listing page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the category listing pages.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_listing',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('Posts related to Category: %%category%% %%in_location%%', 'geodirectory'),
+		'placeholder' => 'Posts related to Category: %%category%% %%in_location%%'
+	),
+
+	array(
+		'name' => __('Category listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the category listing pages.', 'geodirectory'),
+		'id' => 'geodir_page_title_cat-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('All %%category%% %%in_location_single%%', 'geodirectory'),
+		'placeholder' => 'All %%category%% %%in_location_single%%'
+	),
+
+	array(
+		'name' => __('Tag listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the tag listing pages.', 'geodirectory'),
+		'id' => 'geodir_page_title_tag-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Tag: %%tag%% %%in_location_single%%', 'geodirectory'),
+		'placeholder' => 'Tag: %%tag%% %%in_location_single%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	// location page meta
+	array('name' => __('Location Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Location page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the location pages.', 'geodirectory'),
+		'id' => 'geodir_meta_title_location',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%location%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%location%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Location page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the location pages.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_location',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%location%%', 'geodirectory'),
+		'placeholder' => '%%location%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	// Search page meta
+	array('name' => __('Search Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Search page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the search page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_search',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Search page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the search page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_search',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	//Add listing page meta
+	array('name' => __('Add Listing Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Add listing page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the add listing page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_add-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Add %%pt_single%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => 'Add %%pt_single%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Add listing page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the add listing page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_add-listing',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => __('Add %%pt_single%%', 'geodirectory'),
+		'placeholder' => 'Add %%pt_single%%'
+	),
+
+	array(
+		'name' => __('Add listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the add listing page.', 'geodirectory'),
+		'id' => 'geodir_page_title_add-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Add %%pt_single%%', 'geodirectory'),
+		'placeholder' => 'Add %%pt_single%%'
+	),
+
+	array(
+		'name' => __('Edit listing page title', 'geodirectory'),
+		'desc' => __('Enter the title for the edit listing page.', 'geodirectory'),
+		'id' => 'geodir_page_title_edit-listing',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Edit %%pt_single%%', 'geodirectory'),
+		'placeholder' => 'Edit %%pt_single%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	//Author page meta
+	array('name' => __('Author Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pt_meta'),
+
+	array(
+		'name' => __('Author page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the author page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_author',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('Author: %%name%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => 'Author: %%name%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Author page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the author page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_author',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array(
+		'name' => __('Author page title', 'geodirectory'),
+		'desc' => __('Enter the title for the author page.', 'geodirectory'),
+		'id' => 'geodir_page_title_author',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%pt_plural%% by: %%name%%', 'geodirectory'),
+		'placeholder' => '%%pt_plural%% by: %%name%%'
+	),
+
+	array(
+		'name' => __('Author favorite page title', 'geodirectory'),
+		'desc' => __('Enter the title for the author favorite page.', 'geodirectory'),
+		'id' => 'geodir_page_title_favorite',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%name%%: Favorite %%pt_plural%%', 'geodirectory'),
+		'placeholder' => '%%name%%: Favorite %%pt_plural%%'
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
+
+	//Login page meta
+	array('name' => __('Login Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_login_meta'),
+
+	array(
+		'name' => __('Login page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the login page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_login',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Login page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the login page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_login',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
+
+	//Listing success page meta
+	array('name' => __('Listing Success Page Meta Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_login_meta'),
+
+	array(
+		'name' => __('Listing success page meta title', 'geodirectory'),
+		'desc' => __('Enter the meta title for the listing success page.', 'geodirectory'),
+		'id' => 'geodir_meta_title_listing-success',
+		'type' => 'text',
+		'css' => 'width:100%;',
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
+	),
+
+	array(
+		'name' => __('Listing success page meta description', 'geodirectory'),
+		'desc' => __('Enter the meta description for the listing success page.', 'geodirectory'),
+		'id' => 'geodir_meta_desc_listing-success',
+		'type' => 'textarea',
+		'css' => 'width:100%;',
+		'std' => ''
+	),
+
+	array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
 
 
 

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 
 $gd_wpseo_use = '';
 if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
-    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
+    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.', 'geodirectory')."</b><br />";
 }
 
 /**
@@ -37,8 +37,8 @@ 
         'id' => 'geodir_titles_and_metas'),
 
     array(  
-        'name' => __( 'Disable overwrite by Yoast SEO titles & metas on GD pages', 'geodirectory' ),
-        'desc' => __( 'This allows to disable overwriting by Yoast SEO titles & metas on GD pages. If ticked then GD pages will use titles & metas settings from GeoDirectory > Titles & Metas. Otherwise it will use titles & metas settings from SEO > Titles & Metas.', 'geodirectory' ),
+        'name' => __('Disable overwrite by Yoast SEO titles & metas on GD pages', 'geodirectory'),
+        'desc' => __('This allows to disable overwriting by Yoast SEO titles & metas on GD pages. If ticked then GD pages will use titles & metas settings from GeoDirectory > Titles & Metas. Otherwise it will use titles & metas settings from SEO > Titles & Metas.', 'geodirectory'),
         'id' => 'geodir_disable_yoast_meta',
         'type' => 'checkbox',
         'std' => '0'

geodirectory-functions/user_functions.php

Braces +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
 
                 if($output_type=='select'){
                     $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
+                } elseif($output_type=='link'){
                     $favourite_links[] = '<a href="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
                 }
 
@@ -102,7 +102,7 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
+            } elseif($output_type=='link'){
                 if(!empty($favourite_links)){
                     echo implode(" | ",$favourite_links);
                 }
@@ -148,7 +148,7 @@ 
                 $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
                 if($output_type=='select') {
                     $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
+                } elseif($output_type=='link'){
                     $listing_links[] = '<a href="' .$listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
                 }
             }
@@ -168,7 +168,7 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
+            } elseif($output_type=='link'){
                 if(!empty($listing_links )){
                     echo implode(" | ",$listing_links );
                 }

Indentation +131 added lines, -131 removed lines

@@ -13,34 +13,34 @@ 
  */
 function geodir_user_favourite_listing_count($user_id=false)
 {
-    global $wpdb, $plugin_prefix, $current_user;
+	global $wpdb, $plugin_prefix, $current_user;
 
-    if(!$user_id){$user_id = $current_user->ID;}
-    if(!$user_id){return array();}
+	if(!$user_id){$user_id = $current_user->ID;}
+	if(!$user_id){return array();}
 
-    $site_id = '';
-    if ( is_multisite() ) {
-        $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
-    }
+	$site_id = '';
+	if ( is_multisite() ) {
+		$blog_id = get_current_blog_id();
+		if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+	}
 
-    $user_favorites = geodir_get_user_favourites($user_id);
-    $all_posts = get_option('geodir_favorite_link_user_dashboard');
+	$user_favorites = geodir_get_user_favourites($user_id);
+	$all_posts = get_option('geodir_favorite_link_user_dashboard');
 
-    $user_listing = array();
-    if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
-        $user_favorites = "'" . implode("','", $user_favorites) . "'";
+	$user_listing = array();
+	if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
+		$user_favorites = "'" . implode("','", $user_favorites) . "'";
 
-        foreach ($all_posts as $ptype) {
-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
+		foreach ($all_posts as $ptype) {
+			$total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
 
-            if ($total_posts > 0) {
-                $user_listing[$ptype] = $total_posts;
-            }
-        }
-    }
+			if ($total_posts > 0) {
+				$user_listing[$ptype] = $total_posts;
+			}
+		}
+	}
 
-    return $user_listing;
+	return $user_listing;
 }
 
 
@@ -53,51 +53,51 @@ 
  */
 
 function geodir_user_show_favourites($user_id='',$output_type='select'){
-    // My Favourites in Dashboard
-    $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
-    $user_favourite = geodir_user_favourite_listing_count($user_id);
-
-    if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
-        $favourite_links = '';
-        $post_types = geodir_get_posttypes('object');
-
-        $author_link = get_author_posts_url($user_id);
-        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
-
-        foreach ($post_types as $key => $postobj) {
-            if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
-                $name = $postobj->labels->name;
-                $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);
-
-                $selected = '';
-
-                if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
-                    $selected = 'selected="selected"';
-                }
-                /**
-                 * Filter favorite listing link.
-                 *
-                 * @since 1.0.0
-                 * @param string $post_type_link Favorite listing link.
-                 * @param string $key Favorite listing array key.
-                 * @param int $current_user->ID Current user ID.
-                 */
-                $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
-
-                if($output_type=='select'){
-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
-                    $favourite_links[] = '<a href="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
-                }
-
-
-            }
-        }
-
-        if ($favourite_links != '') {
-            $user = get_user_by( 'ID', $user_id );
-            if($output_type=='select') {
-                ?>
+	// My Favourites in Dashboard
+	$show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
+	$user_favourite = geodir_user_favourite_listing_count($user_id);
+
+	if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
+		$favourite_links = '';
+		$post_types = geodir_get_posttypes('object');
+
+		$author_link = get_author_posts_url($user_id);
+		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
+
+		foreach ($post_types as $key => $postobj) {
+			if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
+				$name = $postobj->labels->name;
+				$post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);
+
+				$selected = '';
+
+				if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
+					$selected = 'selected="selected"';
+				}
+				/**
+				 * Filter favorite listing link.
+				 *
+				 * @since 1.0.0
+				 * @param string $post_type_link Favorite listing link.
+				 * @param string $key Favorite listing array key.
+				 * @param int $current_user->ID Current user ID.
+				 */
+				$post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
+
+				if($output_type=='select'){
+					$favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
+				}elseif($output_type=='link'){
+					$favourite_links[] = '<a href="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
+				}
+
+
+			}
+		}
+
+		if ($favourite_links != '') {
+			$user = get_user_by( 'ID', $user_id );
+			if($output_type=='select') {
+				?>
                 <li>
                     <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value"
                             option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false"
@@ -108,62 +108,62 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
-                if(!empty($favourite_links)){
-                    echo implode(" | ",$favourite_links);
-                }
-
-            }
-        }
-    }
+			}elseif($output_type=='link'){
+				if(!empty($favourite_links)){
+					echo implode(" | ",$favourite_links);
+				}
+
+			}
+		}
+	}
 }
 
 
 
 function geodir_user_show_listings($user_id='',$output_type='select'){
 
-    $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
-    $user_listing = geodir_user_post_listing_count($user_id);
-
-    if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
-        $listing_links = array();
-
-        $post_types = geodir_get_posttypes('object');
-
-        $author_link = get_author_posts_url($user_id);
-        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
-
-        foreach ($post_types as $key => $postobj) {
-            if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
-                $name = $postobj->labels->name;
-                $listing_link = geodir_getlink($author_link, array('stype' => $key), false);
-
-                $selected = '';
-                if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
-                    $selected = 'selected="selected"';
-                }
-
-                /**
-                 * Filter my listing link.
-                 *
-                 * @since 1.0.0
-                 * @param string $listing_link My listing link.
-                 * @param string $key My listing array key.
-                 * @param int $current_user->ID Current user ID.
-                 */
-                $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
-                if($output_type=='select') {
-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
-                    $listing_links[] = '<a href="' .$listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
-                }
-            }
-        }
-
-        if ($listing_links != '') {
-            $user = get_user_by( 'ID', $user_id );
-            if($output_type=='select') {
-                ?>
+	$show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
+	$user_listing = geodir_user_post_listing_count($user_id);
+
+	if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
+		$listing_links = array();
+
+		$post_types = geodir_get_posttypes('object');
+
+		$author_link = get_author_posts_url($user_id);
+		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
+
+		foreach ($post_types as $key => $postobj) {
+			if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
+				$name = $postobj->labels->name;
+				$listing_link = geodir_getlink($author_link, array('stype' => $key), false);
+
+				$selected = '';
+				if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
+					$selected = 'selected="selected"';
+				}
+
+				/**
+				 * Filter my listing link.
+				 *
+				 * @since 1.0.0
+				 * @param string $listing_link My listing link.
+				 * @param string $key My listing array key.
+				 * @param int $current_user->ID Current user ID.
+				 */
+				$listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
+				if($output_type=='select') {
+					$listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
+				}elseif($output_type=='link'){
+					$listing_links[] = '<a href="' .$listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
+				}
+			}
+		}
+
+		if ($listing_links != '') {
+			$user = get_user_by( 'ID', $user_id );
+			if($output_type=='select') {
+				?>
                 <li>
                     <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value"
                             option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false"
@@ -174,14 +174,14 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
-                if(!empty($listing_links )){
-                    echo implode(" | ",$listing_links );
-                }
+			}elseif($output_type=='link'){
+				if(!empty($listing_links )){
+					echo implode(" | ",$listing_links );
+				}
 
-            }
-        }
-    }
+			}
+		}
+	}
 
 }
 
@@ -193,12 +193,12 @@ 
  * @return mixed
  */
 function geodir_get_user_favourites($user_id=''){
-    if(!$user_id){$user_id = get_current_user_id();}
-    $site_id = '';
-    if ( is_multisite() ) {
-        $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
-    }
-
-    return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);
+	if(!$user_id){$user_id = get_current_user_id();}
+	$site_id = '';
+	if ( is_multisite() ) {
+		$blog_id = get_current_blog_id();
+		if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+	}
+
+	return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);
 }
\ No newline at end of file

Spacing +31 added lines, -31 removed lines

@@ -11,17 +11,17 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.
  * @return array User listing count for each post type.
  */
-function geodir_user_favourite_listing_count($user_id=false)
+function geodir_user_favourite_listing_count($user_id = false)
 {
     global $wpdb, $plugin_prefix, $current_user;
 
-    if(!$user_id){$user_id = $current_user->ID;}
-    if(!$user_id){return array();}
+    if (!$user_id) {$user_id = $current_user->ID; }
+    if (!$user_id) {return array(); }
 
     $site_id = '';
-    if ( is_multisite() ) {
+    if (is_multisite()) {
         $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+        if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
     }
 
     $user_favorites = geodir_get_user_favourites($user_id);
@@ -29,10 +29,10 @@ 
 
     $user_listing = array();
     if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
-        $user_favorites = "'" . implode("','", $user_favorites) . "'";
+        $user_favorites = "'".implode("','", $user_favorites)."'";
 
         foreach ($all_posts as $ptype) {
-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
+            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE  post_type='".$ptype."' AND post_status = 'publish' AND ID IN (".$user_favorites.")");
 
             if ($total_posts > 0) {
                 $user_listing[$ptype] = $total_posts;
@@ -52,7 +52,7 @@ 
  * @package GeoDirectory
  */
 
-function geodir_user_show_favourites($user_id='',$output_type='select'){
+function geodir_user_show_favourites($user_id = '', $output_type = 'select') {
     // My Favourites in Dashboard
     $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
     $user_favourite = geodir_user_favourite_listing_count($user_id);
@@ -84,10 +84,10 @@ 
                  */
                 $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
 
-                if($output_type=='select'){
-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
-                    $favourite_links[] = '<a href="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
+                if ($output_type == 'select') {
+                    $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>';
+                }elseif ($output_type == 'link') {
+                    $favourite_links[] = '<a href="'.$post_type_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</a>';
                 }
 
 
@@ -95,8 +95,8 @@ 
         }
 
         if ($favourite_links != '') {
-            $user = get_user_by( 'ID', $user_id );
-            if($output_type=='select') {
+            $user = get_user_by('ID', $user_id);
+            if ($output_type == 'select') {
                 ?>
                 <li>
                     <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value"
@@ -108,9 +108,9 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
-                if(!empty($favourite_links)){
-                    echo implode(" | ",$favourite_links);
+            }elseif ($output_type == 'link') {
+                if (!empty($favourite_links)) {
+                    echo implode(" | ", $favourite_links);
                 }
 
             }
@@ -120,7 +120,7 @@ 
 
 
 
-function geodir_user_show_listings($user_id='',$output_type='select'){
+function geodir_user_show_listings($user_id = '', $output_type = 'select') {
 
     $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
     $user_listing = geodir_user_post_listing_count($user_id);
@@ -152,17 +152,17 @@ 
                  * @param int $current_user->ID Current user ID.
                  */
                 $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
-                if($output_type=='select') {
-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
-                }elseif($output_type=='link'){
-                    $listing_links[] = '<a href="' .$listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
+                if ($output_type == 'select') {
+                    $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>';
+                }elseif ($output_type == 'link') {
+                    $listing_links[] = '<a href="'.$listing_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</a>';
                 }
             }
         }
 
         if ($listing_links != '') {
-            $user = get_user_by( 'ID', $user_id );
-            if($output_type=='select') {
+            $user = get_user_by('ID', $user_id);
+            if ($output_type == 'select') {
                 ?>
                 <li>
                     <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value"
@@ -174,9 +174,9 @@ 
                     </select>
                 </li>
             <?php
-            }elseif($output_type=='link'){
-                if(!empty($listing_links )){
-                    echo implode(" | ",$listing_links );
+            }elseif ($output_type == 'link') {
+                if (!empty($listing_links)) {
+                    echo implode(" | ", $listing_links);
                 }
 
             }
@@ -192,12 +192,12 @@ 
  * @since 1.6.24
  * @return mixed
  */
-function geodir_get_user_favourites($user_id=''){
-    if(!$user_id){$user_id = get_current_user_id();}
+function geodir_get_user_favourites($user_id = '') {
+    if (!$user_id) {$user_id = get_current_user_id(); }
     $site_id = '';
-    if ( is_multisite() ) {
+    if (is_multisite()) {
         $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+        if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
     }
 
     return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);

geodirectory-functions/compatibility/BuddyBoss.php

Indentation +49 added lines, -49 removed lines

@@ -12,77 +12,77 @@
 
 remove_action('geodir_page_title', 'geodir_action_page_title', 10);
 function gd_buddyboss_action_calls(){
-    // listings page remove
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);
-    remove_action('geodir_listings_page_description', 'geodir_location_action_listings_description', 100); // for location manager
-    remove_action('geodir_listings_page_description', 'geodir_cpt_pt_desc', 10); //CPT manager
+	// listings page remove
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);
+	remove_action('geodir_listings_page_description', 'geodir_location_action_listings_description', 100); // for location manager
+	remove_action('geodir_listings_page_description', 'geodir_cpt_pt_desc', 10); //CPT manager
 
-    //listing page add
-    add_action('geodir_listings_content', 'geodir_breadcrumb', 3);
-    add_action('geodir_listings_content', 'geodir_action_geodir_sidebar_listings_top', 4);
-    add_action('geodir_listings_content', 'geodir_cpt_pt_desc', 5); //CPT manager
-    if(defined("GEODIRLOCATION_VERSION")){
-        add_action('geodir_listings_content', 'geodir_location_action_listings_description', 5);
-    }else{
-        add_action('geodir_listings_content', 'geodir_action_listings_description', 5);
-    }
-    add_action('geodir_listings_content', 'geodir_action_listings_title', 9);
+	//listing page add
+	add_action('geodir_listings_content', 'geodir_breadcrumb', 3);
+	add_action('geodir_listings_content', 'geodir_action_geodir_sidebar_listings_top', 4);
+	add_action('geodir_listings_content', 'geodir_cpt_pt_desc', 5); //CPT manager
+	if(defined("GEODIRLOCATION_VERSION")){
+		add_action('geodir_listings_content', 'geodir_location_action_listings_description', 5);
+	}else{
+		add_action('geodir_listings_content', 'geodir_action_listings_description', 5);
+	}
+	add_action('geodir_listings_content', 'geodir_action_listings_title', 9);
 
 
-    // details page remove
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_set_preview_post', 8);
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_preview_code', 9);
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	// details page remove
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_set_preview_post', 8);
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_preview_code', 9);
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
 
 
-    //details page add
-    add_action('geodir_article_open', 'geodir_action_geodir_set_preview_post', 1);
-    add_action('geodir_article_open','geodir_action_geodir_preview_code', 2);
-    add_action('geodir_article_open', 'geodir_breadcrumb', 3);
-    add_action('geodir_article_open', 'geodir_action_geodir_sidebar_detail_top', 5);
+	//details page add
+	add_action('geodir_article_open', 'geodir_action_geodir_set_preview_post', 1);
+	add_action('geodir_article_open','geodir_action_geodir_preview_code', 2);
+	add_action('geodir_article_open', 'geodir_breadcrumb', 3);
+	add_action('geodir_article_open', 'geodir_action_geodir_sidebar_detail_top', 5);
 
 
 
-    //location/home remove
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+	//location/home remove
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
 
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
 
-    //location/home add
-    add_action('geodir_home_content', 'geodir_breadcrumb', 3);
-    add_action('geodir_location_content', 'geodir_breadcrumb', 3);
+	//location/home add
+	add_action('geodir_home_content', 'geodir_breadcrumb', 3);
+	add_action('geodir_location_content', 'geodir_breadcrumb', 3);
 
-    add_action('geodir_home_content', 'geodir_action_geodir_sidebar_home_top', 5);
-    add_action('geodir_location_content', 'geodir_action_geodir_sidebar_home_top', 5);
+	add_action('geodir_home_content', 'geodir_action_geodir_sidebar_home_top', 5);
+	add_action('geodir_location_content', 'geodir_action_geodir_sidebar_home_top', 5);
 
-    // search remove
-    remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	// search remove
+	remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
 
-    //search add
-    add_action('geodir_search_content', 'geodir_action_geodir_sidebar_search_top', 5);
-    add_action('geodir_search_content', 'geodir_breadcrumb', 3);
-    add_action('geodir_search_content', 'geodir_action_search_page_title', 6);
+	//search add
+	add_action('geodir_search_content', 'geodir_action_geodir_sidebar_search_top', 5);
+	add_action('geodir_search_content', 'geodir_breadcrumb', 3);
+	add_action('geodir_search_content', 'geodir_action_search_page_title', 6);
 
 
 
 }
 
 function gd_bb__dequeue_script() {
-    if(geodir_is_geodir_page()){
-        wp_dequeue_script( 'selectboxes');
-    }
+	if(geodir_is_geodir_page()){
+		wp_dequeue_script( 'selectboxes');
+	}
 }
 add_action( 'wp_print_scripts', 'gd_bb__dequeue_script', 100 );
 
 add_action('geodir_listings_content','_bb_do_geodir_listings_page_description',11);
 function _bb_do_geodir_listings_page_description(){
-    do_action('geodir_listings_page_description');
+	do_action('geodir_listings_page_description');
 }

Spacing +9 added lines, -9 removed lines

@@ -11,7 +11,7 @@ 
 add_action('after_setup_theme', 'gd_buddyboss_action_calls', 11);
 
 remove_action('geodir_page_title', 'geodir_action_page_title', 10);
-function gd_buddyboss_action_calls(){
+function gd_buddyboss_action_calls() {
     // listings page remove
     remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
     remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
@@ -24,9 +24,9 @@ 
     add_action('geodir_listings_content', 'geodir_breadcrumb', 3);
     add_action('geodir_listings_content', 'geodir_action_geodir_sidebar_listings_top', 4);
     add_action('geodir_listings_content', 'geodir_cpt_pt_desc', 5); //CPT manager
-    if(defined("GEODIRLOCATION_VERSION")){
+    if (defined("GEODIRLOCATION_VERSION")) {
         add_action('geodir_listings_content', 'geodir_location_action_listings_description', 5);
-    }else{
+    } else {
         add_action('geodir_listings_content', 'geodir_action_listings_description', 5);
     }
     add_action('geodir_listings_content', 'geodir_action_listings_title', 9);
@@ -41,7 +41,7 @@ 
 
     //details page add
     add_action('geodir_article_open', 'geodir_action_geodir_set_preview_post', 1);
-    add_action('geodir_article_open','geodir_action_geodir_preview_code', 2);
+    add_action('geodir_article_open', 'geodir_action_geodir_preview_code', 2);
     add_action('geodir_article_open', 'geodir_breadcrumb', 3);
     add_action('geodir_article_open', 'geodir_action_geodir_sidebar_detail_top', 5);
 
@@ -76,13 +76,13 @@ 
 }
 
 function gd_bb__dequeue_script() {
-    if(geodir_is_geodir_page()){
-        wp_dequeue_script( 'selectboxes');
+    if (geodir_is_geodir_page()) {
+        wp_dequeue_script('selectboxes');
     }
 }
-add_action( 'wp_print_scripts', 'gd_bb__dequeue_script', 100 );
+add_action('wp_print_scripts', 'gd_bb__dequeue_script', 100);
 
-add_action('geodir_listings_content','_bb_do_geodir_listings_page_description',11);
-function _bb_do_geodir_listings_page_description(){
+add_action('geodir_listings_content', '_bb_do_geodir_listings_page_description', 11);
+function _bb_do_geodir_listings_page_description() {
     do_action('geodir_listings_page_description');
 }

Braces +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     add_action('geodir_listings_content', 'geodir_cpt_pt_desc', 5); //CPT manager
     if(defined("GEODIRLOCATION_VERSION")){
         add_action('geodir_listings_content', 'geodir_location_action_listings_description', 5);
-    }else{
+    } else{
         add_action('geodir_listings_content', 'geodir_action_listings_description', 5);
     }
     add_action('geodir_listings_content', 'geodir_action_listings_title', 9);

geodirectory-admin/admin_functions.php

Braces +230 added lines, -127 removed lines

@@ -184,8 +184,9 @@ 
 

         $thumb_img_arr = array();

 

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

-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

+        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                    $thumb_img_arr = geodir_get_images($_REQUEST['pid']);
+        }
 

         $totImg = '';

         $image_limit = '';

@@ -236,7 +237,9 @@ 
     {

         global $menu, $geodirectory;

 

-        if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

+        if (current_user_can('manage_options')) {
+        	$menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
+        }
 

         add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

 

@@ -300,7 +303,9 @@ 
      */

     function geodir_admin_custom_menu_order()

     {

-        if (!current_user_can('manage_options')) return false;

+        if (!current_user_can('manage_options')) {
+        	return false;
+        }
         return true;

     }

 }

@@ -331,10 +336,11 @@ 
 			case 'fail':

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

 				

-				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

-				else

-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

+				if ($gderr == 21) {
+							    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
+				} else {
+									echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
+				}
                 break;

         }

     }

@@ -385,8 +391,12 @@ 
         include_once('option-pages/' . $current_tab . '_array.php');

     }

     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) {
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
+        }
+        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) {
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
+        }
 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -398,8 +408,9 @@ 
 		 */

 		do_action('geodir_before_update_options', $current_tab, $geodir_settings);		

 		

-        if (!empty($geodir_settings[$current_tab]))

-            geodir_update_options($geodir_settings[$current_tab]);

+        if (!empty($geodir_settings[$current_tab])) {
+                    geodir_update_options($geodir_settings[$current_tab]);
+        }
 

         /**

          * Called after GeoDirectory options settings are updated.

@@ -447,11 +458,14 @@ 
  * @return bool Returns true if saved.

  */

 function geodir_update_options($options, $dummy = false) {

-    if ((!isset($_POST) || !$_POST) && !$dummy) return false;

+    if ((!isset($_POST) || !$_POST) && !$dummy) {
+    	return false;
+    }
 

     foreach ($options as $value) {

-        if ($dummy && isset($value['std']))

-            $_POST[$value['id']] = $value['std'];

+        if ($dummy && isset($value['std'])) {
+                    $_POST[$value['id']] = $value['std'];
+        }
 

 

         if (isset($value['type']) && $value['type'] == 'checkbox') :

@@ -460,25 +474,23 @@ 
                 update_option($value['id'], $_POST[$value['id']]);

             } else {

                 update_option($value['id'], 0);

-            }

-

-        elseif (isset($value['type']) && $value['type'] == 'image_width') :

+            } elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

             if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

                 update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

                 update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

                 if (isset($_POST[$value['id'] . '_crop'])) :

                     update_option($value['id'] . '_crop', 1);

-                else :

-                    update_option($value['id'] . '_crop', 0);

+                else {
+                	:

+                    update_option($value['id'] . '_crop', 0);
+                }
                 endif;

             } else {

                 update_option($value['id'] . '_width', $value['std']);

                 update_option($value['id'] . '_height', $value['std']);

                 update_option($value['id'] . '_crop', 1);

-            }

-

-        elseif (isset($value['type']) && $value['type'] == 'map') :

+            } elseif (isset($value['type']) && $value['type'] == 'map') :

             $post_types = array();

             $categories = array();

 

@@ -523,8 +535,9 @@ 
                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

                     $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

+                    if (file_exists($img_path)) {
+                                            unlink($img_path);
+                    }
                 }

 

                 update_option($value['id'], '');

@@ -540,8 +553,10 @@ 
                 foreach ($uploadedfile as $key => $uplaod):

                     if ($key == 'name'):

                         $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

+                    else {
+                    	:

+                        $uplaods[$key] = $uplaod;
+                    }
                     endif;

                 endforeach;

 

@@ -551,8 +566,9 @@ 
                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

                     $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

+                    if (file_exists($img_path)) {
+                                            unlink($img_path);
+                    }
                 }

 

                 $upload_overrides = array('test_form' => false);

@@ -567,10 +583,12 @@ 
             endif;

 

 

-        else :

+        else {
+        	:

             // same menu setting per theme.

             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

-                $theme = wp_get_theme();

+                $theme = wp_get_theme();
+        }
                 update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

             }

 

@@ -582,8 +600,9 @@ 
 

         endif;

     }

-    if ($dummy)

-        $_POST = array();

+    if ($dummy) {
+            $_POST = array();
+    }
     return true;

 

 }

@@ -729,9 +748,12 @@ 
         $new_columns = array('location' => __('Location (ID)', 'geodirectory'),

             'categorys' => __('Categories', 'geodirectory'));

 

-        if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

+        if (($offset = array_search('author', array_keys($columns))) === false) {
+        	// if the key doesn't exist

         {

-            $offset = 0; // should we prepend $array with $data?

+            $offset = 0;
+        }
+        // should we prepend $array with $data?

             $offset = count($columns); // or should we append $array with $data? lets pick this one...

         }

 

@@ -791,11 +813,13 @@ 
                     $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

                 }

                 /* If no expire_date is found, output a default message. */

-                if (empty($expire_date))

-                    echo __('Unknown', 'geodirectory');

+                if (empty($expire_date)) {
+                                    echo __('Unknown', 'geodirectory');
+                }
                 /* If there is a expire_date, append 'days left' to the text string. */

-                else

-                    echo $expire_date . $date_diff_text;

+                else {
+                                    echo $expire_date . $date_diff_text;
+                }
                 break;

 

             /* If displaying the 'categorys' column. */

@@ -868,21 +892,26 @@ 
 

     $geodir_posttypes = geodir_get_posttypes();

 

-    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

-        return;

+    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+            return;
+    }
 

     if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

-        if (isset($_REQUEST['_status']))

-            geodir_change_post_status($post_id, $_REQUEST['_status']);

+        if (isset($_REQUEST['_status'])) {
+                    geodir_change_post_status($post_id, $_REQUEST['_status']);
+        }
 

-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

-            return;

+        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) {
+                    return;
+        }
 

-        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

-            return;

+        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) {
+                    return;
+        }
 

-        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

-            return;

+        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) {
+                    return;
+        }
 

         geodir_save_listing($_REQUEST);

     }

@@ -907,10 +936,18 @@ 
     $tab_id = '';

     $i = 0;

     foreach ($options as $value) :

-        if (!isset($value['name'])) $value['name'] = '';

-        if (!isset($value['class'])) $value['class'] = '';

-        if (!isset($value['css'])) $value['css'] = '';

-        if (!isset($value['std'])) $value['std'] = '';

+        if (!isset($value['name'])) {
+        	$value['name'] = '';
+        }
+        if (!isset($value['class'])) {
+        	$value['class'] = '';
+        }
+        if (!isset($value['css'])) {
+        	$value['css'] = '';
+        }
+        if (!isset($value['std'])) {
+        	$value['std'] = '';
+        }
         $desc = '';

         switch ($value['type']) :

             case 'dummy_installer':

@@ -926,11 +963,13 @@ 
 

                 $i++;

 

-                if (isset($value['id']) && $value['id'])

-                    $tab_id = $value['id'];

+                if (isset($value['id']) && $value['id']) {
+                                    $tab_id = $value['id'];
+                }
 

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+                if (isset($value['desc']) && $value['desc']) {
+                                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';
+                }
 

                 if (isset($value['name']) && $value['name']) {

                     if ($first_title === true) {

@@ -961,10 +1000,12 @@ 
                 break;

 

             case 'sectionstart':

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

-                if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

+                if (isset($value['desc']) && $value['desc']) {
+                                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';
+                }
+                if (isset($value['name']) && $value['name']) {
+                                    echo '<h3>' . $value['name'] . $desc . '</h3>';
+                }
                 /**

                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

                  *

@@ -972,7 +1013,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
+                }
                 echo '<table class="form-table">' . "\n\n";

 

                 break;

@@ -984,7 +1027,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
+                }
                 echo '</table>';

                 /**

                  * Called after a GeoDirectory settings sectionend is output in the GD settings page.

@@ -993,7 +1038,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
+                }
                 break;

             case 'text':

                 ?>

@@ -1084,17 +1131,32 @@ 
                     <?php _e('Width', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_width"

                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'] . '_width')) {
+	echo stripslashes($size);
+} else {
+	echo $value['std'];
+}
+?>"/>

 

                     <?php _e('Height', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_height"

                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'] . '_height')) {
+	echo stripslashes($size);
+} else {
+	echo $value['std'];
+}
+?>"/>

 

                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input

                             name="<?php echo esc_attr($value['id']); ?>_crop"

                             id="<?php echo esc_attr($value['id']); ?>_crop"

-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>

+                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') {
+	checked(get_option($value['id'] . '_crop'), 1);
+} else {
+	checked(1);
+}
+?> /></label>

 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

@@ -1108,17 +1170,22 @@ 
                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

-                                            class="<?php if (isset($value['class'])) echo $value['class']; ?>"

+                                            class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

                             $geodir_select_value = '';

                             if ($option_value != '') {

-                                if ($option_value != '' && $option_value == $key)

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

+                                if ($option_value != '' && $option_value == $key) {
+                                                                    $geodir_select_value = ' selected="selected" ';
+                                }
                             } else {

-                                if ($value['std'] == $key)

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

+                                if ($value['std'] == $key) {
+                                                                    $geodir_select_value = ' selected="selected" ';
+                                }
                             }

                             ?>

                             <option

@@ -1143,8 +1210,14 @@ 
                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

-                                            class="<?php if (isset($value['class'])) echo $value['class']; ?>"

-                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

+                                            class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"

+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) {
+	echo $value['placeholder_text'];
+}
+?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

@@ -1172,7 +1245,10 @@ 
                 <td class="forminp">

                     <input type="file" name="<?php echo esc_attr($value['id']); ?>"

                            id="<?php echo esc_attr($value['id']); ?>" style="<?php echo esc_attr($value['css']); ?>"

-                           class="<?php if (isset($value['class'])) echo $value['class']; ?>"/>

+                           class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"/>

                     <?php if (get_option($value['id'])) { ?>

                         <input type="hidden" name="<?php echo esc_attr($value['id']); ?>_remove"

                                id="<?php echo esc_attr($value['id']); ?>_remove" value="0">

@@ -1253,13 +1329,15 @@ 
                                 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

                             );

                             $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

+                            if (empty($geodir_default_map_language)) {
+                                                            $geodir_default_map_language = 'en';
+                            }
                             foreach ($arr_map_langages as $language_key => $language_txt) {

-                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

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

-                                else

-                                    $geodir_default_language_selected = '';

+                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) {
+                                                                    $geodir_default_language_selected = "selected='selected'";
+                                } else {
+                                                                    $geodir_default_language_selected = '';
+                                }
 

                                 ?>

                                 <option

@@ -1279,14 +1357,16 @@ 
                             <?php

                             $post_types = geodir_get_posttypes('array');

                             $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-                            if (empty($geodir_default_map_search_pt))

-                                $geodir_default_map_search_pt = 'gd_place';

+                            if (empty($geodir_default_map_search_pt)) {
+                                                            $geodir_default_map_search_pt = 'gd_place';
+                            }
                             if (is_array($post_types)) {

                                 foreach ($post_types as $key => $post_types_obj) {

-                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

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

-                                    else

-                                        $geodir_search_pt_selected = '';

+                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) {
+                                                                            $geodir_search_pt_selected = "selected='selected'";
+                                    } else {
+                                                                            $geodir_search_pt_selected = '';
+                                    }
 

                                     ?>

                                     <option

@@ -1406,7 +1486,7 @@ 
                                id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

                             echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+                        } elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

@@ -1426,10 +1506,18 @@ 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

                     <textarea

-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"

+                        <?php if (isset($value['args'])) {
+	echo $value['args'] . ' ';
+}
+?>name="<?php echo esc_attr($value['id']); ?>"

                         id="<?php echo esc_attr($value['id']); ?>"

                         <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

-                        style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span

+                        style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) {
+	echo esc_textarea(stripslashes(get_option($value['id'])));
+} else {
+	echo esc_textarea($value['std']);
+}
+?></textarea><span

                         class="description"><?php echo $value['desc'] ?></span>

 

                 </td>

@@ -1441,10 +1529,11 @@ 
                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><?php

-                    if (get_option($value['id']))

-                        $content = stripslashes(get_option($value['id']));

-                    else

-                        $content = $value['std'];

+                    if (get_option($value['id'])) {
+                                            $content = stripslashes(get_option($value['id']));
+                    } else {
+                                            $content = $value['std'];
+                    }
 

                     $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

 

@@ -1484,7 +1573,9 @@ 
                     'echo' => false,

                     'selected' => $page_setting);

 

-                if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

+                if (isset($value['args'])) {
+                	$args = wp_parse_args($value['args'], $args);
+                }
 

                 ?>

                 <tr valign="top" class="single_select_page">

@@ -1503,8 +1594,10 @@ 
                 if (strstr($country_setting, ':')) :

                     $country = current(explode(':', $country_setting));

                     $state = end(explode(':', $country_setting));

-                else :

-                    $country = $country_setting;

+                else {
+                	:

+                    $country = $country_setting;
+                }
                     $state = '*';

                 endif;

                 ?>

@@ -1531,8 +1624,10 @@ 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"

                             title="Country" class="chosen_select">

                         <?php

-                        if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+                        if ($countries) {
+                        	foreach ($countries as $key => $val) :

+                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';
+                        }
                         endforeach;

                         ?>

                     </select>

@@ -1770,8 +1865,9 @@ 
         endforeach;

     endif;

 

-    if (!empty($place_img_array))

-        $curImages = implode(',', $place_img_array);

+    if (!empty($place_img_array)) {
+            $curImages = implode(',', $place_img_array);
+    }
 

 

     // adjust values here

@@ -2117,16 +2213,17 @@ 
 	global $post, $typenow, $current_screen;

 	

 	$post_type = NULL;

-    if (isset($_REQUEST['post_type']))

-		$post_type = sanitize_key($_REQUEST['post_type']);

-    elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

-		$post_type = get_post_type($_REQUEST['post']);

-    elseif ($post && isset($post->post_type))

-		$post_type = $post->post_type;

-	elseif ($typenow)

-		$post_type = $typenow;

-	elseif ($current_screen && isset($current_screen->post_type))

-		$post_type = $current_screen->post_type;

+    if (isset($_REQUEST['post_type'])) {
+    		$post_type = sanitize_key($_REQUEST['post_type']);
+    } elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) {
+    		$post_type = get_post_type($_REQUEST['post']);
+    } elseif ($post && isset($post->post_type)) {
+    		$post_type = $post->post_type;
+    } elseif ($typenow) {
+			$post_type = $typenow;
+	} elseif ($current_screen && isset($current_screen->post_type)) {
+			$post_type = $current_screen->post_type;
+	}
 

 

 

@@ -2187,9 +2284,10 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

-        echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

-}

+    if(in_array($post_type, $post_types)) {
+            echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
+    }
+    }

 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

 

@@ -5419,8 +5517,9 @@ 
 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

     global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

-        return new stdClass;

+    if ( ! post_type_exists( $post_type ) ) {
+            return new stdClass;
+    }
         

     $table = $plugin_prefix . $post_type . '_detail';

 

@@ -6077,7 +6176,9 @@ 
 

     if ($page_found) :

         // Page exists

-        if (!$option_value) update_option($option, $page_found);

+        if (!$option_value) {
+        	update_option($option, $page_found);
+        }
         return;

     endif;

 

@@ -6488,7 +6589,7 @@ 
         

         if(is_array($accounts)){

             $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);

-        }elseif(get_option('geodir_ga_account_id')){

+        } elseif(get_option('geodir_ga_account_id')){

             $accounts = array();

             $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';

         }

@@ -6509,14 +6610,16 @@ 
     }

 

     # Create a new Gdata call

-    if ( trim(get_option('geodir_ga_auth_code')) != '' )

-        $stats = new GDGoogleAnalyticsStats();

-    else

-        return false;

+    if ( trim(get_option('geodir_ga_auth_code')) != '' ) {
+            $stats = new GDGoogleAnalyticsStats();
+    } else {
+            return false;
+    }
 

     # Check if Google sucessfully logged in

-    if ( ! $stats->checkLogin() )

-        return false;

+    if ( ! $stats->checkLogin() ) {
+            return false;
+    }
 

     # Get a list of accounts

     try {

@@ -6533,10 +6636,10 @@ 
     if ( count($accounts) > 0 ){

         update_option('geodir_gd_uids',$accounts);

         return $accounts;

+    } else {
+            return false;
+    }
     }

-    else

-        return false;

-}

 

 add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' );

 function geodir_ga_deauthorize(){

Spacing +960 added lines, -960 removed lines

@@ -28,31 +28,31 @@ 
      * @package GeoDirectory

      */

     function geodir_admin_styles() {

-        wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-admin-css', geodir_plugin_url().'/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-admin-css');

 

-        wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-frontend-style', geodir_plugin_url().'/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-frontend-style');

 

-        wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-chosen-style', geodir_plugin_url().'/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-chosen-style');

 

-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url().'/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

 

-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url().'/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-jquery-ui-css');

 

-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url().'/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-custom-fields-css');

 

-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url().'/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-pluplodar-css');

 

-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-rating-style', geodir_plugin_url().'/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-rating-style');

 

-        wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-rtl-style');

     }

 }

@@ -70,7 +70,7 @@ 
         wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('font-awesome');

 

-        wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-admin', geodir_plugin_url().'/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-admin');

 

     }

@@ -89,68 +89,68 @@ 
         

         wp_enqueue_script('jquery');

 

-        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

+        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

 

-        wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

+        wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

         wp_enqueue_script('chosen');

 

-        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-choose-ajax');

 

         if (isset($_REQUEST['listing_type'])) {

-            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url().'/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

         }

 

         wp_enqueue_script('geodirectory-custom-fields-script');

-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

+        $plugin_path = geodir_plugin_url().'/geodirectory-functions/cat-meta-functions';

 

-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

+        wp_enqueue_script('tax-meta-clss', $plugin_path.'/js/tax-meta-clss.js', array('jquery'), null, true);

 

         if (in_array($geodir_map_name, array('auto', 'google'))) {

-            $map_lang = "&language=" . geodir_get_map_default_language();

-            $map_key = "&key=" . geodir_get_map_api_key();

+            $map_lang = "&language=".geodir_get_map_default_language();

+            $map_key = "&key=".geodir_get_map_api_key();

             /** This filter is documented in geodirectory_template_tags.php */

             $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-            wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);

+            wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);

             

             // Overlapping Marker Spiderfier

-            wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-g-overlappingmarker-script');

         }

         

         if ($geodir_map_name == 'osm') {

             // Leaflet OpenStreetMap

-            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

             wp_enqueue_style('geodirectory-leaflet-style');

                 

-            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-script');

             

-            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-geo-script');

             

             // Overlapping Marker Spiderfier Leaflet

-            wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-o-overlappingmarker-script');

         }

-        wp_enqueue_script( 'jquery-ui-autocomplete' );

+        wp_enqueue_script('jquery-ui-autocomplete');

         

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

         wp_enqueue_script('geodirectory-goMap-script');

 

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

-			wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);

+			wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);

 			wp_enqueue_script('geodir-barrating-js');

 		} else { // default rating script

-			wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);

+			wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);

 			wp_enqueue_script('geodir-jRating-js');

 		}

 

-        wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodir-on-document-load');

 

 

@@ -158,7 +158,7 @@ 
         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-plupload-script');

 

         // SCRIPT FOR UPLOAD END

@@ -212,7 +212,7 @@ 
         wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

 

 

-        wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-admin-script', geodir_plugin_url().'/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-admin-script');

 

         wp_enqueue_style('farbtastic');

@@ -220,10 +220,10 @@ 
 

         $screen = get_current_screen();

         if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

+            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation_admin.js');

         }

 

-        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));

+        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl').'?geodir_ajax=true')));

         wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

 

     }

@@ -246,7 +246,7 @@ 
 

         if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

 

-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

+        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url().'/geodirectory-assets/images/favicon.ico', '55.1984');

 

 

     }

@@ -280,7 +280,7 @@ 
                 $geodir_menu_order[] = 'separator-geodirectory';

                 if (!empty($post_types)) {

                     foreach ($post_types as $post_type) {

-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

+                        $geodir_menu_order[] = 'edit.php?post_type='.$post_type;

                     }

                 }

                 $geodir_menu_order[] = $item;

@@ -323,8 +323,8 @@ 
 {

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

         echo '<div id="message" class="updated fade">

-                        <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>

-                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>

+                        <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory').' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">'.__('Support us by leaving a rating!', 'geodirectory').'</a></p>

+                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory').'</strong></p>

                 </div>';

 

     }

@@ -332,7 +332,7 @@ 
     if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {

         switch ($_REQUEST['msg']) {

             case 'success':

-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

+                echo '<div id="message" class="updated fade"><p><strong>'.__('Your settings have been saved.', 'geodirectory').'</strong></p></div>';

                 flush_rewrite_rules(false);

 

                 break;

@@ -340,30 +340,30 @@ 
 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

 				

 				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

+			    	echo '<div id="message" class="error fade"><p><strong>'.__('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory').'</strong></p></div>';

 				else

-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

+					echo '<div id="message" class="error fade"><p><strong>'.__('Error: Your settings have not been saved, please try again.', 'geodirectory').'</strong></p></div>';

                 break;

         }

     }

 

     $geodir_load_map = get_option('geodir_load_map');

     $need_map_key = false;

-    if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

+    if ($geodir_load_map == '' || $geodir_load_map == 'google' || $geodir_load_map == 'auto') {

         $need_map_key = true;

     }

 

     if (!geodir_get_map_api_key() && $need_map_key) {

-        echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

+        echo '<div class="error"><p><strong>'.sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings').'\'>', '</a>').'</strong></p></div>';

     }

 

     if (!geodir_is_default_location_set()) {

-        echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+        echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';

 

     }

 

     if (!function_exists('curl_init')) {

-        echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

+        echo '<div class="error"><p><strong>'.__('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory').'</strong></p></div>';

 

     }

 

@@ -383,18 +383,18 @@ 
 function geodir_handle_option_form_submit($current_tab)

 {

     global $geodir_settings;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

+    if (file_exists(dirname(__FILE__).'/option-pages/'.$current_tab.'_array.php')) {

         /**

          * Contains settings array for current tab.

          *

          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once('option-pages/' . $current_tab . '_array.php');

+        include_once('option-pages/'.$current_tab.'_array.php');

     }

     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

         if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+        if (!wp_verify_nonce($_REQUEST['_wpnonce-'.$current_tab], 'geodir-settings-'.$current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -427,13 +427,13 @@ 
          * @param string $current_tab The current settings tab name.

          * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

          */

-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

+        do_action('geodir_update_options_'.$current_tab, $geodir_settings[$current_tab]);

 

         flush_rewrite_rules(false);

 

         $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

 

-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

+        $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$_REQUEST['active_tab'].'&msg=success');

 

         wp_redirect($redirect_url);

         exit();

@@ -472,18 +472,18 @@ 
 

         elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

-                if (isset($_POST[$value['id'] . '_crop'])) :

-                    update_option($value['id'] . '_crop', 1);

+            if (isset($value['id']) && isset($_POST[$value['id'].'_width'])) {

+                update_option($value['id'].'_width', $_POST[$value['id'].'_width']);

+                update_option($value['id'].'_height', $_POST[$value['id'].'_height']);

+                if (isset($_POST[$value['id'].'_crop'])) :

+                    update_option($value['id'].'_crop', 1);

                 else :

-                    update_option($value['id'] . '_crop', 0);

+                    update_option($value['id'].'_crop', 0);

                 endif;

             } else {

-                update_option($value['id'] . '_width', $value['std']);

-                update_option($value['id'] . '_height', $value['std']);

-                update_option($value['id'] . '_crop', 1);

+                update_option($value['id'].'_width', $value['std']);

+                update_option($value['id'].'_height', $value['std']);

+                update_option($value['id'].'_crop', 1);

             }

 

         elseif (isset($value['type']) && $value['type'] == 'map') :

@@ -525,12 +525,12 @@ 
         elseif (isset($value['type']) && $value['type'] == 'file') :

 

 

-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

+            if (isset($_POST[$value['id'].'_remove']) && $_POST[$value['id'].'_remove']) {// if remove is set then remove the file

 

                 if (get_option($value['id'])) {

                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

+                    $img_path = $uploads['path'].'/'.$noimg_name;

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

@@ -558,7 +558,7 @@ 
                 if (get_option($value['id'])) {

                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

+                    $img_path = $uploads['path'].'/'.$noimg_name;

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

@@ -579,7 +579,7 @@ 
             // same menu setting per theme.

             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

                 $theme = wp_get_theme();

-                update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

+                update_option('geodir_theme_location_nav_'.$theme->name, $_POST[$value['id']]);

             }

 

             if (isset($value['id']) && isset($_POST[$value['id']])) {

@@ -649,7 +649,7 @@ 
 

             $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory');

 

-            $tabs[$geodir_post_type . '_fields_settings'] = array(

+            $tabs[$geodir_post_type.'_fields_settings'] = array(

                 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),

                 'subtabs' => array(

                     array('subtab' => 'custom_fields',

@@ -683,7 +683,7 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

-    wp_enqueue_script( 'jquery-ui-progressbar' );

+    wp_enqueue_script('jquery-ui-progressbar');

     $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

     return $tabs;

 }

@@ -717,7 +717,7 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

-    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');

+    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory').' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');

     return $tabs;

 }

 

@@ -777,8 +777,8 @@ 
                     _e('Unknown', 'geodirectory');

                 } else {

                     /* If there is a city id, append 'city name' to the text string. */

-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

+                    $add_location_id = $location_id > 0 ? ' ('.$location_id.')' : '';

+                    echo(__($location->country, 'geodirectory').'-'.$location->region.'-'.$location->city.$add_location_id);

                 }

                 break;

 

@@ -796,14 +796,14 @@ 
                         $expire_class = 'expire_over';

                     }

                     $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

+                    $date_diff_text = '<br /><span class="'.$expire_class.'">('.$date_diff.' '.$state.')</span>';

                 }

                 /* If no expire_date is found, output a default message. */

                 if (empty($expire_date))

                     echo __('Unknown', 'geodirectory');

                 /* If there is a expire_date, append 'days left' to the text string. */

                 else

-                    echo $expire_date . $date_diff_text;

+                    echo $expire_date.$date_diff_text;

                 break;

 

             /* If displaying the 'categorys' column. */

@@ -870,7 +870,7 @@ 
 function geodir_post_information_save($post_id, $post) {

     global $wpdb, $current_user;

 

-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

+    if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {

         return;

     }

 

@@ -938,7 +938,7 @@ 
                     $tab_id = $value['id'];

 

                 if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+                    $desc = '<span style=" text-transform:none;">:- '.$value['desc'].'</span>';

 

                 if (isset($value['name']) && $value['name']) {

                     if ($first_title === true) {

@@ -946,9 +946,9 @@ 
                     } else {

                         echo '</div>';

                     }

-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

+                    echo '<dd id="'.trim($tab_id).'" class="geodir_option_tabs" ><a href="javascript:void(0);">'.$value['name'].'</a></dd>';

 

-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+                    echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';

                 }

 

                 /**

@@ -958,21 +958,21 @@ 
                  *

                  * @since 1.0.0

                  */

-                do_action('geodir_settings_' . sanitize_title($value['id']));

+                do_action('geodir_settings_'.sanitize_title($value['id']));

                 break;

 

             case 'no_tabs':

 

                 echo '<div class="inner_content_tab_main">';

-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+                echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';

 

                 break;

 

             case 'sectionstart':

                 if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

+                    $desc = '<span style=" text-transform:none;"> - '.$value['desc'].'</span>';

                 if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

+                    echo '<h3>'.$value['name'].$desc.'</h3>';

                 /**

                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

                  *

@@ -980,8 +980,8 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

-                echo '<table class="form-table">' . "\n\n";

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_start');

+                echo '<table class="form-table">'."\n\n";

 

                 break;

             case 'sectionend':

@@ -992,7 +992,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_end');

                 echo '</table>';

                 /**

                  * Called after a GeoDirectory settings sectionend is output in the GD settings page.

@@ -1001,7 +1001,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_after');

                 break;

             case 'text':

                 ?>

@@ -1010,7 +1010,7 @@ 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>"

                                            type="<?php echo esc_attr($value['type']); ?>"

-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style=" <?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

                                                echo esc_attr(stripslashes(get_option($value['id'])));

@@ -1027,14 +1027,14 @@ 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>"

                                            type="<?php echo esc_attr($value['type']); ?>"

-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style=" <?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

                                                echo esc_attr(stripslashes(get_option($value['id'])));

                                            } else {

                                                echo esc_attr($value['std']);

                                            } ?>"/>

-                    <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>

+                    <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )', 'geodirectory'); ?>" ><?php _e('Generate API Key', 'geodirectory'); ?></a>

                     <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

                 break;

@@ -1046,7 +1046,7 @@ 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>"

                                            type="<?php echo esc_attr($value['type']); ?>"

-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

                                                echo esc_attr(stripslashes(get_option($value['id'])));

@@ -1092,17 +1092,17 @@ 
                     <?php _e('Width', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_width"

                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'].'_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

 

                     <?php _e('Height', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_height"

                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'].'_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

 

                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input

                             name="<?php echo esc_attr($value['id']); ?>_crop"

                             id="<?php echo esc_attr($value['id']); ?>_crop"

-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>

+                            type="checkbox" <?php if (get_option($value['id'].'_crop') != '') checked(get_option($value['id'].'_crop'), 1); else checked(1); ?> /></label>

 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

@@ -1152,7 +1152,7 @@ 
                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"

-                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text']; ?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

@@ -1162,7 +1162,7 @@ 
                                 ?></optgroup><?php

                             } else {

                                 ?>

-                                <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>>

+                                <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values))); ?>>

                                     <?php echo geodir_utf8_ucfirst($val) ?>

                                 </option>

                             <?php

@@ -1199,7 +1199,7 @@ 
                 ?>

 

                 <tr valign="top">

-                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>

+                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_language" style="width:60%">

                             <?php

@@ -1281,7 +1281,7 @@ 
 

                 <tr valign="top">

                     <th class="titledesc"

-                        width="40%"><?php _e('Default post type search on map', 'geodirectory');?></th>

+                        width="40%"><?php _e('Default post type search on map', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_search_pt" style="width:60%">

                             <?php

@@ -1322,7 +1322,7 @@ 
                         $cat_display = 'checkbox';

                         $gd_post_types = get_option('geodir_exclude_post_type_on_map');

                         $gd_cats = get_option('geodir_exclude_cat_on_map');

-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

+                        $gd_cats_upgrade = (int) get_option('geodir_exclude_cat_on_map_upgrade');

                         $count = 1;

                         ?>

                         <table width="70%" class="widefat">

@@ -1351,7 +1351,7 @@ 
                                                                                            name="home_map_post_types[]"

                                                                                            id="<?php echo esc_attr($value['id']); ?>"

                                                                                            value="<?php echo $key; ?>"

-                                                                                           class="map_post_type" <?php echo $checked;?> />

+                                                                                           class="map_post_type" <?php echo $checked; ?> />

                                         <?php echo __($post_types_obj->labels->singular_name, 'geodirectory'); ?></td>

                                     <td width="40%">

                                         <div class="home_map_category" style="overflow:auto;width:200px;height:100px;"

@@ -1409,12 +1409,12 @@ 
                 ?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

-                    <label for="<?php echo $value['id'];?>">

+                    <label for="<?php echo $value['id']; ?>">

                         <input name="<?php echo esc_attr($value['id']); ?>"

-                               id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

+                               id="<?php echo esc_attr($value['id'].$value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

                             echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+                        }elseif (get_option($value['id']) == '' && $value['std'] == $value['value']) {echo 'checked="checked"'; } ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

@@ -1434,9 +1434,9 @@ 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

                     <textarea

-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"

+                        <?php if (isset($value['args'])) echo $value['args'].' '; ?>name="<?php echo esc_attr($value['id']); ?>"

                         id="<?php echo esc_attr($value['id']); ?>"

-                        <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                        <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                         style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span

                         class="description"><?php echo $value['desc'] ?></span>

 

@@ -1481,7 +1481,7 @@ 
 					}

 				}

 				//

-				$page_setting = (int)get_option($value['id']);

+				$page_setting = (int) get_option($value['id']);

 

                 $args = array('name' => $value['id'],

                     'id' => $value['id'],

@@ -1498,7 +1498,7 @@ 
                 <tr valign="top" class="single_select_page">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

-                    <?php echo str_replace(' id=', " data-placeholder='" . __('Select a page...', 'geodirectory') . "' style='" . $value['css'] . "' class='" . $value['class'] . "' " . $disabled . " id=", wp_dropdown_pages($args)); ?>

+                    <?php echo str_replace(' id=', " data-placeholder='".__('Select a page...', 'geodirectory')."' style='".$value['css']."' class='".$value['class']."' ".$disabled." id=", wp_dropdown_pages($args)); ?>

                     <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

@@ -1507,7 +1507,7 @@ 
 				}

                 break;

             case 'single_select_country' :

-                $country_setting = (string)get_option($value['id']);

+                $country_setting = (string) get_option($value['id']);

                 if (strstr($country_setting, ':')) :

                     $country = current(explode(':', $country_setting));

                     $state = end(explode(':', $country_setting));

@@ -1530,7 +1530,7 @@ 
             case 'multi_select_countries' :

                 $countries = $geodirectory->countries->countries;

                 asort($countries);

-                $selections = (array)get_option($value['id']);

+                $selections = (array) get_option($value['id']);

                 ?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1540,7 +1540,7 @@ 
                             title="Country" class="chosen_select">

                         <?php

                         if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+                            echo '<option value="'.$key.'" '.selected(in_array($key, $selections), true, false).'>'.$val.'</option>';

                         endforeach;

                         ?>

                     </select>

@@ -1552,7 +1552,7 @@ 
                 break;

 

             case 'google_analytics' :

-                $selections = (array)get_option($value['id']);

+                $selections = (array) get_option($value['id']);

                     ?>

                     <tr valign="top">

                         <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1563,30 +1563,30 @@ 
 

                             $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

                             $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

-                            $state = "&state=123";//any string

-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+                            $state = "&state=123"; //any string

+                            $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";

                             $response_type = "&response_type=code";

                             $client_id = "&client_id=".get_option('geodir_ga_client_id');

                             $access_type = "&access_type=offline";

                             $approval_prompt = "&approval_prompt=force";

 

-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

+                            $auth_url = $oAuthURL.$scope.$state.$redirect_uri.$response_type.$client_id.$access_type.$approval_prompt;

 

 

                             if (get_option('geodir_ga_auth_token')) {

                                 ?>

                                 <span class="button-primary"

-                                      onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>

+                                      onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize'); ?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>

                                 <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>

                             <?php

                                 global $gd_ga_errors;

-                                if(!empty($gd_ga_errors)){

+                                if (!empty($gd_ga_errors)) {

                                     print_r($gd_ga_errors);

                                 }

                             } else {

                                 ?>

                                 <span class="button-primary"

-                                      onclick="window.open('<?php echo  geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>

+                                      onclick="window.open('<?php echo  geodir_ga_activation_url(); ?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory'); ?></span>

                             <?php

                             }

                             ?>

@@ -1657,9 +1657,9 @@ 
 

             <?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>

             jQuery('.geodir_option_tabs').removeClass('gd-tab-active');

-            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').addClass('gd-tab-active');

+            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').addClass('gd-tab-active');

             jQuery('.gd-content-heading').hide();

-            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').show();

+            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').show();

             <?php } ?>

         });

     </script>

@@ -1745,7 +1745,7 @@ 
     wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

     if (geodir_get_featured_image($post_id, 'thumbnail')) {

-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

+        echo '<h4>'.__('Featured Image', 'geodirectory').'</h4>';

         geodir_show_featured_image($post_id, 'thumbnail');

     }

 

@@ -1756,13 +1756,13 @@ 
 

     <h5 class="form_title">

         <?php if ($image_limit != 0 && $image_limit == 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit != 0 && $image_limit > 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit == 0) {

-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';

         } ?>

     </h5>

 

@@ -1801,10 +1801,10 @@ 
         <div

             class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

             id="<?php echo $id; ?>plupload-upload-ui">

-            <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>

+            <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>

             <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                    value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>

-            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>

+            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span>

             <?php if ($width && $height): ?>

                 <span class="plupload-resize"></span>

                 <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span>

@@ -1816,7 +1816,7 @@ 
              id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">

         </div>

         <span

-            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>

+            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>

         <span id="<?php echo $id; ?>upload-error" style="display:none"></span>

     </div>

 

@@ -2026,9 +2026,9 @@ 
     $plugin = 'avada-nag';

     $timestamp = 'avada-nag1234';

     $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

-    echo '<div id="' . $timestamp . '"  class="error">';

-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

+    echo '<div id="'.$timestamp.'"  class="error">';

+    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\''.$plugin.'\',\''.$timestamp.'\');" ><i class="fa fa-times"></i></span>';

+    echo "<img class='gd-icon-noti' src='".plugin_dir_url('')."geodirectory/geodirectory-assets/images/favicon.ico' > ";

     echo "<p>$message</p>";

     echo "</div>";

 

@@ -2162,7 +2162,7 @@ 
 		

 		// Don't allow same slug url for listing and location

 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

-			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

+			$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab.'&msg=fail&gderr=21');

         	wp_redirect($redirect_url);

 			exit;

 		}

@@ -2174,7 +2174,7 @@ 
 			$default_language = $sitepress->get_default_language();

 			

 			if ($current_language != 'all' && $current_language != $default_language) {

-				$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);

+				$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab);

 				wp_redirect($redirect_url);

 				exit;

 			}

@@ -2195,11 +2195,11 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

+    if (in_array($post_type, $post_types))

         echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

 }

-add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

-add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

+add_action('admin_head-post-new.php', 'geodir_hide_admin_preview_button');

+add_action('admin_head-post.php', 'geodir_hide_admin_preview_button');

 

 /**

  * Add the tab in left sidebar menu fro import & export page.

@@ -2209,8 +2209,8 @@ 
  *

  * @return array Array of tab data.

  */

-function geodir_import_export_tab( $tabs ) {

-	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

+function geodir_import_export_tab($tabs) {

+	$tabs['import_export'] = array('label' => __('Import & Export', 'geodirectory'));

     return $tabs;

 }

 

@@ -2224,8 +2224,8 @@ 
  * @return string Html content.

  */

 function geodir_import_export_page() {

-	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

-	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

+	$nonce = wp_create_nonce('geodir_import_export_nonce');

+	$gd_cats_sample_csv = geodir_plugin_url().'/geodirectory-assets/gd_sample_categories.csv';

     /**

      * Filter sample category data csv file url.

      *

@@ -2234,9 +2234,9 @@ 
      *

      * @param string $gd_cats_sample_csv Sample category data csv file url.

      */

-	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

+	$gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);

 	

-	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

+	$gd_posts_sample_csv = geodir_plugin_url().'/geodirectory-assets/place_listing.csv';

     /**

      * Filter sample post data csv file url.

      *

@@ -2245,15 +2245,15 @@ 
      *

      * @param string $gd_posts_sample_csv Sample post data csv file url.

      */

-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

+    $gd_posts_sample_csv = apply_filters('geodir_export_posts_sample_csv', $gd_posts_sample_csv);

 	

-	$gd_posttypes = geodir_get_posttypes( 'array' );

+	$gd_posttypes = geodir_get_posttypes('array');

 	

 	$gd_posttypes_option = '';

-	foreach ( $gd_posttypes as $gd_posttype => $row ) {

-		$gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>';

+	foreach ($gd_posttypes as $gd_posttype => $row) {

+		$gd_posttypes_option .= '<option value="'.$gd_posttype.'" data-cats="'.(int) geodir_get_terms_count($gd_posttype).'" data-posts="'.(int) geodir_get_posts_count($gd_posttype).'">'.__($row['labels']['name'], 'geodirectory').'</option>';

 	}

-	wp_enqueue_script( 'jquery-ui-progressbar' );

+	wp_enqueue_script('jquery-ui-progressbar');

 	

 	$gd_chunksize_options = array();

 	$gd_chunksize_options[100] = 100;

@@ -2275,50 +2275,50 @@ 
      *

      * @param string $gd_chunksize_options Entries options.

      */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+    $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);

 	

 	$gd_chunksize_option = '';

 	foreach ($gd_chunksize_options as $value => $title) {

-		$gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>';

+		$gd_chunksize_option .= '<option value="'.$value.'" '.selected($value, 5000, false).'>'.$title.'</option>';

 	}

 	

 	$uploads = wp_upload_dir();

-	$upload_dir = wp_sprintf( CSV_TRANSFER_IMG_FOLDER, str_replace( ABSPATH, '', $uploads['path'] ) );

+	$upload_dir = wp_sprintf(CSV_TRANSFER_IMG_FOLDER, str_replace(ABSPATH, '', $uploads['path']));

 ?>

 </form>

 <div class="inner_content_tab_main gd-import-export">

-  <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3>

-  <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span>

+  <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>

+  <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>

   <div class="gd-content-heading">

 

   <?php

     ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

+    $ini_max_execution_time_check = @ini_get('max_execution_time');

     ini_restore('max_execution_time');

 

-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

+    if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting

         ?>

 	<div id="gd_ie_reqs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div class="postbox">

-          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'PHP Requirements for GD Import & Export CSV', 'geodirectory' );?></span></h3>

+          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __('PHP Requirements for GD Import & Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

-            <span class="description"><?php echo __( 'Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory' );?></span>

+            <span class="description"><?php echo __('Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory'); ?></span>

 			<table class="form-table">

 				<thead>

 				  <tr>

-				  	<th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th>

+				  	<th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>

 				  </tr>

 				</thead>

 				<tbody>

 				  <tr>

-				  	<td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td>

+				  	<td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>max_execution_time</td><td><?php  echo @ini_get( 'max_execution_time' );?></td><td>3000</td>

+				  	<td>max_execution_time</td><td><?php  echo @ini_get('max_execution_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td>

+				  	<td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>

 				  </tr>

 				</tbody>

 		    </table>

@@ -2330,21 +2330,21 @@ 
 	<div id="gd_ie_imposts" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_im_posts" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Listings: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Listings: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e( 'Update listing if post with post_id already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e( 'Ignore listing if post with post_id already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e('Update listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e('Ignore listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_post_file" class="gd-imex-file gd_im_post_file" id="gd_im_post" onclick="jQuery('#gd_im_postplupload-browse-button').trigger('click');" />

-							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

-						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" />

+							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

+						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" />

 						<input type="hidden" id="gd_im_post_allowed_types" data-exts=".csv" value="csv" />

 							<?php

 							/**

@@ -2354,7 +2354,7 @@ 
 							 */

 							do_action('geodir_sample_csv_download_link');

 							?>

-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span>

+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_postpluploadan'); ?>"></span>

 							<div class="filelist"></div>

 						</div>

 						<span id="gd_im_postupload-error" style="display:none"></span>

@@ -2372,7 +2372,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -2384,10 +2384,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'post')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

 							<div id="gd_process_data" style="display:none">

-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>

+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>

 							</div>

 						</div>

 					</td>

@@ -2401,30 +2401,30 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

 	  <div class="meta-box-sortables ui-sortable">

 		<div id="gd_ie_ex_posts" class="postbox gd-hndle-pbox">

-		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - Listings: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3>

+		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - Listings: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Export CSV', 'geodirectory'); ?></span></h3>

 		  <div class="inside">

 			<table class="form-table">

 			  <tbody>

 				<tr>

 				  <td class="fld"><label for="gd_post_type">

-					<?php _e( 'Post Type:', 'geodirectory' );?>

+					<?php _e('Post Type:', 'geodirectory'); ?>

 					</label></td>

 				  <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px">

-					  <?php echo $gd_posttypes_option;?>

+					  <?php echo $gd_posttypes_option; ?>

 					</select></td>

 				</tr>

 				<tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				</tr>

                 <tr class="gd-imex-dates">

-					<td class="fld"><label><?php _e( 'Published Date:', 'geodirectory' );?></label></td>

-					<td><label><span class="label-responsive"><?php _e( 'Start date:', 'geodirectory' );?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e( 'End date:', 'geodirectory' );?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

+					<td class="fld"><label><?php _e('Published Date:', 'geodirectory'); ?></label></td>

+					<td><label><span class="label-responsive"><?php _e('Start date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e('End date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

 				</tr>

 				<tr>

 				  <td class="fld" style="vertical-align:top"><label>

-					<?php _e( 'Progress:', 'geodirectory' );?>

+					<?php _e('Progress:', 'geodirectory'); ?>

 					</label></td>

 				  <td><div id='gd_progressbar_box'>

 					  <div id="gd_progressbar" class="gd_progressbar">

@@ -2432,13 +2432,13 @@ 
 					  </div>

 					</div>

 					<p style="display:inline-block">

-					  <?php _e( 'Elapsed Time:', 'geodirectory' );?>

+					  <?php _e('Elapsed Time:', 'geodirectory'); ?>

 					</p>

 					  

 					<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				</tr>

 				<tr class="gd-ie-actions">

-				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

+				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

 				  </td>

 				  <td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				</tr>

@@ -2451,21 +2451,21 @@ 
 	<div id="gd_ie_imcategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_imcats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e( 'Update item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e( 'Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e('Update item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e('Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_cat_file" class="gd-imex-file gd_im_cat_file" id="gd_im_cat" onclick="jQuery('#gd_im_catplupload-browse-button').trigger('click');" />

-							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

-						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" />

+							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

+						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" />

 						<input type="hidden" id="gd_im_cat_allowed_types" data-exts=".csv" value="csv" />

 						<?php

 						/**

@@ -2476,7 +2476,7 @@ 
 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span>

+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_catpluploadan'); ?>"></span>

 							<div class="filelist"></div>

 						</div>

 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -2493,7 +2493,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -2505,10 +2505,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'cat')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

 							<div id="gd_process_data" style="display:none">

-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>

+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>

 							</div>

 						</div>

 					</td>

@@ -2522,26 +2522,26 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_ex_cats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

-					<td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td>

-					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td>

+					<td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td>

 				  </tr>

 				   <tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				  </tr>

 				  <tr>

-					<td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td>

-					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e( 'Elapsed Time:', 'geodirectory' );?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

+					<td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>

+					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e('Elapsed Time:', 'geodirectory'); ?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				  </tr>

 				  <tr class="gd-ie-actions">

 					<td style="vertical-align:top">

-						<input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

+						<input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

 					</td>

 					<td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				  </tr>

@@ -2563,7 +2563,7 @@ 
      * @param array $gd_chunksize_options File chunk size options.

      * @param string $nonce Wordpress security token for GD import & export.

 	 */

-	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

+	do_action('geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce);

 	?>

   </div>

 </div>

@@ -2582,7 +2582,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce;?>',

+            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce; ?>',

             dataType: 'json',

             cache: false,

             success: function(data) {

@@ -2634,7 +2634,7 @@ 
 

         jQuery(cont).find('.filelist .file').remove();

         

-        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr( PLZ_SELECT_CSV_FILE );?></p>");

+        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr(PLZ_SELECT_CSV_FILE); ?></p>");

         jQuery('#gd-import-msg', cont).show();

         

         return false;

@@ -2693,7 +2693,7 @@ 
     jQuery.ajax({

         url: ajaxurl,

         type: "POST",

-        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce;?>',

+        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce; ?>',

         dataType : 'json',

         cache: false,

         success: function (data) {

@@ -2882,27 +2882,27 @@ 
 

     var gdMsg = '<p></p>';

     if ( processed > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( 'Total %s item(s) found.', 'geodirectory' ), '%s' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('Total %s item(s) found.', 'geodirectory'), '%s')); ?></p>';

         msgParse = msgParse.replace("%s", processed);

         gdMsg += msgParse;

     }

 

     if ( updated > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) updated.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) updated.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", updated);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

     }

 

     if ( created > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) added.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) added.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", created);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

     }

 

     if ( skipped > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) ignored due to already exists.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) ignored due to already exists.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", skipped);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

@@ -2912,17 +2912,17 @@ 
         if (type=='loc') {

             invalid_addr = invalid;

         }

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", invalid_addr);

         msgParse = msgParse.replace("%d", total);

         gdMsg += msgParse;

     }

 

     if (invalid > 0 && type!='loc') {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory'), '%s', '%d')); ?></p>';

         

         if (type=='hood') {

-            msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ), '%s', '%d' ) );?></p>';

+            msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory'), '%s', '%d')); ?></p>';

         }

         msgParse = msgParse.replace("%s", invalid);

         msgParse = msgParse.replace("%d", total);

@@ -2930,7 +2930,7 @@ 
     }

 

     if (images > 0) {

-        gdMsg += '<p><?php echo addslashes( $upload_dir );?></p>';

+        gdMsg += '<p><?php echo addslashes($upload_dir); ?></p>';

     }

     gdMsg += '<p></p>';

     jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);

@@ -3094,9 +3094,9 @@ 
             if (typeof filters !== 'undefined' && filters && doFilter) {

                 getTotal = true;

                 attach += '&_c=1';

-                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Preparing...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Preparing...', 'geodirectory')); ?>');

             } else {

-                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

             }

             jQuery(el).find('#gd_timer').text('00:00:01');

             jQuery('#gd_ie_ex_files', el).html('');

@@ -3105,7 +3105,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page + attach,

+            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page + attach,

             dataType : 'json',

             cache: false,

             beforeSend: function (jqXHR, settings) {},

@@ -3130,11 +3130,11 @@ 
                         } else {

                             if (pages < page || pages == page) {

                                 window.clearInterval(timer_posts);

-                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                             } else {

                                 var percentage = Math.round(((page * chunk_size) / total_posts) * 100);

                                 percentage = percentage > 100 ? 100 : percentage;

-                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

                             }

                             if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                                 var obj_files = data.files;

@@ -3165,7 +3165,7 @@ 
 

     function gd_process_export_cats(el, post_type, total_cats, chunk_size, pages, page) {

         if (page < 2) {

-            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

             jQuery(el).find('#gd_timer').text('00:00:01');

             jQuery('#gd_ie_ex_files', el).html('');

         }

@@ -3173,7 +3173,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page,

+            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page,

             dataType : 'json',

             cache: false,

             beforeSend: function (jqXHR, settings) {},

@@ -3187,11 +3187,11 @@ 
                     } else {

                         if (pages < page || pages == page) {

                             window.clearInterval(timer_cats);

-                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                         } else {

                             var percentage = Math.round(((page * chunk_size) / total_cats) * 100);

                             percentage = percentage > 100 ? 100 : percentage;

-                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');

+                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');

                         }

                         if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                             var obj_files = data.files;

@@ -3248,13 +3248,13 @@ 
 function geodir_init_filesystem()

 {

 

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

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

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

     }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

         /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

@@ -3267,7 +3267,7 @@ 
         return $wp_filesystem;

         /* do our file manipulations below */

     } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

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

  */

 function geodir_filesystem_notice()

-{   if ( defined( 'DOING_AJAX' ) ){return;}

+{   if (defined('DOING_AJAX')) {return; }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

     } elseif (!defined('FTP_USER')) {

@@ -3343,64 +3343,64 @@ 
     // try to set higher limits for import

     $max_input_time = ini_get('max_input_time');

     $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+    $memory_limit = ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

+    if (!$max_input_time || $max_input_time < 3000) {

         ini_set('max_input_time', 3000);

     }

 

-    if(!$max_execution_time || $max_execution_time<3000){

+    if (!$max_execution_time || $max_execution_time < 3000) {

         ini_set('max_execution_time', 3000);

     }

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

+    if ($memory_limit && str_replace('M', '', $memory_limit)) {

+        if (str_replace('M', '', $memory_limit) < 256) {

             ini_set('memory_limit', '256M');

         }

     }

 

     $json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

+    if (!current_user_can('manage_options')) {

+        wp_send_json($json);

     }

 

-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+    $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL;

+    $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL;

+    $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

+    if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {

+        wp_send_json($json);

     }

 

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

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+    $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL;

+    $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL;

     $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+    $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1;

 

     $wp_filesystem = geodir_init_filesystem();

     if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');

+        wp_send_json($json);

     }

 

     if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: '.$wp_filesystem->errors->get_error_message(), 'geodirectory');

+        wp_send_json($json);

     }

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

+    $csv_file_dir = geodir_path_import_export(false);

+    if (!$wp_filesystem->is_dir($csv_file_dir)) {

+        if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {

+            $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');

+            wp_send_json($json);

         }

     }

     

     $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

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

 

-    switch ( $task ) {

+    switch ($task) {

         case 'export_posts': {

             // WPML

             $is_wpml = geodir_is_wpml();

@@ -3411,36 +3411,36 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            if ( $post_type == 'gd_event' ) {

-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+            if ($post_type == 'gd_event') {

+                add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);

             }

-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+            $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

             

-            $file_name = $post_type . '_' . date( 'dmyHi' );

-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

+            $file_name = $post_type.'_'.date('dmyHi');

+            if ($filters && isset($filters['start_date']) && isset($filters['end_date'])) {

+                $file_name = $post_type.'_'.date_i18n('dmy', strtotime($filters['start_date'])).'_'.date_i18n('dmy', strtotime($filters['end_date']));

             }

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

+            $posts_count = geodir_get_posts_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

 

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

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

                 $json['total'] = $posts_count;

                 // WPML

                 if ($is_wpml) {

                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

-            } else if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            } else if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3448,45 +3448,45 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

             } else {

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$posts_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_posts = $posts_count;

                     if ($chunk_per_page > $total_posts) {

                         $chunk_per_page = $total_posts;

                     }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_posts / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+                    $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_posts, $clear);

                     }

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $posts_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

@@ -3494,7 +3494,7 @@ 
                             $json['total'] = $posts_count;

                             $json['files'] = array();

                         } else {

-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                            $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                         }

                     }

                 }

@@ -3503,7 +3503,7 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -3517,20 +3517,20 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            $file_name = $post_type . 'category_' . date( 'dmyHi' );

+            $file_name = $post_type.'category_'.date('dmyHi');

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+            $terms_count = geodir_get_terms_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'category_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3538,48 +3538,48 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$terms_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_terms = $terms_count;

                     if ($chunk_per_page > $terms_count) {

                         $chunk_per_page = $terms_count;

                     }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_terms / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+                    $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_terms, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $terms_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                        $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                     }

                 }

                 // WPML

@@ -3587,127 +3587,127 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_locations_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_locations_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+            $items_count = (int) geodir_location_imex_count_locations();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_hoods': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_neighbourhoods_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_neighbourhoods_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_neighbourhoods();

+            $items_count = (int) geodir_location_imex_count_neighbourhoods();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_neighbourhoods_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -3724,34 +3724,34 @@ 
             }

             // WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+            ini_set('auto_detect_line_endings', true);

             

             $uploads = wp_upload_dir();

             $uploads_dir = $uploads['path'];

             $uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+            $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL;

+            $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+            $csv_file_arr = explode('/', $csv_file);

+            $csv_filename = end($csv_file_arr);

+            $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$csv_filename;

             

             $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+            $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

             $file = array();

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+            if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {

+                $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename);

                 

                 if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

                     $json['error'] = NULL;

 

                     $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

                     setlocale(LC_ALL, 'en_US.UTF-8');

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

+                    if (($handle = fopen($target_path, "r")) !== FALSE) {

+                        while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {

+                            if (!empty($data)) {

                                 $file[] = $data;

                             }

                         }

@@ -3765,19 +3765,19 @@ 
                         $json['error'] = __('No data found in csv file.', 'geodirectory');

                     }

                 } else {

-                    wp_send_json( $json );

+                    wp_send_json($json);

                 }

             } else {

-                wp_send_json( $json );

+                wp_send_json($json);

             }

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

+            if ($task == 'prepare_import' || !empty($json['error'])) {

+                wp_send_json($json);

             }

             

             $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+            $limit = isset($_POST['limit']) ? (int) $_POST['limit'] : 1;

+            $processed = isset($_POST['processed']) ? (int) $_POST['processed'] : 0;

             

             $count = $limit;

             

@@ -3802,13 +3802,13 @@ 
             

             $post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {

+            if ($task == 'import_cat') {

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

                     

@@ -3819,7 +3819,7 @@ 
                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

                             

                             $cat_id = '';

@@ -3836,42 +3836,42 @@ 
                             $cat_id_original = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

-                                } else if ( $column == 'cat_name' ) {

+                            foreach ($columns as $column) {

+                                if ($column == 'cat_id') {

+                                    $cat_id = (int) $row[$c];

+                                } else if ($column == 'cat_name') {

                                     $cat_name = $row[$c];

-                                } else if ( $column == 'cat_slug' ) {

+                                } else if ($column == 'cat_slug') {

                                     $cat_slug = $row[$c];

-                                } else if ( $column == 'cat_posttype' ) {

+                                } else if ($column == 'cat_posttype') {

                                     $cat_posttype = $row[$c];

-                                } else if ( $column == 'cat_parent' ) {

+                                } else if ($column == 'cat_parent') {

                                     $cat_parent = trim($row[$c]);

-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+                                } else if ($column == 'cat_schema' && $row[$c] != '') {

                                     $cat_schema = $row[$c];

-                                } else if ( $column == 'cat_description' ) {

+                                } else if ($column == 'cat_description') {

                                     $cat_description = $row[$c];

-                                } else if ( $column == 'cat_top_description' ) {

+                                } else if ($column == 'cat_top_description') {

                                     $cat_top_description = $row[$c];

-                                } else if ( $column == 'cat_image' ) {

+                                } else if ($column == 'cat_image') {

                                     $cat_image = $row[$c];

-                                } else if ( $column == 'cat_icon' ) {

+                                } else if ($column == 'cat_icon') {

                                     $cat_icon = $row[$c];

                                 }

                                 // WPML

-                                if ( $is_wpml ) {

-                                    if ( $column == 'cat_language' ) {

-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );

-                                    } else if ( $column == 'cat_id_original' ) {

-                                        $cat_id_original = (int)$row[$c];

+                                if ($is_wpml) {

+                                    if ($column == 'cat_language') {

+                                        $cat_language = geodir_strtolower(trim($row[$c]));

+                                    } else if ($column == 'cat_id_original') {

+                                        $cat_id_original = (int) $row[$c];

                                     }

                                 }

                                 // WPML

                                 $c++;

                             }

                             

-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                            if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                                 

                                 $invalid++;

                                 continue;

@@ -3889,24 +3889,24 @@ 
                             $term_data['description'] = $cat_description;

                             $term_data['cat_schema'] = $cat_schema;

                             $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+                            $term_data['image'] = $cat_image != '' ? basename($cat_image) : '';

+                            $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : '';

                             

                             //$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+                            $taxonomy = $cat_posttype.'category';

                             

                             $term_data['taxonomy'] = $taxonomy;

 

                             $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

+                            if ($cat_parent != "" || (int) $cat_parent > 0) {

                                 $term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+                                if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {

                                     //

                                 } else {

                                     $term_parent_data = array();

@@ -3914,104 +3914,104 @@ 
                                     //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

                                     $term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+                                    $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data);

                                 }

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

+                                if (!empty($term_parent) && !is_wp_error($term_parent)) {

+                                    $term_parent_id = (int) $term_parent->term_id;

                                 }

                             }

-                            $term_data['parent'] = (int)$term_parent_id;

+                            $term_data['parent'] = (int) $term_parent_id;

 

                             $term_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            if ($import_choice == 'update') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $skipped++;

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                             }

                             

-                            if ( $term_id ) {

+                            if ($term_id) {

                                 // WPML

                                 if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {

-                                    $wpml_element_type = 'tax_' . $taxonomy;

-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

+                                    $wpml_element_type = 'tax_'.$taxonomy;

+                                    $source_language = geodir_get_language_for_element($cat_id_original, $wpml_element_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

+                                    $trid = $sitepress->get_element_trid($cat_id_original, $wpml_element_type);

                                     

-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

+                                    $sitepress->set_element_language_details($term_id, $wpml_element_type, $trid, $cat_language, $source_language);

                                 }

                                 // WPML

                                 

-                                if ( isset( $term_data['top_description'] ) ) {

-                                    geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+                                if (isset($term_data['top_description'])) {

+                                    geodir_update_tax_meta($term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype);

                                 }

                                 

-                                if ( isset( $term_data['cat_schema'] ) ) {

-                                    geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+                                if (isset($term_data['cat_schema'])) {

+                                    geodir_update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype);

                                 }

             

                                 $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+                                if (isset($term_data['image']) && $term_data['image'] != '') {

+                                    $cat_image = geodir_get_default_catimage($term_id, $cat_posttype);

+                                    $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

+                                    if (basename($cat_image) != $term_data['image']) {

                                         $attachment = true;

-                                        geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+                                        geodir_update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'].'/'.$term_data['image']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+                                if (isset($term_data['icon']) && $term_data['icon'] != '') {

+                                    $cat_icon = geodir_get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype);

+                                    $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

 

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

+                                    if (basename($cat_icon) != $term_data['icon']) {

                                         $attachment = true;

-                                        geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+                                        geodir_update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'].'/'.$term_data['icon']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( $attachment ) {

+                                if ($attachment) {

                                     $images++;

                                 }

                             }

@@ -4033,35 +4033,35 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_post' ) {

-                $xtimings['###1'] = microtime(true)-$xstart;

+            } else if ($task == 'import_post') {

+                $xtimings['###1'] = microtime(true) - $xstart;

                 //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

+                wp_defer_term_counting(true);

+                wp_defer_comment_counting(true);

+                $wpdb->query('SET autocommit = 0;');

 //

 //                remove_all_actions('publish_post');

 //                remove_all_actions('transition_post_status');

 //                remove_all_actions('publish_future_post');

 

                 if (!empty($file)) {

-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+                    $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

                     $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

                     $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+                    $current_date = date_i18n('Y-m-d', time());

                     

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

-                    $xtimings['###2'] = microtime(true)-$xstart;

+                    $xtimings['###2'] = microtime(true) - $xstart;

                     $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

+                    $wp_chars_error = __('(check & remove if any invalid characters used in data)', 'geodirectory');

                     $processed_actual = 0;

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

@@ -4070,9 +4070,9 @@ 
                         if (isset($file[$index])) {

                             $processed_actual++;

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+                            $row = array_map('addslashes_gpc', $row);

                             

                             $post_id = '';

                             $post_title = '';

@@ -4112,82 +4112,82 @@ 
                             $original_post_id = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

+                            foreach ($columns as $column) {

                                 $gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

+                                if ($column == 'post_id') {

                                     $post_id = $row[$c];

-                                } else if ( $column == 'post_title' ) {

+                                } else if ($column == 'post_title') {

                                     $post_title = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_author' ) {

+                                } else if ($column == 'post_author') {

                                     $post_author = $row[$c];

-                                } else if ( $column == 'post_date' ) {

+                                } else if ($column == 'post_date') {

                                     $post_date = $row[$c];

-                                } else if ( $column == 'post_content' ) {

+                                } else if ($column == 'post_content') {

                                     $post_content = $row[$c];

-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {

-                                    $post_category_arr = explode( ',', $row[$c] );

-                                } else if ( $column == 'default_category' ) {

+                                } else if ($column == 'post_category' && $row[$c] != '') {

+                                    $post_category_arr = explode(',', $row[$c]);

+                                } else if ($column == 'default_category') {

                                     $default_category = wp_kses_normalize_entities($row[$c]);

-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );

-                                } else if ( $column == 'post_type' ) {

+                                } else if ($column == 'post_tags' && $row[$c] != '') {

+                                    $post_tags = explode(',', sanitize_text_field($row[$c]));

+                                } else if ($column == 'post_type') {

                                     $post_type = $row[$c];

-                                } else if ( $column == 'post_status' ) {

-                                    $post_status = sanitize_key( $row[$c] );

-                                } else if ( $column == 'is_featured' ) {

-                                    $is_featured = (int)$row[$c];

-                                } else if ( $column == 'geodir_video' ) {

+                                } else if ($column == 'post_status') {

+                                    $post_status = sanitize_key($row[$c]);

+                                } else if ($column == 'is_featured') {

+                                    $is_featured = (int) $row[$c];

+                                } else if ($column == 'geodir_video') {

                                     $geodir_video = $row[$c];

-                                } else if ( $column == 'post_address' ) {

+                                } else if ($column == 'post_address') {

                                     $post_address = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_city' ) {

+                                } else if ($column == 'post_city') {

                                     $post_city = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_region' ) {

+                                } else if ($column == 'post_region') {

                                     $post_region = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_country' ) {

+                                } else if ($column == 'post_country') {

                                     $post_country = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_zip' ) {

+                                } else if ($column == 'post_zip') {

                                     $post_zip = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_latitude' ) {

+                                } else if ($column == 'post_latitude') {

                                     $post_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_longitude' ) {

+                                } else if ($column == 'post_longitude') {

                                     $post_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_neighbourhood' ) {

+                                } else if ($column == 'post_neighbourhood') {

                                     $post_neighbourhood = sanitize_text_field($row[$c]);

                                     unset($gd_post[$column]);

-                                } else if ( $column == 'neighbourhood_latitude' ) {

+                                } else if ($column == 'neighbourhood_latitude') {

                                     $neighbourhood_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'neighbourhood_longitude' ) {

+                                } else if ($column == 'neighbourhood_longitude') {

                                     $neighbourhood_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_timing' ) {

+                                } else if ($column == 'geodir_timing') {

                                     $geodir_timing = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_contact' ) {

+                                } else if ($column == 'geodir_contact') {

                                     $geodir_contact = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_email' ) {

+                                } else if ($column == 'geodir_email') {

                                     $geodir_email = sanitize_email($row[$c]);

-                                } else if ( $column == 'geodir_website' ) {

+                                } else if ($column == 'geodir_website') {

                                     $geodir_website = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_twitter' ) {

+                                } else if ($column == 'geodir_twitter') {

                                     $geodir_twitter = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_facebook' ) {

+                                } else if ($column == 'geodir_facebook') {

                                     $geodir_facebook = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

+                                } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {

                                     $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+                                } else if ($column == 'alive_days' && (int) $row[$c] > 0) {

+                                    $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));

+                                } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {

                                     $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

-                                } else if ( strpos( $column, 'linked_' ) === 0 ) {

-                                    $geodir_link_business = (int)$row[$c];

+                                    $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));

+                                } else if (strpos($column, 'linked_') === 0) {

+                                    $geodir_link_business = (int) $row[$c];

                                 }

                                 // WPML

                                 if ($is_wpml) {

                                     if ($column == 'language') {

                                         $language = geodir_strtolower(trim($row[$c]));

                                     } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

+                                        $original_post_id = (int) $row[$c];

                                     }

                                 }

                                 // WPML

@@ -4195,7 +4195,7 @@ 
                             }

                             // listing claimed or not

                             if ($is_claim_active && isset($gd_post['claimed'])) {

-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

+                                $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0;

                             }

                             

                             // WPML

@@ -4206,43 +4206,43 @@ 
 

                             $gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+                            $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;

+                            $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;

                                                                                                                 

                             $valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+                            if ($post_title == '' || !in_array($post_type, $post_types)) {

                                 $invalid++;

                                 $valid = false;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                             }

-                            $xtimings['###3'] = microtime(true)-$xstart;

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

+                            $xtimings['###3'] = microtime(true) - $xstart;

+                            $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

+                            if ($location_allowed) {

                                 $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+                                if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {

                                     $invalid_addr++;

                                     $valid = false;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

+                                } else if (!empty($location_result) && $location_result->location_id == 0) {

+                                    if ((geodir_strtolower($post_city) != geodir_strtolower($location_result->city)) || (geodir_strtolower($post_region) != geodir_strtolower($location_result->region)) || (geodir_strtolower($post_country) != geodir_strtolower($location_result->country))) {

                                         $invalid_addr++;

                                         $valid = false;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

                                     } else {

                                         if (!$location_manager) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+                                            $gd_post['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // Set the default location when location manager not activated.

                                         }

                                     }

                                 }

                             }

-                            $xtimings['###4']   = microtime(true)-$xstart;

-                            if ( !$valid ) {

+                            $xtimings['###4'] = microtime(true) - $xstart;

+                            if (!$valid) {

                                 continue;

                             }

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+                            $cat_taxonomy = $post_type.'category';

+                            $tags_taxonomy = $post_type.'_tags';

                             

                             if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

                                 $post_category_arr = array_merge(array($default_category), $post_category_arr);

@@ -4250,29 +4250,29 @@ 
 

                             $post_category = array();

                             $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+                            if (!empty($post_category_arr)) {

+                                foreach ($post_category_arr as $value) {

+                                    $category_name = wp_kses_normalize_entities(trim($value));

                                     

-                                    if ( $category_name != '' ) {

+                                    if ($category_name != '') {

                                         $term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+                                        if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+                                        } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

                                         } else {

                                             $term_data = array();

                                             $term_data['name'] = $category_name;

                                             $term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

+                                            $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data);

+                                            if ($term_id) {

+                                                $term_category = get_term($term_id, $cat_taxonomy);

                                             }

                                         }

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+                                        if (!empty($term_category) && !is_wp_error($term_category)) {

                                             $post_category[] = intval($term_category->term_id);

                                             

                                             if ($category_name == $default_category) {

@@ -4282,14 +4282,14 @@ 
                                     }

                                 }

                             }

-                            $xtimings['###5'] = microtime(true)-$xstart;

+                            $xtimings['###5'] = microtime(true) - $xstart;

                             $save_post = array();

                             $save_post['post_title'] = $post_title;

                             if (!empty($post_date)) {

-                                $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format.

+                                $post_date = geodir_date($post_date, 'Y-m-d H:i:s'); // convert to mysql date format.

                                 

                                 $save_post['post_date'] = $post_date;

-                                $save_post['post_date_gmt'] = get_gmt_from_date( $post_date );

+                                $save_post['post_date_gmt'] = get_gmt_from_date($post_date);

                             }

                             $save_post['post_content'] = $post_content;

                             $save_post['post_type'] = $post_type;

@@ -4299,15 +4299,15 @@ 
                             $save_post['post_tags'] = $post_tags;

 

                             $saved_post_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

+                            if ($import_choice == 'update') {

+                                $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');

                                 

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $save_post['ID'] = $post_id;

                                     

-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_update_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $saved_post_id = $post_id;

@@ -4315,9 +4315,9 @@ 
                                         }

                                     }

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4325,19 +4325,19 @@ 
                                     }

                                 }

                                 

-                                if ( !$saved_post_id > 0 ) {

+                                if (!$saved_post_id > 0) {

                                     $invalid++;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error);

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $skipped++;	

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

                                             $invalid++;

                                             

-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

+                                            geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error);

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4345,28 +4345,28 @@ 
                                     } else {

                                         $invalid++;

                                         

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                                     }

                                 }

                             } else {

                                 $invalid++;

                                 

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                             }

-                            $xtimings['###6'] = microtime(true)-$xstart;

-                            if ( (int)$saved_post_id > 0 ) {

+                            $xtimings['###6'] = microtime(true) - $xstart;

+                            if ((int) $saved_post_id > 0) {

                                 // WPML

                                 if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+                                    $wpml_post_type = 'post_'.$post_type;

+                                    $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+                                    $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type);

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+                                    $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language);

                                 }

                                 // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+                                $gd_post_info = geodir_get_post_info($saved_post_id);

                                 

                                 $gd_post['post_id'] = $saved_post_id;

                                 $gd_post['ID'] = $saved_post_id;

@@ -4378,7 +4378,7 @@ 
                                                     

                                 // post location

                                 $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+                                if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {

                                     $gd_post['post_neighbourhood'] = '';

                                     

                                     $post_location_info = array(

@@ -4388,7 +4388,7 @@ 
                                                                 'geo_lat' => $post_latitude,

                                                                 'geo_lng' => $post_longitude

                                                             );

-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+                                    if ($location_id = (int) geodir_add_new_location($post_location_info)) {

                                         $post_location_id = $location_id;

                                     }

                                     

@@ -4430,14 +4430,14 @@ 
                                 }

                                 

                                 // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+                                $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0;

                                 if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

                                     $package_id = $gd_post_info->package_id;

                                 }

                                 

                                 $package_info = array();

                                 if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+                                    $package_info = (array) geodir_get_package_info_by_id($package_id);

                                     

                                     if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

                                         $package_info = array();

@@ -4445,18 +4445,18 @@ 
                                 }

                                 

                                 if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

+                                    $package_info = (array) geodir_post_package_info(array(), '', $post_type);

                                 }

                                  

-                                if (!empty($package_info))	 {

+                                if (!empty($package_info)) {

                                     $package_id = $package_info['pid'];

                                     

                                     if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

                                         $gd_post['expire_date'] = $expire_date;

                                     } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+                                        if (isset($package_info['days']) && (int) $package_info['days'] > 0) {

+                                            $gd_post['alive_days'] = (int) $package_info['days'];

+                                            $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $package_info['days'].' days'));

                                         } else {

                                             $gd_post['expire_date'] = 'Never';

                                         }

@@ -4465,7 +4465,7 @@ 
                                     $gd_post['package_id'] = $package_id;

                                 }

 

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

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

                                 

                                 if ($post_type == 'gd_event') {

                                     $gd_post = geodir_imex_process_event_data($gd_post);

@@ -4476,71 +4476,71 @@ 
                                 }

 

                                 // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+                                $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

                                 if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {

-                                        if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {

+                                    if (isset($gd_post['gd_is_franchise']) && empty($gd_post['franchise'])) {

+                                        if (absint($gd_post['gd_is_franchise']) != 0) {

                                             $gd_franchise_lock = array();

                                             

-                                            if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                                $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                                $gd_franchise_lock = trim( $gd_franchise_lock );

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

+                                            if (isset($gd_post['gd_franchise_lock'])) {

+                                                $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);

+                                                $gd_franchise_lock = trim($gd_franchise_lock);

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

                                             }

                                             

-                                            update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                            update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+                                            update_post_meta($saved_post_id, 'gd_is_franchise', 1);

+                                            update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock);

                                         } else {

-                                            if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {

-                                                geodir_franchise_remove_franchise( $saved_post_id );

+                                            if (function_exists('geodir_franchise_remove_franchise')) {

+                                                geodir_franchise_remove_franchise($saved_post_id);

                                             }

                                         }

                                     } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+                                        if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {

+                                            geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']);

                                         }

                                     }

                                 }

                                 

                                 if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+                                    $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));

                                     if ($default_category_id) {

                                         $save_post['post_default_category'] = $default_category_id;

                                         $gd_post['default_category'] = $default_category_id;

                                     }

                                     $gd_post[$cat_taxonomy] = $save_post['post_category'];

                                 }

-                                $xtimings['###7'] = microtime(true)-$xstart;

+                                $xtimings['###7'] = microtime(true) - $xstart;

                                 // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

-                                $xtimings['###8'] = microtime(true)-$xstart;

+                                geodir_save_post_info($saved_post_id, $gd_post);

+                                $xtimings['###8'] = microtime(true) - $xstart;

                                 // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+                                if (!empty($save_post['post_category'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy);

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+                                    $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : '';

                                     if ($default_category_id) {

                                         $post_default_category = $default_category_id;

                                     }

                                     $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

                                     $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';

                                     

                                     if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+                                        $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str);

                                     }

                                     

                                     $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+                                    geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str);

                                 }

-                                $xtimings['###8.1'] = microtime(true)-$xstart;

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+                                $xtimings['###8.1'] = microtime(true) - $xstart;

+                                if (!empty($save_post['post_tags'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy);

                                 }

-                                $xtimings['###9'] = microtime(true)-$xstart;

+                                $xtimings['###9'] = microtime(true) - $xstart;

                                 // Post images

-                                if ( !empty( $post_images ) ) {

+                                if (!empty($post_images)) {

                                     $post_images = array_unique($post_images);

                                     

                                     $old_post_images_arr = array();

@@ -4548,65 +4548,65 @@ 
                                     

                                     $order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

-                                    $xtimings['###9.1'] = microtime(true)-$xstart;

+                                    $old_post_images = geodir_get_images($saved_post_id);

+                                    $xtimings['###9.1'] = microtime(true) - $xstart;

                                     if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

+                                        foreach ($old_post_images as $old_post_image) {

                                             if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

                                                 $old_post_images_arr[] = $old_post_image->file;

                                             }

                                         }

                                     }

 

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

+                                    foreach ($post_images as $post_image) {

+                                        $image_name = basename($post_image);

                                         $saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+                                        if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {

                                             continue; // Skip if image already exists.

                                         }

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

-                                        $xtimings['###9.2'] = microtime(true)-$xstart;

-                                        $arr_file_type = wp_check_filetype( $image_name );

-                                        $xtimings['###9.3'] = microtime(true)-$xstart;

-                                        if ( !empty( $arr_file_type ) ) {

+                                        $image_name_parts = explode('.', $image_name);

+                                        array_pop($image_name_parts);

+                                        $proper_image_name = implode('.', $image_name_parts);

+                                        $xtimings['###9.2'] = microtime(true) - $xstart;

+                                        $arr_file_type = wp_check_filetype($image_name);

+                                        $xtimings['###9.3'] = microtime(true) - $xstart;

+                                        if (!empty($arr_file_type)) {

                                             $uploaded_file_type = $arr_file_type['type'];

                                             

                                             $attachment = array();

                                             $attachment['post_id'] = $saved_post_id;

                                             $attachment['title'] = $proper_image_name;

                                             $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

+                                            $attachment['file'] = $uploads_subdir.'/'.$image_name;

                                             $attachment['mime_type'] = $uploaded_file_type;

                                             $attachment['menu_order'] = $order;

                                             $attachment['is_featured'] = 0;

 

                                             $attachment_set = '';

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

-                                                if ( $val != '' ) {

-                                                    $attachment_set .= $key . " = '" . $val . "', ";

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

+                                                if ($val != '') {

+                                                    $attachment_set .= $key." = '".$val."', ";

                                                 }

                                             }

-                                            $attachment_set = trim( $attachment_set, ", " );

+                                            $attachment_set = trim($attachment_set, ", ");

                                                                                         

                                             // Add new attachment

-                                            $xtimings['###9.4'] = microtime(true)-$xstart;

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

-                                            $xtimings['###9.5'] = microtime(true)-$xstart;

+                                            $xtimings['###9.4'] = microtime(true) - $xstart;

+                                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

+                                            $xtimings['###9.5'] = microtime(true) - $xstart;

                                             $order++;

                                         }

                                     }

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';

                                     // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

-                                    $xtimings['###9.6'] = microtime(true)-$xstart;

-                                    if ( !empty( $saved_post_images_arr ) ) {

+                                    $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);

+                                    $xtimings['###9.6'] = microtime(true) - $xstart;

+                                    if (!empty($saved_post_images_arr)) {

                                         geodir_set_wp_featured_image($saved_post_id);

-                                        $xtimings['###9.7'] = microtime(true)-$xstart;

+                                        $xtimings['###9.7'] = microtime(true) - $xstart;

                                         /*

                                         $menu_order = 1;

                                         

@@ -4622,14 +4622,14 @@ 
                                         }*/

                                     }

                                     

-                                    if ( $order > 1 ) {

+                                    if ($order > 1) {

                                         $images++;

                                     }

                                 }

-                                $xtimings['###10'] = microtime(true)-$xstart;

+                                $xtimings['###10'] = microtime(true) - $xstart;

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

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

-                                $xtimings['###11'] = microtime(true)-$xstart;

+                                do_action('geodir_after_save_listing', $saved_post_id, $gd_post);

+                                $xtimings['###11'] = microtime(true) - $xstart;

                                 if (isset($is_featured)) {

                                     geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

                                 }

@@ -4639,7 +4639,7 @@ 
                                 if (isset($gd_post['expire_date'])) {

                                     geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

                                 }

-                                $xtimings['###12'] = microtime(true)-$xstart;

+                                $xtimings['###12'] = microtime(true) - $xstart;

                             }

                             

                             // WPML

@@ -4652,11 +4652,11 @@ 
                 }

 

                 //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

-                $xtimings['###13'] = microtime(true)-$xstart;

+                wp_defer_term_counting(false);

+                wp_defer_comment_counting(false);

+                $wpdb->query('COMMIT;');

+                $wpdb->query('SET autocommit = 1;');

+                $xtimings['###13'] = microtime(true) - $xstart;

                 $json = array();

                 $json['processed'] = $processed_actual;

                 $json['created'] = $created;

@@ -4665,13 +4665,13 @@ 
                 $json['invalid'] = $invalid;

                 $json['invalid_addr'] = $invalid_addr;

                 $json['images'] = $images;

-                $json['timing'] = microtime(true)-$xstart;

+                $json['timing'] = microtime(true) - $xstart;

                 $json['timings'] = $xtimings;

                 

 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_loc' ) {

+            } else if ($task == 'import_loc') {

                 global $gd_post_types;

                 $gd_post_types = $post_types;

                 

@@ -4680,82 +4680,82 @@ 
                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

+                    $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

-                            foreach ($columns as $c => $column ) {

+                            foreach ($columns as $c => $column) {

                                 if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {

                                     $data[$column] = $row[$c];

                                 }

                             }

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+                            if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                 continue;

                             }

                             

                             $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

-                            if ( $import_choice == 'update' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                            if ($import_choice == 'update') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

+                                    $data['location_id'] = (int) $location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

+                                    if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {

+                                        $data['location_id'] = (int) $location->location_id;

                                     }

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

                                     $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

                                     $skipped++;

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                             }

                         }

                     }

@@ -4769,24 +4769,24 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

-            } else if ( $task == 'import_hood' ) {               

+                wp_send_json($json);

+            } else if ($task == 'import_hood') {               

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

-                    $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

+                    $gd_error_hood = __('Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

                             foreach ($columns as $c => $column) {

@@ -4797,20 +4797,20 @@ 
 

                             if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

                             $location_info = array();

-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);

+                            if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {

+                                $location_info = geodir_get_location_by_id('', (int) $data['location_id']);

                             } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

                                 $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

                             }

 

                             if (empty($location_info)) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

@@ -4825,35 +4825,35 @@ 
                             $hood_data['hood_longitude'] = $data['longitude'];

                             $hood_data['hood_location_id'] = $location_id;

                                     

-                            if ( $import_choice == 'update' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];

+                            if ($import_choice == 'update') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

+                                    $hood_data['hood_id'] = (int) $data['neighbourhood_id'];

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;

+                                    $hood_data['hood_id'] = (int) $neighbourhood->hood_id;

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else {

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

                                     $skipped++;

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

                                     $skipped++;

@@ -4863,12 +4863,12 @@ 
                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                             }

                         }

                     }

@@ -4882,7 +4882,7 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -4926,29 +4926,29 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_insert_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_insert_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

+	$term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : '';

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {

-		$term_args = array_merge( $term_data, $args );

-		$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

-		$term_args = wp_parse_args( $term_args, $defaults );

-		$term_args = sanitize_term( $term_args, $taxonomy, 'db' );

-		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

+	if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {

+		$term_args = array_merge($term_data, $args);

+		$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

+		$term_args = wp_parse_args($term_args, $defaults);

+		$term_args = sanitize_term($term_args, $taxonomy, 'db');

+		$args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args);

 	}

 	

-    if( !empty( $term ) ) {

-		$result = wp_insert_term( $term, $taxonomy, $args );

-        if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+    if (!empty($term)) {

+		$result = wp_insert_term($term, $taxonomy, $args);

+        if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

     }

 	

@@ -4978,36 +4978,36 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_update_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_update_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0;

+	$term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0;

 	

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

+	if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

-	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+	} else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

 	} else {

-		return geodir_imex_insert_term( $taxonomy, $term_data );

+		return geodir_imex_insert_term($taxonomy, $term_data);

 	}

 	

 	return false;

@@ -5026,20 +5026,20 @@ 
  * @param string $post_type Post type.

  * @return int Posts count.

  */

-function geodir_get_posts_count( $post_type ) {

+function geodir_get_posts_count($post_type) {

     global $wpdb, $plugin_prefix;

 

-    if ( !post_type_exists( $post_type ) ) {

+    if (!post_type_exists($post_type)) {

         return 0;

     }

         

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

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

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

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

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

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

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -5050,11 +5050,11 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

+    $query = $wpdb->prepare("SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses, $post_type);

 

-    $posts_count = (int)$wpdb->get_var( $query );

+    $posts_count = (int) $wpdb->get_var($query);

     

     /**

      * Modify returned post counts for the current post type.

@@ -5065,7 +5065,7 @@ 
      * @param int $posts_count Post counts.

      * @param string $post_type Post type.

      */

-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

+    $posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);

 

     return $posts_count;

 }

@@ -5087,19 +5087,19 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {	

+function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {	

 	global $wp_filesystem;

 

-	$posts = geodir_get_export_posts( $post_type, $per_page, $page_no );

+	$posts = geodir_get_export_posts($post_type, $per_page, $page_no);

 

 	$csv_rows = array();

 	

-	if ( !empty( $posts ) ) {

-		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

+	if (!empty($posts)) {

+		$is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');

 		$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-		$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+		$location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

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

-		$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+		$is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

 		$is_events_active = function_exists('geodir_event_plugin_activated') ? true : false;

 		$is_custom_posts_active = function_exists('geodir_custom_post_type_plugin_activated') ? true : false;

 		

@@ -5114,7 +5114,7 @@ 
 		$csv_row[] = 'default_category';

 		$csv_row[] = 'post_tags';

 		$csv_row[] = 'post_type';

-		if ( $post_type == 'gd_event' ) {

+		if ($post_type == 'gd_event') {

 			$csv_row[] = 'event_date';

 			$csv_row[] = 'event_enddate';

 			$csv_row[] = 'starttime';

@@ -5166,25 +5166,25 @@ 
 		$csv_row[] = 'geodir_video';

 		$csv_row[] = 'geodir_special_offers';

 		if ($is_events_active || $is_custom_posts_active) {

-			$csv_row[] = !empty($post_ypes[$post_type]['linkable_to']) ? 'linked_' . $post_ypes[$post_type]['linkable_to'] . '_ID' : 'linked_cpt_ID';

+			$csv_row[] = !empty($post_ypes[$post_type]['linkable_to']) ? 'linked_'.$post_ypes[$post_type]['linkable_to'].'_ID' : 'linked_cpt_ID';

 		}

 		// WPML

-		$is_wpml = geodir_wpml_is_post_type_translated( $post_type );

+		$is_wpml = geodir_wpml_is_post_type_translated($post_type);

 		if ($is_wpml) {

 			$csv_row[] = 'language';

 			$csv_row[] = 'original_post_id';

 		}

 		// WPML

 

-		$custom_fields = geodir_imex_get_custom_fields( $post_type );

-		if ( !empty( $custom_fields ) ) {

-			foreach ( $custom_fields as $custom_field ) {

+		$custom_fields = geodir_imex_get_custom_fields($post_type);

+		if (!empty($custom_fields)) {

+			foreach ($custom_fields as $custom_field) {

 				$csv_row[] = $custom_field->htmlvar_name;

 			}

 		}

 

 		// Export franchise fields

-		$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+		$is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

 		if ($is_franchise_active) {

 			$csv_row[] = 'gd_is_franchise';

 			$csv_row[] = 'gd_franchise_lock';

@@ -5205,28 +5205,28 @@ 
 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

-		foreach ( $posts as $post ) {$xx++;

+        $xx = 0;

+		foreach ($posts as $post) {$xx++;

 			$post_id = $post['ID'];

 			

-			$gd_post_info = geodir_get_post_info( $post_id );

-			$post_info = (array)$gd_post_info;

+			$gd_post_info = geodir_get_post_info($post_id);

+			$post_info = (array) $gd_post_info;

 			

-			$taxonomy_category = $post_type . 'category';

-			$taxonomy_tags = $post_type . '_tags';

+			$taxonomy_category = $post_type.'category';

+			$taxonomy_tags = $post_type.'_tags';

 			

 			$post_category = '';

 			$default_category_id = $gd_post_info->default_category;

 			$default_category = '';

 			$post_tags = '';

-			$terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );

+			$terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags));

 			

-			if ( !empty( $terms ) && !is_wp_error( $terms ) ) {

+			if (!empty($terms) && !is_wp_error($terms)) {

 				$post_category = array();

 				$post_tags = array();

 			

-				foreach ( $terms as $term ) {

-					if ( $term->taxonomy == $taxonomy_category ) {

+				foreach ($terms as $term) {

+					if ($term->taxonomy == $taxonomy_category) {

 						$post_category[] = $term->name;

 						

 						if ($default_category_id == $term->term_id) {

@@ -5234,7 +5234,7 @@ 
 						}

 					}

 					

-					if ( $term->taxonomy == $taxonomy_tags ) {

+					if ($term->taxonomy == $taxonomy_tags) {

 						$post_tags[] = $term->name;

 					}

 				}

@@ -5242,47 +5242,47 @@ 
 				if (empty($default_category) && !empty($post_category)) {

 					$default_category = $post_category[0]; // Set first one as default category.

 				}

-				$post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';

-				$post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';

+				$post_category = !empty($post_category) ? implode(',', $post_category) : '';

+				$post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';

 			}

 

 			// Franchise data

-			if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {

+			if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {

 				$franchise_id = $post_info['franchise'];

 				$gd_franchise_info = geodir_get_post_info($franchise_id);

 

 				if (geodir_franchise_pkg_is_active($gd_franchise_info)) {

-					$franchise_info = (array)$gd_franchise_info;

+					$franchise_info = (array) $gd_franchise_info;

 					$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

 					

 					if (!empty($locked_fields)) {

-						foreach( $locked_fields as $locked_field) {

+						foreach ($locked_fields as $locked_field) {

 							if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

 								$post_info[$locked_field] = $franchise_info[$locked_field];

 							}

 							

 							if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {

-								$franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );

+								$franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags));

 			

-								if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {

+								if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {

 									$franchise_post_category = array();

 									$franchise_post_tags = array();

 								

-									foreach ( $franchise_terms as $franchise_term ) {

-										if ( $franchise_term->taxonomy == $taxonomy_category ) {

+									foreach ($franchise_terms as $franchise_term) {

+										if ($franchise_term->taxonomy == $taxonomy_category) {

 											$franchise_post_category[] = $franchise_term->name;

 										}

 										

-										if ( $franchise_term->taxonomy == $taxonomy_tags ) {

+										if ($franchise_term->taxonomy == $taxonomy_tags) {

 											$franchise_post_tags[] = $franchise_term->name;

 										}

 									}

 									

 									if (in_array($taxonomy_category, $locked_fields)) {

-										$post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';

+										$post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';

 									}

 									if (in_array('post_tags', $locked_fields)) {

-										$post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';

+										$post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';

 									}

 								}

 							}

@@ -5291,18 +5291,18 @@ 
 				}

 			}

 						

-			$post_images = geodir_get_images( $post_id );

+			$post_images = geodir_get_images($post_id);

 			$current_images = array();

-			if ( !empty( $post_images ) ) {

-				foreach ( $post_images as $post_image ) {

-					$post_image = (array)$post_image;

-					$image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';

-					if ( $image ) {

+			if (!empty($post_images)) {

+				foreach ($post_images as $post_image) {

+					$post_image = (array) $post_image;

+					$image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : '';

+					if ($image) {

 						$current_images[] = $image;

 					}

 				}

 				

-				$images_count = max( $images_count, count( $current_images ) );

+				$images_count = max($images_count, count($current_images));

 			}

 

 			$csv_row = array();

@@ -5314,7 +5314,7 @@ 
 			$csv_row[] = $default_category; // default_category

 			$csv_row[] = $post_tags; // post_tags

 			$csv_row[] = $post_type; // post_type

-			if ( $post_type == 'gd_event' ) {

+			if ($post_type == 'gd_event') {

 				$event_data = geodir_imex_get_event_data($post, $gd_post_info);

 				$csv_row[] = $event_data['event_date']; // event_date

 				$csv_row[] = $event_data['event_enddate']; // enddate

@@ -5335,12 +5335,12 @@ 
 				$csv_row[] = $event_data['recurring_end_date']; // repeat_end

 			}

 			$csv_row[] = $post_info['post_status']; // post_status

-			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

+			$csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured

             if ($is_claim_active) {

-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

+                $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed

             }

 			if ($is_payment_plugin) {

-				$csv_row[] = (int)$post_info['package_id']; // package_id

+				$csv_row[] = (int) $post_info['package_id']; // package_id

 				$csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

@@ -5376,18 +5376,18 @@ 
 			$csv_row[] = stripslashes($post_info['geodir_video']); // geodir_video

 			$csv_row[] = stripslashes($post_info['geodir_special_offers']); // geodir_special_offers

 			if ($is_events_active || $is_custom_posts_active) {

-				$csv_row[] = !empty($post_info['geodir_link_business']) ? (int)$post_info['geodir_link_business'] : ''; // linked business

+				$csv_row[] = !empty($post_info['geodir_link_business']) ? (int) $post_info['geodir_link_business'] : ''; // linked business

 			}

 			// WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );

-				$csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );

+				$csv_row[] = geodir_get_language_for_element($post_id, 'post_'.$post_type);

+				$csv_row[] = geodir_imex_original_post_id($post_id, 'post_'.$post_type);

 			}

 			// WPML

 			

-			if ( !empty( $custom_fields ) ) {

-				foreach ( $custom_fields as $custom_field ) {

-					$csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';

+			if (!empty($custom_fields)) {

+				foreach ($custom_fields as $custom_field) {

+					$csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : '';

 				}

 			}

 			

@@ -5398,15 +5398,15 @@ 
 				$franchise = '';

 					

 				if (geodir_franchise_pkg_is_active($gd_post_info)) {

-					$gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );

-					$locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';

+					$gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true);

+					$locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : '';

 					$locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');

-					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id

+					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id

 				}

 				

-				$csv_row[] = (int)$gd_is_franchise; // gd_is_franchise

+				$csv_row[] = (int) $gd_is_franchise; // gd_is_franchise

 				$csv_row[] = $locaked_fields; // gd_franchise_lock fields

-				$csv_row[] = (int)$franchise; // franchise id

+				$csv_row[] = (int) $franchise; // franchise id

 			}

             

             /**

@@ -5420,15 +5420,15 @@ 
              */

             $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

 			

-			for ( $c = 0; $c < $images_count; $c++ ) {

-				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

+			for ($c = 0; $c < $images_count; $c++) {

+				$csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE

 			}

 			

 			$csv_rows[] = $csv_row;

 

 		}

 

-		for ( $c = 0; $c < $images_count; $c++ ) {

+		for ($c = 0; $c < $images_count; $c++) {

 			$csv_rows[0][] = 'IMAGE';

 		}

 	}

@@ -5450,30 +5450,30 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

+function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {

     global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

+    if (!post_type_exists($post_type))

         return new stdClass;

         

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

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

 

     $limit = '';

-    if ( $per_page > 0 && $page_no > 0 ) {

-        $offset = ( $page_no - 1 ) * $per_page;

+    if ($per_page > 0 && $page_no > 0) {

+        $offset = ($page_no - 1) * $per_page;

         

-        if ( $offset > 0 ) {

-            $limit = " LIMIT " . $offset . "," . $per_page;

+        if ($offset > 0) {

+            $limit = " LIMIT ".$offset.",".$per_page;

         } else {

-            $limit = " LIMIT " . $per_page;

+            $limit = " LIMIT ".$per_page;

         }

     }

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

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

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

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

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -5484,9 +5484,9 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

+    $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." ORDER BY {$wpdb->posts}.ID ASC".$limit, $post_type);

     /**

      * Modify returned posts SQL query for the current post type.

      *

@@ -5496,8 +5496,8 @@ 
      * @param int $query The SQL query.

      * @param string $post_type Post type.

      */

-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-    $results = (array)$wpdb->get_results( $query, ARRAY_A );

+    $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);

+    $results = (array) $wpdb->get_results($query, ARRAY_A);

 

     /**

      * Modify returned post results for the current post type.

@@ -5508,7 +5508,7 @@ 
      * @param object $results An object containing all post ids.

      * @param string $post_type Post type.

      */

-    return apply_filters( 'geodir_export_posts', $results, $post_type );

+    return apply_filters('geodir_export_posts', $results, $post_type);

 }

 

 /**

@@ -5526,24 +5526,24 @@ 
  * @param string $post_type Post type.

  * @return string The SQL query.

  */

-function geodir_imex_get_events_query( $query, $post_type ) {

-    if ( $post_type == 'gd_event' ) {

+function geodir_imex_get_events_query($query, $post_type) {

+    if ($post_type == 'gd_event') {

         global $wpdb, $plugin_prefix;

         

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

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

         $schedule_table = EVENT_SCHEDULE;

         

         // Skip listing with statuses trash, auto-draft etc...

         $skip_statuses = geodir_imex_export_skip_statuses();

         $where_statuses = '';

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

-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

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

+            $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

         }

         

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

-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+        $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-        $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

+        $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type);

     }

 

     return $query;

@@ -5567,35 +5567,35 @@ 
  * @param  string $post_type Post type.

  * @return int Total terms count.

  */

-function geodir_get_terms_count( $post_type ) {

-    $args = array( 'hide_empty' => 0 );

+function geodir_get_terms_count($post_type) {

+    $args = array('hide_empty' => 0);

 

-    remove_all_filters( 'get_terms' );

+    remove_all_filters('get_terms');

 

-    $taxonomy = $post_type . 'category';

+    $taxonomy = $post_type.'category';

 

     // WPML

     $is_wpml = geodir_is_wpml();

     $active_lang = 'all';

-    if ( $is_wpml ) {

+    if ($is_wpml) {

         global $sitepress;

         $active_lang = $sitepress->get_current_language();

         

-        if ( $active_lang != 'all' ) {

-            $sitepress->switch_lang( 'all', true );

+        if ($active_lang != 'all') {

+            $sitepress->switch_lang('all', true);

         }

     }

     // WPML

             

-    $count_terms = wp_count_terms( $taxonomy, $args );

+    $count_terms = wp_count_terms($taxonomy, $args);

 

     // WPML

-    if ( $is_wpml && $active_lang !== 'all' ) {

+    if ($is_wpml && $active_lang !== 'all') {

         global $sitepress;

-        $sitepress->switch_lang( $active_lang, true );

+        $sitepress->switch_lang($active_lang, true);

     }

     // WPML

-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+    $count_terms = !is_wp_error($count_terms) ? $count_terms : 0;

      

     return $count_terms;

 }

@@ -5612,23 +5612,23 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of terms data.

  */

-function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {

-	$args = array( 'hide_empty' => 0, 'orderby' => 'id' );

+function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {

+	$args = array('hide_empty' => 0, 'orderby' => 'id');

 	

-	remove_all_filters( 'get_terms' );

+	remove_all_filters('get_terms');

 	

-	$taxonomy = $post_type . 'category';

+	$taxonomy = $post_type.'category';

 	

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$args['offset'] = ( $page_no - 1 ) * $per_page;

+	if ($per_page > 0 && $page_no > 0) {

+		$args['offset'] = ($page_no - 1) * $per_page;

 		$args['number'] = $per_page;

 	}

 	

-	$terms = get_terms( $taxonomy, $args );

+	$terms = get_terms($taxonomy, $args);

 

 	$csv_rows = array();

 	

-	if ( !empty( $terms ) ) {

+	if (!empty($terms)) {

 		$csv_row = array();

 		$csv_row[] = 'cat_id';

 		$csv_row[] = 'cat_name';

@@ -5637,7 +5637,7 @@ 
 		$csv_row[] = 'cat_parent';

 		$csv_row[] = 'cat_schema';

         // WPML

-		$is_wpml = geodir_wpml_is_taxonomy_translated( $taxonomy );

+		$is_wpml = geodir_wpml_is_taxonomy_translated($taxonomy);

 		if ($is_wpml) {

 			$csv_row[] = 'cat_language';

             $csv_row[] = 'cat_id_original';

@@ -5650,16 +5650,16 @@ 
 		

 		$csv_rows[] = $csv_row;

 		

-		foreach ( $terms as $term ) {

-			$cat_icon = geodir_get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );

-			$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+		foreach ($terms as $term) {

+			$cat_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type);

+			$cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

 			

-			$cat_image = geodir_get_default_catimage( $term->term_id, $post_type );

-			$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; 

+			$cat_image = geodir_get_default_catimage($term->term_id, $post_type);

+			$cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; 

 			

 			$cat_parent = '';

-			if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {

-				$parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );

+			if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {

+				$parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);

 				$cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';

 			}

 			

@@ -5669,15 +5669,15 @@ 
 			$csv_row[] = $term->slug;

 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

-			$csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

+			$csv_row[] = geodir_get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type);

             // WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

+				$csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy);

+                $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy);

 			}

 			// WPML

 			$csv_row[] = $term->description;

-			$csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

+			$csv_row[] = geodir_get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type);

 			$csv_row[] = $cat_image;

 			$csv_row[] = $cat_icon;

 			

@@ -5696,10 +5696,10 @@ 
  * @param  bool $relative True for relative path & False for absolute path.

  * @return string Path to the cache directory.

  */

-function geodir_path_import_export( $relative = true ) {

+function geodir_path_import_export($relative = true) {

 	$upload_dir = wp_upload_dir();

 	

-	return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';

+	return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache';

 }

 

 /**

@@ -5715,8 +5715,8 @@ 
  * @param  bool $clear If true then it overwrite data otherwise add rows at the end of file.

  * @return bool true if success otherwise false.

  */

-function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {

-	if ( empty( $csv_data ) ) {

+function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {

+	if (empty($csv_data)) {

 		return false;

 	}

 	

@@ -5724,17 +5724,17 @@ 
 	

 	$mode = $clear ? 'w+' : 'a+';

 	

-	if ( function_exists( 'fputcsv' ) ) {

-		$file = fopen( $file_path, $mode );

-		foreach( $csv_data as $csv_row ) {

+	if (function_exists('fputcsv')) {

+		$file = fopen($file_path, $mode);

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );

+			$write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"');

 		}

-		fclose( $file );

+		fclose($file);

 	} else {

-		foreach( $csv_data as $csv_row ) {

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$wp_filesystem->put_contents( $file_path, $csv_row );

+			$wp_filesystem->put_contents($file_path, $csv_row);

 		}

 	}

 		

@@ -5752,14 +5752,14 @@ 
  * @param  string $file Full path to file.

  * @return int No of file rows.

  */

-function geodir_import_export_line_count( $file ) {

+function geodir_import_export_line_count($file) {

 	global $wp_filesystem;

 	

-	if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {

-		$contents = $wp_filesystem->get_contents_array( $file );

+	if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {

+		$contents = $wp_filesystem->get_contents_array($file);

 		

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

-			return count( $contents ) - 1;

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

+			return count($contents) - 1;

 		}

 	}

 	

@@ -5776,11 +5776,11 @@ 
  * @param string $post_type The post type.

  * @return object Queried object.

  */

-function geodir_imex_get_custom_fields( $post_type ) {

+function geodir_imex_get_custom_fields($post_type) {

 	global $wpdb;

 	 

-	$sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );

-	$rows = $wpdb->get_results( $sql );

+	$sql = $wpdb->prepare("SELECT htmlvar_name FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array($post_type));

+	$rows = $wpdb->get_results($sql);

 	 

 	return $rows;

 }

@@ -5796,10 +5796,10 @@ 
  * @return array Event data array.

  */

 function geodir_imex_get_event_data($post, $gd_post_info) {

-	$event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : '';

+	$event_date = isset($post['event_date']) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($post['event_date'])) : '';

 	$event_enddate = $event_date;

-	$starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';

-	$endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';

+	$starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';

+	$endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';

 	

 	$is_recurring_event = '';

 	$event_duration_days = '';

@@ -5816,15 +5816,15 @@ 
 		

 	$recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();

 	if (!empty($recurring_data)) {

-		$event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date;

-		$event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date;

-		$starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;

-		$endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;

+		$event_date = isset($recurring_data['event_start']) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_start'])) : $event_date;

+		$event_enddate = isset($recurring_data['event_end']) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_end'])) : $event_date;

+		$starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;

+		$endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;

 		$is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';

 		$different_times = !empty($recurring_data['different_times']) ? true : false;

 	

-		$recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );

-		$is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;

+		$recurring_pkg = geodir_event_recurring_pkg($gd_post_info);

+		$is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true;

 			

 		if ($recurring_pkg && $is_recurring) {

 			$recurring_dates = $event_date;

@@ -5834,13 +5834,13 @@ 
 			$recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';

 			

 			if (!empty($recurring_data['event_recurring_dates'])) {

-				$event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

+				$event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

 				

 				if (!empty($event_recurring_dates)) {

 					$recurring_dates = array();

 					

 					foreach ($event_recurring_dates as $date) {

-						$recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

+						$recurring_dates[] = date_i18n('d/m/Y', strtotime($date));

 					}

 					

 					$recurring_dates = implode(",", $recurring_dates);

@@ -5856,7 +5856,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['starttimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_starttimes = implode(",", $times);

@@ -5866,7 +5866,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['endtimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_endtimes = implode(",", $times);

@@ -5878,8 +5878,8 @@ 
 					}

 				}

 			} else {

-				$event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;

-				$recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

+				$event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1;

+				$recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

 				

 				if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

 					$week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

@@ -5895,11 +5895,11 @@ 
 				}

 				

 				$recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;

-				if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {

-					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : '';

+				if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {

+					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['repeat_end'])) : '';

 					$max_recurring_count = empty($recurring_end_date) ? 1 : '';

 				} else {

-					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);

+					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1);

 				}

 			}

 		}

@@ -5963,9 +5963,9 @@ 
  * @return array Event data array.

  */

 function geodir_imex_process_event_data($gd_post) {

-	$recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );

+	$recurring_pkg = geodir_event_recurring_pkg((object) $gd_post);

 

-	$is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;

+	$is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true;

 	$event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_date($gd_post['event_date'], 'Y-m-d') : '';

 	$event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_date($gd_post['event_enddate'], 'Y-m-d') : $event_date;

 	$all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;

@@ -6012,17 +6012,17 @@ 
 				$event_recurring_dates = implode(",", $event_recurring_dates);

 			}

 		} else {

-			$duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;

-			$repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;

-			$max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;

-			$repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_date($gd_post['recurring_end_date'], 'Y-m-d') : '';

+			$duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1;

+			$repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1;

+			$max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1;

+			$repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_date($gd_post['recurring_end_date'], 'Y-m-d') : '';

 			

 			$repeat_end_type = $repeat_end != '' ? 1 : 0;

 			$max_repeat = $repeat_end != '' ? '' : $max_repeat;

 			

 			$week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));

 			

-			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

+			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

 			$repeat_days = array();

 			if (!empty($a_repeat_days)) {

 				foreach ($a_repeat_days as $repeat_day) {

@@ -6040,7 +6040,7 @@ 
 			$repeat_weeks = array();

 			if (!empty($a_repeat_weeks)) {

 				foreach ($a_repeat_weeks as $repeat_week) {

-					$repeat_weeks[] = (int)$repeat_week;

+					$repeat_weeks[] = (int) $repeat_week;

 				}

 				

 				$repeat_weeks = array_unique($repeat_weeks);

@@ -6104,7 +6104,7 @@ 
 

     $page_found = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",

             array($slug)

         )

     );

@@ -6159,7 +6159,7 @@ 
  */

 function geodir_admin_upgrade_notice() {

     $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+    $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");

     echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

@@ -6171,7 +6171,7 @@ 
  * @param (object) $r

  * @return (string) $output

  */

-function geodire_admin_upgrade_notice( $plugin_data, $r )

+function geodire_admin_upgrade_notice($plugin_data, $r)

 {

     // readme contents

     $args = array(

@@ -6179,7 +6179,7 @@ 
         'redirection' => 5

     );

     $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+    $data = wp_remote_get($url, $args);

 

     if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

@@ -6194,20 +6194,20 @@ 
 function geodir_in_plugin_update_message($content) {

     // Output Upgrade Notice

     $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis';

     $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

+    if (preg_match($regexp, $content, $matches)) {

+        if (empty($matches)) {return; }

 

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

+        $version = trim($matches[1]);

+        if ($version && $version > GEODIRECTORY_VERSION) {

 

 

-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

+        $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));

+        if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {

             $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+            foreach ($notices as $index => $line) {

+                $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));

             }

             $upgrade_notice .= '</div> ';

         }

@@ -6231,7 +6231,7 @@ 
 		$default_language = $sitepress->get_default_language();

 		if ($current_language != 'all' && $current_language != $default_language) {

 	?>

-	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>

+	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory'); ?></strong></p></div>

 	<?php

 		}

 	}

@@ -6246,7 +6246,7 @@ 
  * @param array Listing statuses to be skipped.

  */

 function geodir_imex_export_skip_statuses() {

-    $statuses = array( 'trash', 'auto-draft' );

+    $statuses = array('trash', 'auto-draft');

     

     /**

      * Filter the statuses to skip during GD export listings.

@@ -6256,7 +6256,7 @@ 
      *

      * @param array $statuses Listing statuses to be skipped.

      */

-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

+    $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);

      

     return $statuses;

 }

@@ -6327,16 +6327,16 @@ 
 function geodir_imex_get_filter_where($where = '', $post_type = '') {

     global $wpdb;

     

-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+    $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

     

-    if ( !empty( $filters ) ) {

-        foreach ( $filters as $field => $value ) {

+    if (!empty($filters)) {

+        foreach ($filters as $field => $value) {

             switch ($field) {

                 case 'start_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'";

                 break;

                 case 'end_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'";

                 break;

             }

         }

@@ -6348,25 +6348,25 @@ 
 add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);

 

 

-function geodir_fix_for_primer_theme(){

-    if(!defined( 'PRIMER_VERSION' )){return;}

+function geodir_fix_for_primer_theme() {

+    if (!defined('PRIMER_VERSION')) {return; }

     global $pagenow;

 

-    if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){

+    if (('post.php' === $pagenow || 'post-new.php' === $pagenow) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']))) {

 

-        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );

+        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type($_GET['post']);

 

         $post_types = geodir_get_posttypes();

-        if ($post_type && in_array($post_type, $post_types) ) {

+        if ($post_type && in_array($post_type, $post_types)) {

             global $primer_customizer_layouts;

-            remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);

+            remove_action('add_meta_boxes', array($primer_customizer_layouts, 'add_meta_box'), 10);

         }

     }

 

 }

 

-if(is_admin()){

-    add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);  

+if (is_admin()) {

+    add_action('add_meta_boxes', 'geodir_fix_for_primer_theme', 0);  

 }

 

 

@@ -6499,32 +6499,32 @@ 
 

 function geodir_ga_activation_url() {

 

-    return add_query_arg( array(

+    return add_query_arg(array(

         'next'          => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),

         'scope'         => GEODIR_GA_SCOPE,

         'response_type' => 'code',

         'redirect_uri'  => GEODIR_GA_REDIRECT,

         'client_id'     => GEODIR_GA_CLIENTID,

-    ), 'https://accounts.google.com/o/oauth2/auth' );

+    ), 'https://accounts.google.com/o/oauth2/auth');

 

     return $url;

 }

 

-function geodir_gd_accounts(){

+function geodir_gd_accounts() {

     $accounts = array();

-    $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true );

-    if($useAuth){

+    $useAuth = (get_option('geodir_ga_auth_code') == '' ? false : true);

+    if ($useAuth) {

         try {

             $accounts = geodir_ga_get_analytics_accounts();

         } catch (Exception $e) {

-            geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );

+            geodir_error_log(wp_sprintf(__('GD Google Analytics API Error(%s) : %s', 'geodirectory'), $e->getCode(), $e->getMessage()));

         }

         

-        if(is_array($accounts)){

-            $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);

-        }elseif(get_option('geodir_ga_account_id')){

+        if (is_array($accounts)) {

+            $accounts = array_merge(array(__('Select Account', 'geodirectory')), $accounts);

+        }elseif (get_option('geodir_ga_account_id')) {

             $accounts = array();

-            $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';

+            $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required', 'geodirectory').' ('.get_option('geodir_ga_account_id').')';

         }

     }

     return $accounts;

@@ -6535,21 +6535,21 @@ 
     global $gd_ga_errors;

     $accounts = array();

 

-    if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}

+    if (get_option('geodir_ga_auth_token') === false) {update_option('geodir_ga_auth_token', ''); }

 

 

-    if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){

+    if (get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])) {

       return get_option('geodir_gd_uids');

     }

 

     # Create a new Gdata call

-    if ( trim(get_option('geodir_ga_auth_code')) != '' )

+    if (trim(get_option('geodir_ga_auth_code')) != '')

         $stats = new GDGoogleAnalyticsStats();

     else

         return false;

 

     # Check if Google sucessfully logged in

-    if ( ! $stats->checkLogin() )

+    if (!$stats->checkLogin())

         return false;

 

     # Get a list of accounts

@@ -6561,28 +6561,28 @@ 
     }

 

 

-    natcasesort ($accounts);

+    natcasesort($accounts);

 

     # Return the account array if there are accounts

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

-        update_option('geodir_gd_uids',$accounts);

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

+        update_option('geodir_gd_uids', $accounts);

         return $accounts;

     }

     else

         return false;

 }

 

-add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' );

-function geodir_ga_deauthorize(){

+add_action('wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize');

+function geodir_ga_deauthorize() {

 

-    if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {

+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'gd_ga_deauthorize')) {

 

-        die( 'Security check' );

+        die('Security check');

 

     } else {

-        update_option('geodir_ga_auth_token','');

-        update_option('geodir_ga_auth_code','');

-        update_option('geodir_gd_uids','');

+        update_option('geodir_ga_auth_token', '');

+        update_option('geodir_ga_auth_code', '');

+        update_option('geodir_gd_uids', '');

 

 

         echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');

@@ -6615,22 +6615,22 @@ 
  * @since 1.6.21

  * @return array

  */

-function geodir_listing_image_size_arr(){

+function geodir_listing_image_size_arr() {

 

     global $_wp_additional_image_sizes;

 

     $sizes = array();

 

-    foreach ( get_intermediate_image_sizes() as $_size ) {

-        if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {

-            $sizes[ $_size ]['width']  = get_option( "{$_size}_size_w" );

-            $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );

-            $sizes[ $_size ]['crop']   = (bool) get_option( "{$_size}_crop" );

-        } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {

-            $sizes[ $_size ] = array(

-                'width'  => $_wp_additional_image_sizes[ $_size ]['width'],

-                'height' => $_wp_additional_image_sizes[ $_size ]['height'],

-                'crop'   => $_wp_additional_image_sizes[ $_size ]['crop'],

+    foreach (get_intermediate_image_sizes() as $_size) {

+        if (in_array($_size, array('thumbnail', 'medium', 'medium_large', 'large'))) {

+            $sizes[$_size]['width']  = get_option("{$_size}_size_w");

+            $sizes[$_size]['height'] = get_option("{$_size}_size_h");

+            $sizes[$_size]['crop']   = (bool) get_option("{$_size}_crop");

+        } elseif (isset($_wp_additional_image_sizes[$_size])) {

+            $sizes[$_size] = array(

+                'width'  => $_wp_additional_image_sizes[$_size]['width'],

+                'height' => $_wp_additional_image_sizes[$_size]['height'],

+                'crop'   => $_wp_additional_image_sizes[$_size]['crop'],

             );

         }

     }

@@ -6641,9 +6641,9 @@ 
 

     $options['default'] = __('GD Default', 'geodirectory');

 

-    if(!empty($sizes)){

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

-            $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )';

+    if (!empty($sizes)) {

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

+            $options[$key] = $key.' ( '.$val['width'].' x '.$val['height'].' )';

         }

     }

 

Indentation +2945 added lines, -2945 removed lines

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

  */

 function geodir_deactivation() {

-    // Update installed variable

-    update_option("geodir_installed", 0);

+	// Update installed variable

+	update_option("geodir_installed", 0);

 

-    // Remove rewrite rules and then recreate rewrite rules.

-    flush_rewrite_rules();

+	// Remove rewrite rules and then recreate rewrite rules.

+	flush_rewrite_rules();

 }

 

 if (!function_exists('geodir_admin_styles')) {

-    /**

-     * Enqueue Admin Styles.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles() {

-        wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-admin-css');

+	/**

+	 * Enqueue Admin Styles.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles() {

+		wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-admin-css');

 

-        wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-frontend-style');

+		wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-frontend-style');

 

-        wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-chosen-style');

+		wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-chosen-style');

 

-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

+		wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

 

-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-jquery-ui-css');

+		wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-jquery-ui-css');

 

-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-custom-fields-css');

+		wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-custom-fields-css');

 

-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-pluplodar-css');

+		wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-pluplodar-css');

 

-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-rating-style');

+		wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-rating-style');

 

-        wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-rtl-style');

-    }

+		wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-rtl-style');

+	}

 }

 

 if (!function_exists('geodir_admin_styles_req')) {

-    /**

-     * Loads stylesheets from CDN.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles_req()

-    {

+	/**

+	 * Loads stylesheets from CDN.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles_req()

+	{

 

-        wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('font-awesome');

+		wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('font-awesome');

 

-        wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-admin');

+		wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-admin');

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_scripts')) {

-    /**

-     * Enqueue Admin Scripts.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_scripts()

-    {

-        $geodir_map_name = geodir_map_name();

+	/**

+	 * Enqueue Admin Scripts.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_scripts()

+	{

+		$geodir_map_name = geodir_map_name();

         

-        wp_enqueue_script('jquery');

+		wp_enqueue_script('jquery');

 

-        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

+		wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

 

-        wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

-        wp_enqueue_script('chosen');

+		wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

+		wp_enqueue_script('chosen');

 

-        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-choose-ajax');

+		wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-choose-ajax');

 

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

-            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

-        }

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

+			wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

+		}

 

-        wp_enqueue_script('geodirectory-custom-fields-script');

-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

+		wp_enqueue_script('geodirectory-custom-fields-script');

+		$plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

 

-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

+		wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

 

-        if (in_array($geodir_map_name, array('auto', 'google'))) {

-            $map_lang = "&language=" . geodir_get_map_default_language();

-            $map_key = "&key=" . geodir_get_map_api_key();

-            /** This filter is documented in geodirectory_template_tags.php */

-            $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-            wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);

+		if (in_array($geodir_map_name, array('auto', 'google'))) {

+			$map_lang = "&language=" . geodir_get_map_default_language();

+			$map_key = "&key=" . geodir_get_map_api_key();

+			/** This filter is documented in geodirectory_template_tags.php */

+			$map_extra = apply_filters('geodir_googlemap_script_extra', '');

+			wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);

             

-            // Overlapping Marker Spiderfier

-            wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_script('geodirectory-g-overlappingmarker-script');

-        }

+			// Overlapping Marker Spiderfier

+			wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_script('geodirectory-g-overlappingmarker-script');

+		}

         

-        if ($geodir_map_name == 'osm') {

-            // Leaflet OpenStreetMap

-            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_style('geodirectory-leaflet-style');

+		if ($geodir_map_name == 'osm') {

+			// Leaflet OpenStreetMap

+			wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_style('geodirectory-leaflet-style');

                 

-            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_script('geodirectory-leaflet-script');

+			wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_script('geodirectory-leaflet-script');

             

-            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

-            wp_enqueue_script('geodirectory-leaflet-geo-script');

+			wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

+			wp_enqueue_script('geodirectory-leaflet-geo-script');

             

-            // Overlapping Marker Spiderfier Leaflet

-            wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

-            wp_enqueue_script('geodirectory-o-overlappingmarker-script');

-        }

-        wp_enqueue_script( 'jquery-ui-autocomplete' );

+			// Overlapping Marker Spiderfier Leaflet

+			wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);

+			wp_enqueue_script('geodirectory-o-overlappingmarker-script');

+		}

+		wp_enqueue_script( 'jquery-ui-autocomplete' );

         

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

-        wp_enqueue_script('geodirectory-goMap-script');

+		wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+		wp_enqueue_script('geodirectory-goMap-script');

 

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-goMap-script');

+		wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

@@ -150,166 +150,166 @@ 
 			wp_enqueue_script('geodir-jRating-js');

 		}

 

-        wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodir-on-document-load');

-

-

-        // SCRIPT FOR UPLOAD

-        wp_enqueue_script('plupload-all');

-        wp_enqueue_script('jquery-ui-sortable');

-

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-plupload-script');

-

-        // SCRIPT FOR UPLOAD END

-

-

-        // place js config array for plupload

-        $plupload_init = array(

-            'runtimes' => 'html5,silverlight,html4',

-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

-            'container' => 'plupload-upload-ui', // will be adjusted per uploader

-            'file_data_name' => 'async-upload', // will be adjusted per uploader

-            'multiple_queues' => true,

-            'max_file_size' => geodir_max_upload_size(),

-            'url' => admin_url('admin-ajax.php'),

-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

-            'multipart' => true,

-            'urlstream_upload' => true,

-            'multi_selection' => false, // will be added per uploader

-            // additional post data to send to our ajax hook

-            'multipart_params' => array(

-                '_ajax_nonce' => "", // will be added per uploader

-                'action' => 'plupload_action', // the ajax action name

-                'imgid' => 0 // will be added per uploader

-            )

-        );

-        $base_plupload_config = json_encode($plupload_init);

-

-

-        $thumb_img_arr = array();

-

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

-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

-

-        $totImg = '';

-        $image_limit = '';

-        if (!empty($thumb_img_arr)) {

-            $totImg = count($thumb_img_arr);

-        }

+		wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodir-on-document-load');

+

+

+		// SCRIPT FOR UPLOAD

+		wp_enqueue_script('plupload-all');

+		wp_enqueue_script('jquery-ui-sortable');

+

+		wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-plupload-script');

+

+		// SCRIPT FOR UPLOAD END

+

+

+		// place js config array for plupload

+		$plupload_init = array(

+			'runtimes' => 'html5,silverlight,html4',

+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

+			'container' => 'plupload-upload-ui', // will be adjusted per uploader

+			'file_data_name' => 'async-upload', // will be adjusted per uploader

+			'multiple_queues' => true,

+			'max_file_size' => geodir_max_upload_size(),

+			'url' => admin_url('admin-ajax.php'),

+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

+			'multipart' => true,

+			'urlstream_upload' => true,

+			'multi_selection' => false, // will be added per uploader

+			// additional post data to send to our ajax hook

+			'multipart_params' => array(

+				'_ajax_nonce' => "", // will be added per uploader

+				'action' => 'plupload_action', // the ajax action name

+				'imgid' => 0 // will be added per uploader

+			)

+		);

+		$base_plupload_config = json_encode($plupload_init);

+

+

+		$thumb_img_arr = array();

+

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

+			$thumb_img_arr = geodir_get_images($_REQUEST['pid']);

+

+		$totImg = '';

+		$image_limit = '';

+		if (!empty($thumb_img_arr)) {

+			$totImg = count($thumb_img_arr);

+		}

 

-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

-            'totalImg' => $totImg,

-            'image_limit' => $image_limit,

-            'upload_img_size' => geodir_max_upload_size());

+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

+			'totalImg' => $totImg,

+			'image_limit' => $image_limit,

+			'upload_img_size' => geodir_max_upload_size());

 

-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

 

-        $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

-        wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

+		$ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

+		wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

 

 

-        wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_script('geodirectory-admin-script');

+		wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_script('geodirectory-admin-script');

 

-        wp_enqueue_style('farbtastic');

-        wp_enqueue_script('farbtastic');

+		wp_enqueue_style('farbtastic');

+		wp_enqueue_script('farbtastic');

 

-        $screen = get_current_screen();

-        if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

-        }

+		$screen = get_current_screen();

+		if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

+			wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

+		}

 

-        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));

-        wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

+		$ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));

+		wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu')) {

-    /**

-     * Admin Menus

-     *

-     * Sets up the admin menus in wordpress.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global array $menu Menu array.

-     * @global object $geodirectory GeoDirectory plugin object.

-     */

-    function geodir_admin_menu()

-    {

-        global $menu, $geodirectory;

+	/**

+	 * Admin Menus

+	 *

+	 * Sets up the admin menus in wordpress.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global array $menu Menu array.

+	 * @global object $geodirectory GeoDirectory plugin object.

+	 */

+	function geodir_admin_menu()

+	{

+		global $menu, $geodirectory;

 

-        if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

+		if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

 

-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

+		add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

 

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu_order')) {

-    /**

-     * Order admin menus.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $menu_order Menu order array.

-     * @return array Modified menu order array.

-     */

-    function geodir_admin_menu_order($menu_order)

-    {

-

-        // Initialize our custom order array

-        $geodir_menu_order = array();

-

-        // Get the index of our custom separator

-        $geodir_separator = array_search('separator-geodirectory', $menu_order);

-

-        // Get index of posttype menu

-        $post_types = geodir_get_posttypes();

-

-        // Loop through menu order and do some rearranging

-        foreach ($menu_order as $index => $item) :

-

-            if ((('geodirectory') == $item)) :

-                $geodir_menu_order[] = 'separator-geodirectory';

-                if (!empty($post_types)) {

-                    foreach ($post_types as $post_type) {

-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

-                    }

-                }

-                $geodir_menu_order[] = $item;

+	/**

+	 * Order admin menus.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $menu_order Menu order array.

+	 * @return array Modified menu order array.

+	 */

+	function geodir_admin_menu_order($menu_order)

+	{

 

-                unset($menu_order[$geodir_separator]);

-            //unset( $menu_order[$geodir_places] );

-            elseif (!in_array($item, array('separator-geodirectory'))) :

-                $geodir_menu_order[] = $item;

-            endif;

+		// Initialize our custom order array

+		$geodir_menu_order = array();

 

-        endforeach;

+		// Get the index of our custom separator

+		$geodir_separator = array_search('separator-geodirectory', $menu_order);

 

-        // Return order

-        return $geodir_menu_order;

-    }

+		// Get index of posttype menu

+		$post_types = geodir_get_posttypes();

+

+		// Loop through menu order and do some rearranging

+		foreach ($menu_order as $index => $item) :

+

+			if ((('geodirectory') == $item)) :

+				$geodir_menu_order[] = 'separator-geodirectory';

+				if (!empty($post_types)) {

+					foreach ($post_types as $post_type) {

+						$geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

+					}

+				}

+				$geodir_menu_order[] = $item;

+

+				unset($menu_order[$geodir_separator]);

+			//unset( $menu_order[$geodir_places] );

+			elseif (!in_array($item, array('separator-geodirectory'))) :

+				$geodir_menu_order[] = $item;

+			endif;

+

+		endforeach;

+

+		// Return order

+		return $geodir_menu_order;

+	}

 }

 

 if (!function_exists('geodir_admin_custom_menu_order')) {

-    /**

-     * Enables custom menu order.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return bool

-     */

-    function geodir_admin_custom_menu_order()

-    {

-        if (!current_user_can('manage_options')) return false;

-        return true;

-    }

+	/**

+	 * Enables custom menu order.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return bool

+	 */

+	function geodir_admin_custom_menu_order()

+	{

+		if (!current_user_can('manage_options')) return false;

+		return true;

+	}

 }

 

 /**

@@ -320,51 +320,51 @@ 
  */

 function geodir_before_admin_panel()

 {

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

-        echo '<div id="message" class="updated fade">

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

+		echo '<div id="message" class="updated fade">

                         <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>

                         <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>

                 </div>';

 

-    }

+	}

 

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

-        switch ($_REQUEST['msg']) {

-            case 'success':

-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

-                flush_rewrite_rules(false);

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

+		switch ($_REQUEST['msg']) {

+			case 'success':

+				echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

+				flush_rewrite_rules(false);

 

-                break;

+				break;

 			case 'fail':

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

 				

 				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

+					echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

 				else

 					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

-                break;

-        }

-    }

+				break;

+		}

+	}

 

-    $geodir_load_map = get_option('geodir_load_map');

-    $need_map_key = false;

-    if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

-        $need_map_key = true;

-    }

+	$geodir_load_map = get_option('geodir_load_map');

+	$need_map_key = false;

+	if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

+		$need_map_key = true;

+	}

 

-    if (!geodir_get_map_api_key() && $need_map_key) {

-        echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

-    }

+	if (!geodir_get_map_api_key() && $need_map_key) {

+		echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

+	}

 

-    if (!geodir_is_default_location_set()) {

-        echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+	if (!geodir_is_default_location_set()) {

+		echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

 

-    }

+	}

 

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

-        echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

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

+		echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

 

-    }

+	}

 

 

 

@@ -381,19 +381,19 @@ 
  */

 function geodir_handle_option_form_submit($current_tab)

 {

-    global $geodir_settings;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

-        /**

-         * Contains settings array for current tab.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('option-pages/' . $current_tab . '_array.php');

-    }

-    if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+	global $geodir_settings;

+	if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

+		/**

+		 * Contains settings array for current tab.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('option-pages/' . $current_tab . '_array.php');

+	}

+	if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

+		if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+		if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -405,38 +405,38 @@ 
 		 */

 		do_action('geodir_before_update_options', $current_tab, $geodir_settings);		

 		

-        if (!empty($geodir_settings[$current_tab]))

-            geodir_update_options($geodir_settings[$current_tab]);

+		if (!empty($geodir_settings[$current_tab]))

+			geodir_update_options($geodir_settings[$current_tab]);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * @since 1.0.0

-         * @param array $geodir_settings The array of GeoDirectory settings.

-         * @see 'geodir_before_update_options'

-         */

-        do_action('geodir_update_options', $geodir_settings);

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * @since 1.0.0

+		 * @param array $geodir_settings The array of GeoDirectory settings.

+		 * @see 'geodir_before_update_options'

+		 */

+		do_action('geodir_update_options', $geodir_settings);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * Provides tab specific settings.

-         *

-         * @since 1.0.0

-         * @param string $current_tab The current settings tab name.

-         * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

-         */

-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * Provides tab specific settings.

+		 *

+		 * @since 1.0.0

+		 * @param string $current_tab The current settings tab name.

+		 * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

+		 */

+		do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

 

-        flush_rewrite_rules(false);

+		flush_rewrite_rules(false);

 

-        $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

+		$current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

 

-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

+		$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

 

-        wp_redirect($redirect_url);

-        exit();

-    endif;

+		wp_redirect($redirect_url);

+		exit();

+	endif;

 

 

 }

@@ -454,144 +454,144 @@ 
  * @return bool Returns true if saved.

  */

 function geodir_update_options($options, $dummy = false) {

-    if ((!isset($_POST) || !$_POST) && !$dummy) return false;

+	if ((!isset($_POST) || !$_POST) && !$dummy) return false;

 

-    foreach ($options as $value) {

-        if ($dummy && isset($value['std']))

-            $_POST[$value['id']] = $value['std'];

+	foreach ($options as $value) {

+		if ($dummy && isset($value['std']))

+			$_POST[$value['id']] = $value['std'];

 

 

-        if (isset($value['type']) && $value['type'] == 'checkbox') :

+		if (isset($value['type']) && $value['type'] == 'checkbox') :

 

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

-                update_option($value['id'], $_POST[$value['id']]);

-            } else {

-                update_option($value['id'], 0);

-            }

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

+				update_option($value['id'], $_POST[$value['id']]);

+			} else {

+				update_option($value['id'], 0);

+			}

 

-        elseif (isset($value['type']) && $value['type'] == 'image_width') :

+		elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

-                if (isset($_POST[$value['id'] . '_crop'])) :

-                    update_option($value['id'] . '_crop', 1);

-                else :

-                    update_option($value['id'] . '_crop', 0);

-                endif;

-            } else {

-                update_option($value['id'] . '_width', $value['std']);

-                update_option($value['id'] . '_height', $value['std']);

-                update_option($value['id'] . '_crop', 1);

-            }

+			if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

+				update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

+				update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

+				if (isset($_POST[$value['id'] . '_crop'])) :

+					update_option($value['id'] . '_crop', 1);

+				else :

+					update_option($value['id'] . '_crop', 0);

+				endif;

+			} else {

+				update_option($value['id'] . '_width', $value['std']);

+				update_option($value['id'] . '_height', $value['std']);

+				update_option($value['id'] . '_crop', 1);

+			}

 

-        elseif (isset($value['type']) && $value['type'] == 'map') :

-            $post_types = array();

-            $categories = array();

+		elseif (isset($value['type']) && $value['type'] == 'map') :

+			$post_types = array();

+			$categories = array();

 

-            if (!empty($_POST['home_map_post_types'])) :

-                foreach ($_POST['home_map_post_types'] as $post_type) :

-                    $post_types[] = $post_type;

-                endforeach;

-            endif;

+			if (!empty($_POST['home_map_post_types'])) :

+				foreach ($_POST['home_map_post_types'] as $post_type) :

+					$post_types[] = $post_type;

+				endforeach;

+			endif;

 

-            update_option('geodir_exclude_post_type_on_map', $post_types);

+			update_option('geodir_exclude_post_type_on_map', $post_types);

 

-            if (!empty($_POST['post_category'])) :

-                foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

-                    $categories[$texonomy] = array();

-                    foreach ($cat_arr as $category) :

-                        $categories[$texonomy][] = $category;

-                    endforeach;

-                    $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

-                endforeach;

-            endif;

-            update_option('geodir_exclude_cat_on_map', $categories);

-            update_option('geodir_exclude_cat_on_map_upgrade', 1);

-        elseif (isset($value['type']) && $value['type'] == 'map_default_settings') :

+			if (!empty($_POST['post_category'])) :

+				foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

+					$categories[$texonomy] = array();

+					foreach ($cat_arr as $category) :

+						$categories[$texonomy][] = $category;

+					endforeach;

+					$categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

+				endforeach;

+			endif;

+			update_option('geodir_exclude_cat_on_map', $categories);

+			update_option('geodir_exclude_cat_on_map_upgrade', 1);

+		elseif (isset($value['type']) && $value['type'] == 'map_default_settings') :

 

 

-            if (!empty($_POST['geodir_default_map_language'])):

-                update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

-            endif;

+			if (!empty($_POST['geodir_default_map_language'])):

+				update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

+			endif;

 

 

-            if (!empty($_POST['geodir_default_map_search_pt'])):

-                update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

-            endif;

+			if (!empty($_POST['geodir_default_map_search_pt'])):

+				update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

+			endif;

 

 

-        elseif (isset($value['type']) && $value['type'] == 'file') :

+		elseif (isset($value['type']) && $value['type'] == 'file') :

 

 

-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

+			if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

 

-                if (get_option($value['id'])) {

-                    $image_name_arr = explode('/', get_option($value['id']));

-                    $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

+				if (get_option($value['id'])) {

+					$image_name_arr = explode('/', get_option($value['id']));

+					$noimg_name = end($image_name_arr);

+					$img_path = $uploads['path'] . '/' . $noimg_name;

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

-                update_option($value['id'], '');

-            }

+				update_option($value['id'], '');

+			}

 

-            $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

-            $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

-

-            if (!empty($filename)):

-                $ext = pathinfo($filename, PATHINFO_EXTENSION);

-                $uplaods = array();

-

-                foreach ($uploadedfile as $key => $uplaod):

-                    if ($key == 'name'):

-                        $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

-                    endif;

-                endforeach;

-

-                $uploads = wp_upload_dir();

-

-                if (get_option($value['id'])) {

-                    $image_name_arr = explode('/', get_option($value['id']));

-                    $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

+			$uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

+			$filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

+

+			if (!empty($filename)):

+				$ext = pathinfo($filename, PATHINFO_EXTENSION);

+				$uplaods = array();

+

+				foreach ($uploadedfile as $key => $uplaod):

+					if ($key == 'name'):

+						$uplaods[$key] = $filename;

+					else :

+						$uplaods[$key] = $uplaod;

+					endif;

+				endforeach;

+

+				$uploads = wp_upload_dir();

+

+				if (get_option($value['id'])) {

+					$image_name_arr = explode('/', get_option($value['id']));

+					$noimg_name = end($image_name_arr);

+					$img_path = $uploads['path'] . '/' . $noimg_name;

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

-                $upload_overrides = array('test_form' => false);

-                $movefile = wp_handle_upload($uplaods, $upload_overrides);

+				$upload_overrides = array('test_form' => false);

+				$movefile = wp_handle_upload($uplaods, $upload_overrides);

 

-                update_option($value['id'], $movefile['url']);

+				update_option($value['id'], $movefile['url']);

 

-            endif;

+			endif;

 

-            if (!get_option($value['id']) && isset($value['value'])):

-                update_option($value['id'], $value['value']);

-            endif;

+			if (!get_option($value['id']) && isset($value['value'])):

+				update_option($value['id'], $value['value']);

+			endif;

 

 

-        else :

-            // same menu setting per theme.

-            if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

-                $theme = wp_get_theme();

-                update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

-            }

+		else :

+			// same menu setting per theme.

+			if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

+				$theme = wp_get_theme();

+				update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

+			}

 

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

-                update_option($value['id'], $_POST[$value['id']]);

-            } else {

-                delete_option($value['id']);

-            }

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

+				update_option($value['id'], $_POST[$value['id']]);

+			} else {

+				delete_option($value['id']);

+			}

 

-        endif;

-    }

-    if ($dummy)

-        $_POST = array();

-    return true;

+		endif;

+	}

+	if ($dummy)

+		$_POST = array();

+	return true;

 

 }

 

@@ -640,33 +640,33 @@ 
 function places_custom_fields_tab($tabs)

 {

 

-    $geodir_post_types = get_option('geodir_post_types');

+	$geodir_post_types = get_option('geodir_post_types');

 

-    if (!empty($geodir_post_types)) {

+	if (!empty($geodir_post_types)) {

 

-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

 

-            $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory');

+			$listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory');

 

-            $tabs[$geodir_post_type . '_fields_settings'] = array(

-                'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),

-                'subtabs' => array(

-                    array('subtab' => 'custom_fields',

-                        'label' => __('Custom Fields', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                    array('subtab' => 'sorting_options',

-                        'label' => __('Sorting Options', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                ),

-                'tab_index' => 9,

-                'request' => array('listing_type' => $geodir_post_type)

-            );

+			$tabs[$geodir_post_type . '_fields_settings'] = array(

+				'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),

+				'subtabs' => array(

+					array('subtab' => 'custom_fields',

+						'label' => __('Custom Fields', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+					array('subtab' => 'sorting_options',

+						'label' => __('Sorting Options', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+				),

+				'tab_index' => 9,

+				'request' => array('listing_type' => $geodir_post_type)

+			);

 

-        endforeach;

+		endforeach;

 

-    }

+	}

 

-    return $tabs;

+	return $tabs;

 }

 

 

@@ -682,9 +682,9 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

-    wp_enqueue_script( 'jquery-ui-progressbar' );

-    $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

-    return $tabs;

+	wp_enqueue_script( 'jquery-ui-progressbar' );

+	$tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

+	return $tabs;

 }

 

 /**

@@ -699,8 +699,8 @@ 
  */

 function geodir_compatibility_setting_tab($tabs)

 {

-    $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

-    return $tabs;

+	$tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

+	return $tabs;

 }

 

 

@@ -716,144 +716,144 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

-    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');

-    return $tabs;

+	$tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');

+	return $tabs;

 }

 

 

 if (!function_exists('geodir_edit_post_columns')) {

-    /**

-     * Modify admin post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_edit_post_columns($columns)

-    {

-

-        $new_columns = array('location' => __('Location (ID)', 'geodirectory'),

-            'categorys' => __('Categories', 'geodirectory'));

-

-        if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

-        {

-            $offset = 0; // should we prepend $array with $data?

-            $offset = count($columns); // or should we append $array with $data? lets pick this one...

-        }

+	/**

+	 * Modify admin post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_edit_post_columns($columns)

+	{

 

-        $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

+		$new_columns = array('location' => __('Location (ID)', 'geodirectory'),

+			'categorys' => __('Categories', 'geodirectory'));

 

-        $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+		if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

+		{

+			$offset = 0; // should we prepend $array with $data?

+			$offset = count($columns); // or should we append $array with $data? lets pick this one...

+		}

 

-        return $columns;

-    }

+		$columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

+

+		$columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+

+		return $columns;

+	}

 }

 

 

 if (!function_exists('geodir_manage_post_columns')) {

-    /**

-     * Adds content to our custom post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post WordPress Post object.

-     * @param string $column The column name.

-     * @param int $post_id The post ID.

-     */

-    function geodir_manage_post_columns($column, $post_id)

-    {

-        global $post, $wpdb;

-

-        switch ($column):

-            /* If displaying the 'city' column. */

-            case 'location' :

-                $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

-                $location = geodir_get_location($location_id);

-                /* If no city is found, output a default message. */

-                if (empty($location)) {

-                    _e('Unknown', 'geodirectory');

-                } else {

-                    /* If there is a city id, append 'city name' to the text string. */

-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

-                }

-                break;

-

-            /* If displaying the 'expire' column. */

-            case 'expire' :

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

-                $d1 = $expire_date; // get expire_date

-                $d2 = date('Y-m-d'); // get current date

-                $state = __('days left', 'geodirectory');

-                $date_diff_text = '';

-                $expire_class = 'expire_left';

-                if ($expire_date != 'Never') {

-                    if (strtotime($d1) < strtotime($d2)) {

-                        $state = __('days overdue', 'geodirectory');

-                        $expire_class = 'expire_over';

-                    }

-                    $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

-                }

-                /* If no expire_date is found, output a default message. */

-                if (empty($expire_date))

-                    echo __('Unknown', 'geodirectory');

-                /* If there is a expire_date, append 'days left' to the text string. */

-                else

-                    echo $expire_date . $date_diff_text;

-                break;

-

-            /* If displaying the 'categorys' column. */

-            case 'categorys' :

-

-                /* Get the categorys for the post. */

-

-

-                $terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

-

-                /* If terms were found. */

-                if (!empty($terms)) {

-                    $out = array();

-                    /* Loop through each term, linking to the 'edit posts' page for the specific term. */

-                    foreach ($terms as $term) {

-                        if (!strstr($term->taxonomy, 'tag')) {

-                            $out[] = sprintf('<a href="%s">%s</a>',

-                                esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

-                                esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

-                            );

-                        }

-                    }

-                    /* Join the terms, separating them with a comma. */

-                    echo(join(', ', $out));

-                } /* If no terms were found, output a default message. */

-                else {

-                    _e('No Categories', 'geodirectory');

-                }

-                break;

+	/**

+	 * Adds content to our custom post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post WordPress Post object.

+	 * @param string $column The column name.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_manage_post_columns($column, $post_id)

+	{

+		global $post, $wpdb;

+

+		switch ($column):

+			/* If displaying the 'city' column. */

+			case 'location' :

+				$location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

+				$location = geodir_get_location($location_id);

+				/* If no city is found, output a default message. */

+				if (empty($location)) {

+					_e('Unknown', 'geodirectory');

+				} else {

+					/* If there is a city id, append 'city name' to the text string. */

+					$add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

+					echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

+				}

+				break;

+

+			/* If displaying the 'expire' column. */

+			case 'expire' :

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

+				$d1 = $expire_date; // get expire_date

+				$d2 = date('Y-m-d'); // get current date

+				$state = __('days left', 'geodirectory');

+				$date_diff_text = '';

+				$expire_class = 'expire_left';

+				if ($expire_date != 'Never') {

+					if (strtotime($d1) < strtotime($d2)) {

+						$state = __('days overdue', 'geodirectory');

+						$expire_class = 'expire_over';

+					}

+					$date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

+					$date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

+				}

+				/* If no expire_date is found, output a default message. */

+				if (empty($expire_date))

+					echo __('Unknown', 'geodirectory');

+				/* If there is a expire_date, append 'days left' to the text string. */

+				else

+					echo $expire_date . $date_diff_text;

+				break;

 

-        endswitch;

-    }

+			/* If displaying the 'categorys' column. */

+			case 'categorys' :

+

+				/* Get the categorys for the post. */

+

+

+				$terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

+

+				/* If terms were found. */

+				if (!empty($terms)) {

+					$out = array();

+					/* Loop through each term, linking to the 'edit posts' page for the specific term. */

+					foreach ($terms as $term) {

+						if (!strstr($term->taxonomy, 'tag')) {

+							$out[] = sprintf('<a href="%s">%s</a>',

+								esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

+								esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

+							);

+						}

+					}

+					/* Join the terms, separating them with a comma. */

+					echo(join(', ', $out));

+				} /* If no terms were found, output a default message. */

+				else {

+					_e('No Categories', 'geodirectory');

+				}

+				break;

+

+		endswitch;

+	}

 }

 

 

 if (!function_exists('geodir_post_sortable_columns')) {

-    /**

-     * Makes admin post listing page columns sortable.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_post_sortable_columns($columns)

-    {

-

-        $columns['expire'] = 'expire';

-

-        return $columns;

-    }

+	/**

+	 * Makes admin post listing page columns sortable.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_post_sortable_columns($columns)

+	{

+

+		$columns['expire'] = 'expire';

+

+		return $columns;

+	}

 }

 

 /**

@@ -867,32 +867,32 @@ 
  * @param int $post_id The post ID.

  */

 function geodir_post_information_save($post_id, $post) {

-    global $wpdb, $current_user;

+	global $wpdb, $current_user;

 

-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

-        return;

-    }

+	if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

+		return;

+	}

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

-    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

-        return;

+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

+		return;

 

-    if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

-        if (isset($_REQUEST['_status']))

-            geodir_change_post_status($post_id, $_REQUEST['_status']);

+	if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

+		if (isset($_REQUEST['_status']))

+			geodir_change_post_status($post_id, $_REQUEST['_status']);

 

-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

-            return;

+		if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

+			return;

 

-        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

-            return;

+		if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

+			return;

 

-        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

-            return;

+		if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

+			return;

 

-        geodir_save_listing($_REQUEST);

-    }

+		geodir_save_listing($_REQUEST);

+	}

 }

 

 /**

@@ -908,102 +908,102 @@ 
  */

 function geodir_admin_fields($options)

 {

-    global $geodirectory;

-

-    $first_title = true;

-    $tab_id = '';

-    $i = 0;

-    foreach ($options as $value) :

-        if (!isset($value['name'])) $value['name'] = '';

-        if (!isset($value['class'])) $value['class'] = '';

-        if (!isset($value['css'])) $value['css'] = '';

-        if (!isset($value['std'])) $value['std'] = '';

-        $desc = '';

-        switch ($value['type']) :

-            case 'dummy_installer':

-                $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

-                geodir_autoinstall_admin_header($post_type);

-                break;

-            case 'title':

-

-                if ($i == 0) {

-                    echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

-                    echo '<div class="inner_content_tab_main">';

-                }

+	global $geodirectory;

+

+	$first_title = true;

+	$tab_id = '';

+	$i = 0;

+	foreach ($options as $value) :

+		if (!isset($value['name'])) $value['name'] = '';

+		if (!isset($value['class'])) $value['class'] = '';

+		if (!isset($value['css'])) $value['css'] = '';

+		if (!isset($value['std'])) $value['std'] = '';

+		$desc = '';

+		switch ($value['type']) :

+			case 'dummy_installer':

+				$post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

+				geodir_autoinstall_admin_header($post_type);

+				break;

+			case 'title':

+

+				if ($i == 0) {

+					echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

+					echo '<div class="inner_content_tab_main">';

+				}

 

-                $i++;

+				$i++;

 

-                if (isset($value['id']) && $value['id'])

-                    $tab_id = $value['id'];

+				if (isset($value['id']) && $value['id'])

+					$tab_id = $value['id'];

 

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+				if (isset($value['desc']) && $value['desc'])

+					$desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

 

-                if (isset($value['name']) && $value['name']) {

-                    if ($first_title === true) {

-                        $first_title = false;

-                    } else {

-                        echo '</div>';

-                    }

-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

+				if (isset($value['name']) && $value['name']) {

+					if ($first_title === true) {

+						$first_title = false;

+					} else {

+						echo '</div>';

+					}

+					echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

 

-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

-                }

+					echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+				}

 

-                /**

-                 * Called after a GeoDirectory settings title is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id'].

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_settings_' . sanitize_title($value['id']));

-                break;

-

-            case 'no_tabs':

-

-                echo '<div class="inner_content_tab_main">';

-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

-

-                break;

-

-            case 'sectionstart':

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

-                if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

-                /**

-                 * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_start.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

-                echo '<table class="form-table">' . "\n\n";

-

-                break;

-            case 'sectionend':

-                /**

-                 * Called before a GeoDirectory settings sectionend is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

-                echo '</table>';

-                /**

-                 * Called after a GeoDirectory settings sectionend is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

-                break;

-            case 'text':

-                ?>

+				/**

+				 * Called after a GeoDirectory settings title is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id'].

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_settings_' . sanitize_title($value['id']));

+				break;

+

+			case 'no_tabs':

+

+				echo '<div class="inner_content_tab_main">';

+				echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+

+				break;

+

+			case 'sectionstart':

+				if (isset($value['desc']) && $value['desc'])

+					$desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

+				if (isset($value['name']) && $value['name'])

+					echo '<h3>' . $value['name'] . $desc . '</h3>';

+				/**

+				 * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_start.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

+				echo '<table class="form-table">' . "\n\n";

+

+				break;

+			case 'sectionend':

+				/**

+				 * Called before a GeoDirectory settings sectionend is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+				echo '</table>';

+				/**

+				 * Called after a GeoDirectory settings sectionend is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+				break;

+			case 'text':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1012,15 +1012,15 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style=" <?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'map-key':

-                ?>

+			case 'map-key':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1029,17 +1029,17 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style=" <?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>"/>

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>"/>

                     <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>

                     <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'password':

-                ?>

+			case 'password':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1048,42 +1048,42 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'html_content':

-                ?>

+			case 'html_content':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

-                break;

+				break;

 

-            case 'color' :

-                ?>

+			case 'color' :

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>" type="text"

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

-                                               echo esc_attr(stripslashes(get_option($value['id'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>" class="colorpick"/> <span

+											   echo esc_attr(stripslashes(get_option($value['id'])));

+										   } else {

+											   echo esc_attr($value['std']);

+										   } ?>" class="colorpick"/> <span

                         class="description"><?php echo $value['desc']; ?></span>

 

                     <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv"

                          style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div>

                 </td>

                 </tr><?php

-                break;

-            case 'image_width' :

-                ?>

+				break;

+			case 'image_width' :

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1105,11 +1105,11 @@ 
 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

-                break;

-            case 'select':

-                $option_value = get_option($value['id']);

-                $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value;

-                ?>

+				break;

+			case 'select':

+				$option_value = get_option($value['id']);

+				$option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value;

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -1118,33 +1118,33 @@ 
                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"

                                             option-ajaxchosen="false">

                         <?php

-                        foreach ($value['options'] as $key => $val) {

-                            $geodir_select_value = '';

-                            if ($option_value != '') {

-                                if ($option_value != '' && $option_value == $key)

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

-                            } else {

-                                if ($value['std'] == $key)

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

-                            }

-                            ?>

+						foreach ($value['options'] as $key => $val) {

+							$geodir_select_value = '';

+							if ($option_value != '') {

+								if ($option_value != '' && $option_value == $key)

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

+							} else {

+								if ($value['std'] == $key)

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

+							}

+							?>

                             <option

                                 value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo geodir_utf8_ucfirst($val) ?></option>

                         <?php

-                        }

-                        ?>

+						}

+						?>

                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'multiselect':

-                $option_values = get_option($value['id']);

-                if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {

-                   $option_values = $value['std'];

-                }

-                $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values;

-                ?>

+			case 'multiselect':

+				$option_values = get_option($value['id']);

+				if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {

+				   $option_values = $value['std'];

+				}

+				$option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values;

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

@@ -1154,26 +1154,26 @@ 
                                             data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

                                             option-ajaxchosen="false">

                         <?php

-                        foreach ($value['options'] as $key => $val) {

-                            if (strpos($key, 'optgroup_start-') === 0) {

-                                ?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php

-                            } else if (strpos($key, 'optgroup_end-') === 0) {

-                                ?></optgroup><?php

-                            } else {

-                                ?>

+						foreach ($value['options'] as $key => $val) {

+							if (strpos($key, 'optgroup_start-') === 0) {

+								?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php

+							} else if (strpos($key, 'optgroup_end-') === 0) {

+								?></optgroup><?php

+							} else {

+								?>

                                 <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>>

                                     <?php echo geodir_utf8_ucfirst($val) ?>

                                 </option>

                             <?php

-                            }

-                        }

-                        ?>

+							}

+						}

+						?>

                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

-            case 'file':

-                ?>

+				break;

+			case 'file':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp">

@@ -1193,87 +1193,87 @@ 
                     <?php } ?>

                 </td>

                 </tr><?php

-                break;

-            case 'map_default_settings' :

-                ?>

+				break;

+			case 'map_default_settings' :

+				?>

 

                 <tr valign="top">

                     <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>

                     <td width="60%">

                         <select name="geodir_default_map_language" style="width:60%">

                             <?php

-                            $arr_map_langages = array(

-                                'ar' => __('ARABIC', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'bg' => __('BULGARIAN', 'geodirectory'),

-                                'bn' => __('BENGALI', 'geodirectory'),

-                                'ca' => __('CATALAN', 'geodirectory'),

-                                'cs' => __('CZECH', 'geodirectory'),

-                                'da' => __('DANISH', 'geodirectory'),

-                                'de' => __('GERMAN', 'geodirectory'),

-                                'el' => __('GREEK', 'geodirectory'),

-                                'en' => __('ENGLISH', 'geodirectory'),

-                                'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

-                                'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

-                                'es' => __('SPANISH', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'fa' => __('FARSI', 'geodirectory'),

-                                'fi' => __('FINNISH', 'geodirectory'),

-                                'fil' => __('FILIPINO', 'geodirectory'),

-                                'fr' => __('FRENCH', 'geodirectory'),

-                                'gl' => __('GALICIAN', 'geodirectory'),

-                                'gu' => __('GUJARATI', 'geodirectory'),

-                                'hi' => __('HINDI', 'geodirectory'),

-                                'hr' => __('CROATIAN', 'geodirectory'),

-                                'hu' => __('HUNGARIAN', 'geodirectory'),

-                                'id' => __('INDONESIAN', 'geodirectory'),

-                                'it' => __('ITALIAN', 'geodirectory'),

-                                'iw' => __('HEBREW', 'geodirectory'),

-                                'ja' => __('JAPANESE', 'geodirectory'),

-                                'kn' => __('KANNADA', 'geodirectory'),

-                                'ko' => __('KOREAN', 'geodirectory'),

-                                'lt' => __('LITHUANIAN', 'geodirectory'),

-                                'lv' => __('LATVIAN', 'geodirectory'),

-                                'ml' => __('MALAYALAM', 'geodirectory'),

-                                'mr' => __('MARATHI', 'geodirectory'),

-                                'nl' => __('DUTCH', 'geodirectory'),

-                                'no' => __('NORWEGIAN', 'geodirectory'),

-                                'pl' => __('POLISH', 'geodirectory'),

-                                'pt' => __('PORTUGUESE', 'geodirectory'),

-                                'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

-                                'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

-                                'ro' => __('ROMANIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'sk' => __('SLOVAK', 'geodirectory'),

-                                'sl' => __('SLOVENIAN', 'geodirectory'),

-                                'sr' => __('SERBIAN', 'geodirectory'),

-                                'sv' => __('	SWEDISH', 'geodirectory'),

-                                'tl' => __('TAGALOG', 'geodirectory'),

-                                'ta' => __('TAMIL', 'geodirectory'),

-                                'te' => __('TELUGU', 'geodirectory'),

-                                'th' => __('THAI', 'geodirectory'),

-                                'tr' => __('TURKISH', 'geodirectory'),

-                                'uk' => __('UKRAINIAN', 'geodirectory'),

-                                'vi' => __('VIETNAMESE', 'geodirectory'),

-                                'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

-                                'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

-                            );

-                            $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

-                            foreach ($arr_map_langages as $language_key => $language_txt) {

-                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

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

-                                else

-                                    $geodir_default_language_selected = '';

-

-                                ?>

+							$arr_map_langages = array(

+								'ar' => __('ARABIC', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'bg' => __('BULGARIAN', 'geodirectory'),

+								'bn' => __('BENGALI', 'geodirectory'),

+								'ca' => __('CATALAN', 'geodirectory'),

+								'cs' => __('CZECH', 'geodirectory'),

+								'da' => __('DANISH', 'geodirectory'),

+								'de' => __('GERMAN', 'geodirectory'),

+								'el' => __('GREEK', 'geodirectory'),

+								'en' => __('ENGLISH', 'geodirectory'),

+								'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

+								'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

+								'es' => __('SPANISH', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'fa' => __('FARSI', 'geodirectory'),

+								'fi' => __('FINNISH', 'geodirectory'),

+								'fil' => __('FILIPINO', 'geodirectory'),

+								'fr' => __('FRENCH', 'geodirectory'),

+								'gl' => __('GALICIAN', 'geodirectory'),

+								'gu' => __('GUJARATI', 'geodirectory'),

+								'hi' => __('HINDI', 'geodirectory'),

+								'hr' => __('CROATIAN', 'geodirectory'),

+								'hu' => __('HUNGARIAN', 'geodirectory'),

+								'id' => __('INDONESIAN', 'geodirectory'),

+								'it' => __('ITALIAN', 'geodirectory'),

+								'iw' => __('HEBREW', 'geodirectory'),

+								'ja' => __('JAPANESE', 'geodirectory'),

+								'kn' => __('KANNADA', 'geodirectory'),

+								'ko' => __('KOREAN', 'geodirectory'),

+								'lt' => __('LITHUANIAN', 'geodirectory'),

+								'lv' => __('LATVIAN', 'geodirectory'),

+								'ml' => __('MALAYALAM', 'geodirectory'),

+								'mr' => __('MARATHI', 'geodirectory'),

+								'nl' => __('DUTCH', 'geodirectory'),

+								'no' => __('NORWEGIAN', 'geodirectory'),

+								'pl' => __('POLISH', 'geodirectory'),

+								'pt' => __('PORTUGUESE', 'geodirectory'),

+								'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

+								'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

+								'ro' => __('ROMANIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'sk' => __('SLOVAK', 'geodirectory'),

+								'sl' => __('SLOVENIAN', 'geodirectory'),

+								'sr' => __('SERBIAN', 'geodirectory'),

+								'sv' => __('	SWEDISH', 'geodirectory'),

+								'tl' => __('TAGALOG', 'geodirectory'),

+								'ta' => __('TAMIL', 'geodirectory'),

+								'te' => __('TELUGU', 'geodirectory'),

+								'th' => __('THAI', 'geodirectory'),

+								'tr' => __('TURKISH', 'geodirectory'),

+								'uk' => __('UKRAINIAN', 'geodirectory'),

+								'vi' => __('VIETNAMESE', 'geodirectory'),

+								'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

+								'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

+							);

+							$geodir_default_map_language = get_option('geodir_default_map_language');

+							if (empty($geodir_default_map_language))

+								$geodir_default_map_language = 'en';

+							foreach ($arr_map_langages as $language_key => $language_txt) {

+								if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

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

+								else

+									$geodir_default_language_selected = '';

+

+								?>

                                 <option

                                     value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option>

 

                             <?php }

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

@@ -1284,46 +1284,46 @@ 
                     <td width="60%">

                         <select name="geodir_default_map_search_pt" style="width:60%">

                             <?php

-                            $post_types = geodir_get_posttypes('array');

-                            $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-                            if (empty($geodir_default_map_search_pt))

-                                $geodir_default_map_search_pt = 'gd_place';

-                            if (is_array($post_types)) {

-                                foreach ($post_types as $key => $post_types_obj) {

-                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

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

-                                    else

-                                        $geodir_search_pt_selected = '';

-

-                                    ?>

+							$post_types = geodir_get_posttypes('array');

+							$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

+							if (empty($geodir_default_map_search_pt))

+								$geodir_default_map_search_pt = 'gd_place';

+							if (is_array($post_types)) {

+								foreach ($post_types as $key => $post_types_obj) {

+									if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

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

+									else

+										$geodir_search_pt_selected = '';

+

+									?>

                                     <option

                                         value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo __($post_types_obj['labels']['singular_name'], 'geodirectory'); ?></option>

 

                                 <?php }

 

-                            }

+							}

 

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

 

                 <?php

-                break;

+				break;

 

-            case 'map':

-                ?>

+			case 'map':

+				?>

                 <tr valign="top">

                     <td class="forminp">

                         <?php

-                        global $post_cat, $cat_display;

-                        $post_types = geodir_get_posttypes('object');

-                        $cat_display = 'checkbox';

-                        $gd_post_types = get_option('geodir_exclude_post_type_on_map');

-                        $gd_cats = get_option('geodir_exclude_cat_on_map');

-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

-                        $count = 1;

-                        ?>

+						global $post_cat, $cat_display;

+						$post_types = geodir_get_posttypes('object');

+						$cat_display = 'checkbox';

+						$gd_post_types = get_option('geodir_exclude_post_type_on_map');

+						$gd_cats = get_option('geodir_exclude_cat_on_map');

+						$gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

+						$count = 1;

+						?>

                         <table width="70%" class="widefat">

                             <thead>

                             <tr>

@@ -1332,18 +1332,18 @@ 
                                 <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th>

                             </tr>

                             <?php

-                            $gd_categs = $gd_cats;

-                            foreach ($post_types as $key => $post_types_obj) :

-                                $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

-                                $gd_taxonomy = geodir_get_taxonomies($key);

-                                if ($gd_cats_upgrade) {

-                                    $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';

-                                    $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

-                                    $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();

-                                }

-                                $post_cat = implode(',', $gd_cats);

-                                $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

-                                ?>

+							$gd_categs = $gd_cats;

+							foreach ($post_types as $key => $post_types_obj) :

+								$checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

+								$gd_taxonomy = geodir_get_taxonomies($key);

+								if ($gd_cats_upgrade) {

+									$gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';

+									$gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

+									$gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();

+								}

+								$post_cat = implode(',', $gd_cats);

+								$gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

+								?>

                                 <tr>

                                     <td valign="top" width="5%"><?php echo $count; ?></td>

                                     <td valign="top" width="25%" id="td_post_types"><input type="checkbox"

@@ -1364,19 +1364,19 @@ 
                     </td>

                 </tr>

                 <?php

-                break;

+				break;

 

-            case 'checkbox' :

+			case 'checkbox' :

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

+					?>

                     <tr valign="top">

                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

                     <label for="<?php echo $value['id'] ?>">

@@ -1386,49 +1386,49 @@ 
                 </fieldset>

                 <?php

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'radio' :

+			case 'radio' :

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

+					?>

                     <tr valign="top">

                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

                     <label for="<?php echo $value['id'];?>">

                         <input name="<?php echo esc_attr($value['id']); ?>"

                                id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

-                            echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+							echo 'checked="checked"';

+						}elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'textarea':

-                ?>

+			case 'textarea':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1441,30 +1441,30 @@ 
 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'editor':

-                ?>

+			case 'editor':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><?php

-                    if (get_option($value['id']))

-                        $content = stripslashes(get_option($value['id']));

-                    else

-                        $content = $value['std'];

+					if (get_option($value['id']))

+						$content = stripslashes(get_option($value['id']));

+					else

+						$content = $value['std'];

 

-                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

+					$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

 

-                    wp_editor($content, esc_attr($value['id']), $editor_settings);

+					wp_editor($content, esc_attr($value['id']), $editor_settings);

 

-                    ?> <span class="description"><?php echo $value['desc'] ?></span>

+					?> <span class="description"><?php echo $value['desc'] ?></span>

 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'single_select_page' :

-                // WPML

+			case 'single_select_page' :

+				// WPML

 				$switch_lang = false;

 				$disabled = '';

 				if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

@@ -1482,18 +1482,18 @@ 
 				//

 				$page_setting = (int)get_option($value['id']);

 

-                $args = array('name' => $value['id'],

-                    'id' => $value['id'],

-                    'sort_column' => 'menu_order',

-                    'sort_order' => 'ASC',

-                    'show_option_none' => ' ',

-                    'class' => $value['class'],

-                    'echo' => false,

-                    'selected' => $page_setting);

+				$args = array('name' => $value['id'],

+					'id' => $value['id'],

+					'sort_column' => 'menu_order',

+					'sort_order' => 'ASC',

+					'show_option_none' => ' ',

+					'class' => $value['class'],

+					'echo' => false,

+					'selected' => $page_setting);

 

-                if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

+				if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

 

-                ?>

+				?>

                 <tr valign="top" class="single_select_page">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1504,17 +1504,17 @@ 
 				if ($switch_lang) {

 					$sitepress->switch_lang($switch_lang, true);

 				}

-                break;

-            case 'single_select_country' :

-                $country_setting = (string)get_option($value['id']);

-                if (strstr($country_setting, ':')) :

-                    $country = current(explode(':', $country_setting));

-                    $state = end(explode(':', $country_setting));

-                else :

-                    $country = $country_setting;

-                    $state = '*';

-                endif;

-                ?>

+				break;

+			case 'single_select_country' :

+				$country_setting = (string)get_option($value['id']);

+				if (strstr($country_setting, ':')) :

+					$country = current(explode(':', $country_setting));

+					$state = end(explode(':', $country_setting));

+				else :

+					$country = $country_setting;

+					$state = '*';

+				endif;

+				?>

                 <tr valign="top">

                 <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -1525,12 +1525,12 @@ 
                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

-            case 'multi_select_countries' :

-                $countries = $geodirectory->countries->countries;

-                asort($countries);

-                $selections = (array)get_option($value['id']);

-                ?>

+				break;

+			case 'multi_select_countries' :

+				$countries = $geodirectory->countries->countries;

+				asort($countries);

+				$selections = (array)get_option($value['id']);

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1538,21 +1538,21 @@ 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"

                             title="Country" class="chosen_select">

                         <?php

-                        if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

-                        endforeach;

-                        ?>

+						if ($countries) foreach ($countries as $key => $val) :

+							echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+						endforeach;

+						?>

                     </select>

                 </td>

                 </tr>

 

                 <?php

 

-                break;

+				break;

 

-            case 'google_analytics' :

-                $selections = (array)get_option($value['id']);

-                    ?>

+			case 'google_analytics' :

+				$selections = (array)get_option($value['id']);

+					?>

                     <tr valign="top">

                         <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                         <td class="forminp">

@@ -1560,62 +1560,62 @@ 
 

                             <?php

 

-                            $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

-                            $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

-                            $state = "&state=123";//any string

-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

-                            $response_type = "&response_type=code";

-                            $client_id = "&client_id=".get_option('geodir_ga_client_id');

-                            $access_type = "&access_type=offline";

-                            $approval_prompt = "&approval_prompt=force";

+							$oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

+							$scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

+							$state = "&state=123";//any string

+							$redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+							$response_type = "&response_type=code";

+							$client_id = "&client_id=".get_option('geodir_ga_client_id');

+							$access_type = "&access_type=offline";

+							$approval_prompt = "&approval_prompt=force";

 

-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

+							$auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

 

 

-                            if (get_option('geodir_ga_auth_token')) {

-                                ?>

+							if (get_option('geodir_ga_auth_token')) {

+								?>

                                 <span class="button-primary"

                                       onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>

                                 <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>

                             <?php

-                                global $gd_ga_errors;

-                                if(!empty($gd_ga_errors)){

-                                    print_r($gd_ga_errors);

-                                }

-                            } else {

-                                ?>

+								global $gd_ga_errors;

+								if(!empty($gd_ga_errors)){

+									print_r($gd_ga_errors);

+								}

+							} else {

+								?>

                                 <span class="button-primary"

                                       onclick="window.open('<?php echo  geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>

                             <?php

-                            }

-                            ?>

+							}

+							?>

                         </td>

                     </tr>

 

                 <?php

 

 

-                break;

+				break;

 

-            case 'field_seperator' :

+			case 'field_seperator' :

 

-                ?>

+				?>

                 <tr valign="top">

                     <td colspan="2" class="forminp geodir_line_seperator"></td>

                 </tr>

                 <?php

 

-                break;

+				break;

 

-        endswitch;

+		endswitch;

 

-    endforeach;

+	endforeach;

 

-    if ($first_title === false) {

-        echo "</div>";

-    }

+	if ($first_title === false) {

+		echo "</div>";

+	}

 

-    ?>

+	?>

 

     <script type="text/javascript">

 

@@ -1675,33 +1675,33 @@ 
  */

 function geodir_post_info_setting()

 {

-    global $post, $post_id;

-

-    $post_type = get_post_type();

-

-    $package_info = array();

-

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

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

-    echo '<div id="geodir_wrapper">';

-    /**

-     * Called before the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_after_default_field_in_meta_box'

-     */

-    do_action('geodir_before_default_field_in_meta_box');

-    //geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

-    // to display all fields in one information box

-    geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

-    /**

-     * Called after the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_before_default_field_in_meta_box'

-     */

-    do_action('geodir_after_default_field_in_meta_box');

-    echo '</div>';

+	global $post, $post_id;

+

+	$post_type = get_post_type();

+

+	$package_info = array();

+

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

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

+	echo '<div id="geodir_wrapper">';

+	/**

+	 * Called before the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_after_default_field_in_meta_box'

+	 */

+	do_action('geodir_before_default_field_in_meta_box');

+	//geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

+	// to display all fields in one information box

+	geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

+	/**

+	 * Called after the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_before_default_field_in_meta_box'

+	 */

+	do_action('geodir_after_default_field_in_meta_box');

+	echo '</div>';

 }

 

 /**

@@ -1714,18 +1714,18 @@ 
  */

 function geodir_post_addinfo_setting()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    $post_type = get_post_type();

+	$post_type = get_post_type();

 

-    $package_info = array();

+	$package_info = array();

 

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

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

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

-    echo '<div id="geodir_wrapper">';

-    geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

-    echo '</div>';

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

+	echo '<div id="geodir_wrapper">';

+	geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

+	echo '</div>';

 

 }

 

@@ -1739,60 +1739,60 @@ 
  */

 function geodir_post_attachments()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

-    if (geodir_get_featured_image($post_id, 'thumbnail')) {

-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

-        geodir_show_featured_image($post_id, 'thumbnail');

-    }

+	if (geodir_get_featured_image($post_id, 'thumbnail')) {

+		echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

+		geodir_show_featured_image($post_id, 'thumbnail');

+	}

 

-    $image_limit = 0;

+	$image_limit = 0;

 

-    ?>

+	?>

 

 

     <h5 class="form_title">

         <?php if ($image_limit != 0 && $image_limit == 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+		} ?>

         <?php if ($image_limit != 0 && $image_limit > 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+		} ?>

         <?php if ($image_limit == 0) {

-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+		} ?>

     </h5>

 

 

     <?php

 

-    $curImages = geodir_get_images($post_id);

-    $place_img_array = array();

+	$curImages = geodir_get_images($post_id);

+	$place_img_array = array();

 

-    if (!empty($curImages)):

-        foreach ($curImages as $p_img):

-            $place_img_array[] = $p_img->src;

-        endforeach;

-    endif;

+	if (!empty($curImages)):

+		foreach ($curImages as $p_img):

+			$place_img_array[] = $p_img->src;

+		endforeach;

+	endif;

 

-    if (!empty($place_img_array))

-        $curImages = implode(',', $place_img_array);

+	if (!empty($place_img_array))

+		$curImages = implode(',', $place_img_array);

 

 

-    // adjust values here

-    $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

+	// adjust values here

+	$id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

 

-    $svalue = $curImages; // this will be initial value of the above form field. Image urls.

+	$svalue = $curImages; // this will be initial value of the above form field. Image urls.

 

-    $multiple = true; // allow multiple files upload

+	$multiple = true; // allow multiple files upload

 

-    $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

+	$width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

-    $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

+	$height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

 

-    ?>

+	?>

 

     <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;">

         <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/>

@@ -1834,13 +1834,13 @@ 
  */

 function geodir_action_post_updated($post_ID, $post_after, $post_before)

 {

-    $post_type = get_post_type($post_ID);

+	$post_type = get_post_type($post_ID);

 

-    if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

-        if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

-            geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

-        }

-    }

+	if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

+		if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

+			geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

+		}

+	}

 }

 

 /**

@@ -1855,39 +1855,39 @@ 
  */

 function geodir_notification_add_bcc_option($settings)

 {

-    if (!empty($settings)) {

-        $new_settings = array();

-        foreach ($settings as $setting) {

-            if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {

-                $geodir_bcc_listing_published_yes = array(

-                    'name' => __('Listing published', 'geodirectory'),

-                    'desc' => __('Yes', 'geodirectory'),

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '1',

-                    'radiogroup' => 'start'

-                );

-

-                $geodir_bcc_listing_published_no = array(

-                    'name' => __('Listing published', 'geodirectory'),

-                    'desc' => __('No', 'geodirectory'),

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '0',

-                    'radiogroup' => 'end'

-                );

-

-                $new_settings[] = $geodir_bcc_listing_published_yes;

-                $new_settings[] = $geodir_bcc_listing_published_no;

-            }

-            $new_settings[] = $setting;

-        }

-        $settings = $new_settings;

-    }

+	if (!empty($settings)) {

+		$new_settings = array();

+		foreach ($settings as $setting) {

+			if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {

+				$geodir_bcc_listing_published_yes = array(

+					'name' => __('Listing published', 'geodirectory'),

+					'desc' => __('Yes', 'geodirectory'),

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '1',

+					'radiogroup' => 'start'

+				);

+

+				$geodir_bcc_listing_published_no = array(

+					'name' => __('Listing published', 'geodirectory'),

+					'desc' => __('No', 'geodirectory'),

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '0',

+					'radiogroup' => 'end'

+				);

+

+				$new_settings[] = $geodir_bcc_listing_published_yes;

+				$new_settings[] = $geodir_bcc_listing_published_no;

+			}

+			$new_settings[] = $setting;

+		}

+		$settings = $new_settings;

+	}

 

-    return $settings;

+	return $settings;

 }

 

 

@@ -1902,19 +1902,19 @@ 
  */

 function get_gd_theme_compat_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-

-    if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

-        if (isset($_POST['export'])) {

-            echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

-        } else {

-            echo json_encode($themes[$_POST['theme']]);

-        }

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

 

-    }

+	if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

+		if (isset($_POST['export'])) {

+			echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

+		} else {

+			echo json_encode($themes[$_POST['theme']]);

+		}

+

+	}

 

-    die();

+	die();

 }

 

 add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');

@@ -1928,20 +1928,20 @@ 
  */

 function get_gd_theme_compat_import_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-    if (isset($_POST['theme']) && !empty($_POST['theme'])) {

-        $json = json_decode(stripslashes($_POST['theme']), true);

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

-            $key = sanitize_text_field(key($json));

-            $themes[$key] = $json[$key];

-            update_option('gd_theme_compats', $themes);

-            echo $key;

-            die();

-        }

-    }

-    echo '0';

-    die();

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

+	if (isset($_POST['theme']) && !empty($_POST['theme'])) {

+		$json = json_decode(stripslashes($_POST['theme']), true);

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

+			$key = sanitize_text_field(key($json));

+			$themes[$key] = $json[$key];

+			update_option('gd_theme_compats', $themes);

+			echo $key;

+			die();

+		}

+	}

+	echo '0';

+	die();

 }

 

 

@@ -1954,39 +1954,39 @@ 
  */

 function gd_set_theme_compat()

 {

-    global $wpdb;

-    $theme = wp_get_theme();

+	global $wpdb;

+	$theme = wp_get_theme();

 

-    if ($theme->parent()) {

-        $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

-    } else {

-        $theme_name = str_replace(" ", "_", $theme->get('Name'));

-    }

+	if ($theme->parent()) {

+		$theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

+	} else {

+		$theme_name = str_replace(" ", "_", $theme->get('Name'));

+	}

 

-    $theme_compats = get_option('gd_theme_compats');

-    $current_compat = get_option('gd_theme_compat');

-    $current_compat = str_replace("_custom", "", $current_compat);

+	$theme_compats = get_option('gd_theme_compats');

+	$current_compat = get_option('gd_theme_compat');

+	$current_compat = str_replace("_custom", "", $current_compat);

  

-    if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {

-        return;

-    }// if already running correct compat then bail

+	if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {

+		return;

+	}// if already running correct compat then bail

 

-    if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

-        update_option('gd_theme_compat', $theme_name);

-        update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

+	if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

+		update_option('gd_theme_compat', $theme_name);

+		update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

 

-        // if there are default options to set then set them

-        if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

+		// if there are default options to set then set them

+		if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

 

-            foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

-                update_option($key, $val);

-            }

-        }

+			foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

+				update_option($key, $val);

+			}

+		}

 

-    } else {

-        update_option('gd_theme_compat', '');

-        update_option('theme_compatibility_setting', '');

-    }

+	} else {

+		update_option('gd_theme_compat', '');

+		update_option('theme_compatibility_setting', '');

+	}

 

 

 }

@@ -2001,9 +2001,9 @@ 
  */

 function gd_check_avada_compat()

 {

-    if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

-        add_action('admin_notices', 'gd_avada_compat_warning');

-    }

+	if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

+		add_action('admin_notices', 'gd_avada_compat_warning');

+	}

 }

 

 

@@ -2016,22 +2016,22 @@ 
 function gd_avada_compat_warning()

 {

 

-    /*

+	/*

     $msg_type = error

     $msg_type = updated fade

     $msg_type = update-nag

     */

 

-    $plugin = 'avada-nag';

-    $timestamp = 'avada-nag1234';

-    $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

-    echo '<div id="' . $timestamp . '"  class="error">';

-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

-    echo "<p>$message</p>";

-    echo "</div>";

+	$plugin = 'avada-nag';

+	$timestamp = 'avada-nag1234';

+	$message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

+	echo '<div id="' . $timestamp . '"  class="error">';

+	echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

+	echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

+	echo "<p>$message</p>";

+	echo "</div>";

 

-    ?>

+	?>

     <script>

         function gdRemoveANotification($plugin, $timestamp) {

 

@@ -2099,10 +2099,10 @@ 
  */

 function geodir_avada_remove_notification()

 {

-    update_option('avada_nag', TRUE);

+	update_option('avada_nag', TRUE);

 

-    // Always die in functions echoing ajax content

-    die();

+	// Always die in functions echoing ajax content

+	die();

 }

 

 

@@ -2124,11 +2124,11 @@ 
 	global $post, $typenow, $current_screen;

 	

 	$post_type = NULL;

-    if (isset($_REQUEST['post_type']))

+	if (isset($_REQUEST['post_type']))

 		$post_type = sanitize_key($_REQUEST['post_type']);

-    elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

+	elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

 		$post_type = get_post_type($_REQUEST['post']);

-    elseif ($post && isset($post->post_type))

+	elseif ($post && isset($post->post_type))

 		$post_type = $post->post_type;

 	elseif ($typenow)

 		$post_type = $typenow;

@@ -2162,7 +2162,7 @@ 
 		// Don't allow same slug url for listing and location

 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

 			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

-        	wp_redirect($redirect_url);

+			wp_redirect($redirect_url);

 			exit;

 		}

 		

@@ -2192,10 +2192,10 @@ 
  * @package GeoDirectory

  */

 function geodir_hide_admin_preview_button() {

-    global $post_type;

-    $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

-        echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

+	global $post_type;

+	$post_types = geodir_get_posttypes();

+	if(in_array($post_type, $post_types))

+		echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

 }

 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

@@ -2210,7 +2210,7 @@ 
  */

 function geodir_import_export_tab( $tabs ) {

 	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

-    return $tabs;

+	return $tabs;

 }

 

 /**

@@ -2225,26 +2225,26 @@ 
 function geodir_import_export_page() {

 	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

 	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

-    /**

-     * Filter sample category data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $gd_cats_sample_csv Sample category data csv file url.

-     */

+	/**

+	 * Filter sample category data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $gd_cats_sample_csv Sample category data csv file url.

+	 */

 	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

 	

 	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

-    /**

-     * Filter sample post data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $gd_posts_sample_csv Sample post data csv file url.

-     */

-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

+	/**

+	 * Filter sample post data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $gd_posts_sample_csv Sample post data csv file url.

+	 */

+	$gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

 	

 	$gd_posttypes = geodir_get_posttypes( 'array' );

 	

@@ -2267,14 +2267,14 @@ 
 	$gd_chunksize_options[100000] = 100000;

 	 

 	 /**

-     * Filter max entries per export csv file.

-     *

-     * @since 1.5.6

-     * @package GeoDirectory

-     *

-     * @param string $gd_chunksize_options Entries options.

-     */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+	  * Filter max entries per export csv file.

+	  *

+	  * @since 1.5.6

+	  * @package GeoDirectory

+	  *

+	  * @param string $gd_chunksize_options Entries options.

+	  */

+	$gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

 	

 	$gd_chunksize_option = '';

 	foreach ($gd_chunksize_options as $value => $title) {

@@ -2291,12 +2291,12 @@ 
   <div class="gd-content-heading">

 

   <?php

-    ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

-    ini_restore('max_execution_time');

+	ini_set('max_execution_time', 999999);

+	$ini_max_execution_time_check = @ini_get( 'max_execution_time' );

+	ini_restore('max_execution_time');

 

-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

-        ?>

+	if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

+		?>

 	<div id="gd_ie_reqs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div class="postbox">

@@ -2471,7 +2471,7 @@ 
 						 * Called just after the sample CSV download link.

 						 *

 						 * @since 1.0.0

-                         * @package GeoDirectory

+						 * @package GeoDirectory

 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

@@ -2556,11 +2556,11 @@ 
 	 *

 	 * Called after the last setting on the GD > Import & Export page.

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

 	 *

 	 * @param array $gd_posttypes GD post types.

-     * @param array $gd_chunksize_options File chunk size options.

-     * @param string $nonce Wordpress security token for GD import & export.

+	 * @param array $gd_chunksize_options File chunk size options.

+	 * @param string $nonce Wordpress security token for GD import & export.

 	 */

 	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

 	?>

@@ -3247,44 +3247,44 @@ 
 function geodir_init_filesystem()

 {

 

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

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

-    }

-    $access_type = get_filesystem_method();

-    if ($access_type === 'direct') {

-        /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

-

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@3';

-            return false;

-        }

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

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

+	}

+	$access_type = get_filesystem_method();

+	if ($access_type === 'direct') {

+		/* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@3';

+			return false;

+		}

 

-        global $wp_filesystem;

-        return $wp_filesystem;

-        /* do our file manipulations below */

-    } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+		global $wp_filesystem;

+		return $wp_filesystem;

+		/* do our file manipulations below */

+	} elseif (defined('FTP_USER')) {

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@33';

+			return false;

+		}

 

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@33';

-            return false;

-        }

+		global $wp_filesystem;

+		//return '@@@1';

+		return $wp_filesystem;

 

-        global $wp_filesystem;

-        //return '@@@1';

-        return $wp_filesystem;

-

-    } else {

-        //return '@@@2';

-        /* don't have direct write access. Prompt user with our notice */

-        add_action('admin_notice', 'geodir_filesystem_notice');

-        return false;

-    }

+	} else {

+		//return '@@@2';

+		/* don't have direct write access. Prompt user with our notice */

+		add_action('admin_notice', 'geodir_filesystem_notice');

+		return false;

+	}

 

 }

 

@@ -3302,10 +3302,10 @@ 
  */

 function geodir_filesystem_notice()

 {   if ( defined( 'DOING_AJAX' ) ){return;}

-    $access_type = get_filesystem_method();

-    if ($access_type === 'direct') {

-    } elseif (!defined('FTP_USER')) {

-        ?>

+	$access_type = get_filesystem_method();

+	if ($access_type === 'direct') {

+	} elseif (!defined('FTP_USER')) {

+		?>

         <div class="error">

             <p><?php _e('GeoDirectory does not have access to your filesystem, thing like import/export will not work. Please define your details in wp-config.php as explained here', 'geodirectory'); ?>

                 <a target="_blank" href="http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants">http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants</a>

@@ -3333,1280 +3333,1280 @@ 
  * @return string Json data.

  */

 function geodir_ajax_import_export() {

-    global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

+	global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

     

-    error_reporting(0);

+	error_reporting(0);

 

-    $xstart = microtime(true);

+	$xstart = microtime(true);

 

-    // try to set higher limits for import

-    $max_input_time = ini_get('max_input_time');

-    $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+	// try to set higher limits for import

+	$max_input_time = ini_get('max_input_time');

+	$max_execution_time = ini_get('max_execution_time');

+	$memory_limit= ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

-        ini_set('max_input_time', 3000);

-    }

+	if(!$max_input_time || $max_input_time<3000){

+		ini_set('max_input_time', 3000);

+	}

 

-    if(!$max_execution_time || $max_execution_time<3000){

-        ini_set('max_execution_time', 3000);

-    }

+	if(!$max_execution_time || $max_execution_time<3000){

+		ini_set('max_execution_time', 3000);

+	}

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

-            ini_set('memory_limit', '256M');

-        }

-    }

+	if($memory_limit && str_replace('M','',$memory_limit)){

+		if(str_replace('M','',$memory_limit)<256){

+			ini_set('memory_limit', '256M');

+		}

+	}

 

-    $json = array();

+	$json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !current_user_can( 'manage_options' ) ) {

+		wp_send_json( $json );

+	}

 

-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+	$task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

+	$nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

+	$stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

+		wp_send_json( $json );

+	}

 

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

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

-    $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+	$post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

+	$chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+	$chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

+	$chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

 

-    $wp_filesystem = geodir_init_filesystem();

-    if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

-    }

+	$wp_filesystem = geodir_init_filesystem();

+	if (!$wp_filesystem) {

+		$json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

+		wp_send_json( $json );

+	}

 

-    if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

-    }

+	if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

+		$json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

+		wp_send_json( $json );

+	}

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

-        }

-    }

+	$csv_file_dir = geodir_path_import_export( false );

+	if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

+		if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

+			$json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

+			wp_send_json( $json );

+		}

+	}

     

-    $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

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

-

-    switch ( $task ) {

-        case 'export_posts': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

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

+

+	switch ( $task ) {

+		case 'export_posts': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

-                $sitepress->switch_lang('all', true);

-            }

-            // WPML

-            if ( $post_type == 'gd_event' ) {

-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

-            }

-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+				$sitepress->switch_lang('all', true);

+			}

+			// WPML

+			if ( $post_type == 'gd_event' ) {

+				add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+			}

+			$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

             

-            $file_name = $post_type . '_' . date( 'dmyHi' );

-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

-            }

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

+			$file_name = $post_type . '_' . date( 'dmyHi' );

+			if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

+				$file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

+			}

+			$posts_count = geodir_get_posts_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

 

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

-                $json['total'] = $posts_count;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-                gd_die();

-            } else if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$json['total'] = $posts_count;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+				gd_die();

+			} else if ( isset( $_REQUEST['_st'] ) ) {

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-                gd_die();

-            } else {

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_posts = $posts_count;

-                    if ($chunk_per_page > $total_posts) {

-                        $chunk_per_page = $total_posts;

-                    }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+				$json['percentage'] = $percentage;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+				gd_die();

+			} else {

+				if ( !$posts_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_posts = $posts_count;

+					if ($chunk_per_page > $total_posts) {

+						$chunk_per_page = $total_posts;

+					}

+					$chunk_total_pages = ceil( $total_posts / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+					}

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $posts_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        if ($j > 1) {

-                            $json['total'] = $posts_count;

-                            $json['files'] = array();

-                        } else {

-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                        }

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_cats': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $posts_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						if ($j > 1) {

+							$json['total'] = $posts_count;

+							$json['files'] = array();

+						} else {

+							$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+						}

+					}

+				}

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_cats': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

-                $sitepress->switch_lang('all', true);

-            }

-            // WPML

-            $file_name = $post_type . 'category_' . date( 'dmyHi' );

+				$sitepress->switch_lang('all', true);

+			}

+			// WPML

+			$file_name = $post_type . 'category_' . date( 'dmyHi' );

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+			$terms_count = geodir_get_terms_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            } else {

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_terms = $terms_count;

-                    if ($chunk_per_page > $terms_count) {

-                        $chunk_per_page = $terms_count;

-                    }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+				$json['percentage'] = $percentage;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			} else {

+				if ( !$terms_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_terms = $terms_count;

+					if ($chunk_per_page > $terms_count) {

+						$chunk_per_page = $terms_count;

+					}

+					$chunk_total_pages = ceil( $total_terms / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $terms_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $terms_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+					}

+				}

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_locations': {

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_name = 'gd_locations_' . date( 'dmyHi' );

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+			$items_count = (int)geodir_location_imex_count_locations();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                wp_send_json( $json );

-            } else {

-                $chunk_file_paths = array();

+				$json['percentage'] = $percentage;

+				wp_send_json( $json );

+			} else {

+				$chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+				if ( !$items_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$chunk_per_page = min( $chunk_per_page, $items_count );

+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					$per_page = min( $per_page, $chunk_per_page );

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $items_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-                    }

-                }

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_hoods': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $items_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+					}

+				}

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_hoods': {

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_neighbourhoods();

+			$items_count = (int)geodir_location_imex_count_neighbourhoods();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                wp_send_json( $json );

-            } else {

-                $chunk_file_paths = array();

+				$json['percentage'] = $percentage;

+				wp_send_json( $json );

+			} else {

+				$chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+				if ( !$items_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$chunk_per_page = min( $chunk_per_page, $items_count );

+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					$per_page = min( $per_page, $chunk_per_page );

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $items_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-                    }

-                }

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'prepare_import':

-        case 'import_cat':

-        case 'import_post':

-        case 'import_loc':

-        case 'import_hood': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

-            }

-            // WPML

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $items_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+					}

+				}

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'prepare_import':

+		case 'import_cat':

+		case 'import_post':

+		case 'import_loc':

+		case 'import_hood': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

+			}

+			// WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+			ini_set( 'auto_detect_line_endings', true );

             

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

-            $uploads_subdir = $uploads['subdir'];

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

+			$uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+			$csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

+			$import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+			$csv_file_arr = explode( '/', $csv_file );

+			$csv_filename = end( $csv_file_arr );

+			$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

             

-            $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

-            $file = array();

+			$json['file'] = $csv_file;

+			$json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+			$file = array();

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+			if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

+				$wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

                 

-                if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

-                    $json['error'] = NULL;

-

-                    $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

-                    setlocale(LC_ALL, 'en_US.UTF-8');

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

-                                $file[] = $data;

-                            }

-                        }

-                        fclose($handle);

-                    }

-                    setlocale(LC_ALL, $lc_all);

+				if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

+					$json['error'] = NULL;

+

+					$lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

+					setlocale(LC_ALL, 'en_US.UTF-8');

+					if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

+						while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

+							if ( !empty( $data ) ) {

+								$file[] = $data;

+							}

+						}

+						fclose($handle);

+					}

+					setlocale(LC_ALL, $lc_all);

 

-                    $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

+					$json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

                     

-                    if (!$json['rows'] > 0) {

-                        $json['error'] = __('No data found in csv file.', 'geodirectory');

-                    }

-                } else {

-                    wp_send_json( $json );

-                }

-            } else {

-                wp_send_json( $json );

-            }

+					if (!$json['rows'] > 0) {

+						$json['error'] = __('No data found in csv file.', 'geodirectory');

+					}

+				} else {

+					wp_send_json( $json );

+				}

+			} else {

+				wp_send_json( $json );

+			}

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

-            }

+			if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

+				wp_send_json( $json );

+			}

             

-            $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+			$total = $json['rows'];

+			$limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

+			$processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

             

-            $count = $limit;

+			$count = $limit;

             

-            if ($count < $total) {

-                $count = $processed + $count;

-                if ($count > $total) {

-                    $count = $total;

-                }

-            } else {

-                $count = $total;

-            }

+			if ($count < $total) {

+				$count = $processed + $count;

+				if ($count > $total) {

+					$count = $total;

+				}

+			} else {

+				$count = $total;

+			}

             

-            $created = 0;

-            $updated = 0;

-            $skipped = 0;

-            $invalid = 0;

-            $invalid_addr = 0;

-            $images = 0;

+			$created = 0;

+			$updated = 0;

+			$skipped = 0;

+			$invalid = 0;

+			$invalid_addr = 0;

+			$images = 0;

             

-            $gd_post_info = array();

-            $countpost = 0;

+			$gd_post_info = array();

+			$countpost = 0;

             

-            $post_types = geodir_get_posttypes();

+			$post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+			if ( $task == 'import_cat' ) {

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

                     

-                    $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');

+					$gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');

                     

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

                             

-                            $cat_id = '';

-                            $cat_name = '';

-                            $cat_slug = '';

-                            $cat_posttype = '';

-                            $cat_parent = '';

-                            $cat_description = '';

-                            $cat_schema = '';

-                            $cat_top_description = '';

-                            $cat_image = '';

-                            $cat_icon = '';

-                            $cat_language = '';

-                            $cat_id_original = '';

+							$cat_id = '';

+							$cat_name = '';

+							$cat_slug = '';

+							$cat_posttype = '';

+							$cat_parent = '';

+							$cat_description = '';

+							$cat_schema = '';

+							$cat_top_description = '';

+							$cat_image = '';

+							$cat_icon = '';

+							$cat_language = '';

+							$cat_id_original = '';

                             

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

-                                } else if ( $column == 'cat_name' ) {

-                                    $cat_name = $row[$c];

-                                } else if ( $column == 'cat_slug' ) {

-                                    $cat_slug = $row[$c];

-                                } else if ( $column == 'cat_posttype' ) {

-                                    $cat_posttype = $row[$c];

-                                } else if ( $column == 'cat_parent' ) {

-                                    $cat_parent = trim($row[$c]);

-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

-                                    $cat_schema = $row[$c];

-                                } else if ( $column == 'cat_description' ) {

-                                    $cat_description = $row[$c];

-                                } else if ( $column == 'cat_top_description' ) {

-                                    $cat_top_description = $row[$c];

-                                } else if ( $column == 'cat_image' ) {

-                                    $cat_image = $row[$c];

-                                } else if ( $column == 'cat_icon' ) {

-                                    $cat_icon = $row[$c];

-                                }

-                                // WPML

-                                if ( $is_wpml ) {

-                                    if ( $column == 'cat_language' ) {

-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );

-                                    } else if ( $column == 'cat_id_original' ) {

-                                        $cat_id_original = (int)$row[$c];

-                                    }

-                                }

-                                // WPML

-                                $c++;

-                            }

+							$c = 0;

+							foreach ($columns as $column ) {

+								if ( $column == 'cat_id' ) {

+									$cat_id = (int)$row[$c];

+								} else if ( $column == 'cat_name' ) {

+									$cat_name = $row[$c];

+								} else if ( $column == 'cat_slug' ) {

+									$cat_slug = $row[$c];

+								} else if ( $column == 'cat_posttype' ) {

+									$cat_posttype = $row[$c];

+								} else if ( $column == 'cat_parent' ) {

+									$cat_parent = trim($row[$c]);

+								} else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+									$cat_schema = $row[$c];

+								} else if ( $column == 'cat_description' ) {

+									$cat_description = $row[$c];

+								} else if ( $column == 'cat_top_description' ) {

+									$cat_top_description = $row[$c];

+								} else if ( $column == 'cat_image' ) {

+									$cat_image = $row[$c];

+								} else if ( $column == 'cat_icon' ) {

+									$cat_icon = $row[$c];

+								}

+								// WPML

+								if ( $is_wpml ) {

+									if ( $column == 'cat_language' ) {

+										$cat_language = geodir_strtolower( trim( $row[$c] ) );

+									} else if ( $column == 'cat_id_original' ) {

+										$cat_id_original = (int)$row[$c];

+									}

+								}

+								// WPML

+								$c++;

+							}

                             

-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+							if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

                                 

-                                $invalid++;

-                                continue;

-                            }

+								$invalid++;

+								continue;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

-                                $sitepress->switch_lang($cat_language, true);

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $cat_language != '') {

+								$sitepress->switch_lang($cat_language, true);

+							}

+							// WPML

                                                         

-                            $term_data = array();

-                            $term_data['name'] = $cat_name;

-                            $term_data['slug'] = $cat_slug;

-                            $term_data['description'] = $cat_description;

-                            $term_data['cat_schema'] = $cat_schema;

-                            $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+							$term_data = array();

+							$term_data['name'] = $cat_name;

+							$term_data['slug'] = $cat_slug;

+							$term_data['description'] = $cat_description;

+							$term_data['cat_schema'] = $cat_schema;

+							$term_data['top_description'] = $cat_top_description;

+							$term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

+							$term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

                             

-                            //$term_data = array_map( 'utf8_encode', $term_data );

+							//$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+							$taxonomy = $cat_posttype . 'category';

                             

-                            $term_data['taxonomy'] = $taxonomy;

+							$term_data['taxonomy'] = $taxonomy;

 

-                            $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

-                                $term_parent = '';

+							$term_parent_id = 0;

+							if ($cat_parent != "" || (int)$cat_parent > 0) {

+								$term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else {

-                                    $term_parent_data = array();

-                                    $term_parent_data['name'] = $cat_parent;

-                                    //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

-                                    $term_parent_data['taxonomy'] = $taxonomy;

+								if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+									//

+								} else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+									//

+								} else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+									//

+								} else {

+									$term_parent_data = array();

+									$term_parent_data['name'] = $cat_parent;

+									//$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

+									$term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

-                                }

+									$term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+								}

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

-                                }

-                            }

-                            $term_data['parent'] = (int)$term_parent_id;

+								if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

+									$term_parent_id = (int)$term_parent->term_id;

+								}

+							}

+							$term_data['parent'] = (int)$term_parent_id;

 

-                            $term_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

+							$term_id = NULL;

+							if ( $import_choice == 'update' ) {

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $skipped++;

-                                } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                            }

+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								} else {

+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								}

+							} else if ( $import_choice == 'skip' ) {

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$skipped++;

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$skipped++;

+								} else {

+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+							}

                             

-                            if ( $term_id ) {

-                                // WPML

-                                if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {

-                                    $wpml_element_type = 'tax_' . $taxonomy;

-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

-

-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

+							if ( $term_id ) {

+								// WPML

+								if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {

+									$wpml_element_type = 'tax_' . $taxonomy;

+									$source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

+

+									$trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

                                     

-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

-                                }

-                                // WPML

+									$sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

+								}

+								// WPML

                                 

-                                if ( isset( $term_data['top_description'] ) ) {

-                                    geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

-                                }

+								if ( isset( $term_data['top_description'] ) ) {

+									geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+								}

                                 

-                                if ( isset( $term_data['cat_schema'] ) ) {

-                                    geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

-                                }

+								if ( isset( $term_data['cat_schema'] ) ) {

+									geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+								}

             

-                                $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+								$attachment = false;

+								if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

+									$cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

+									$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

-                                        $attachment = true;

-                                        geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

-                                    }

-                                }

+									if ( basename($cat_image) != $term_data['image'] ) {

+										$attachment = true;

+										geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

-

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

-                                        $attachment = true;

-                                        geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

-                                    }

-                                }

+								if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

+									$cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

+									$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+

+									if ( basename($cat_icon) != $term_data['icon'] ) {

+										$attachment = true;

+										geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( $attachment ) {

-                                    $images++;

-                                }

-                            }

+								if ( $attachment ) {

+									$images++;

+								}

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

-                                $sitepress->switch_lang($active_lang, true);

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $cat_language != '') {

+								$sitepress->switch_lang($active_lang, true);

+							}

+							// WPML

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_post' ) {

-                $xtimings['###1'] = microtime(true)-$xstart;

-                //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

+				wp_send_json( $json );

+				exit;

+			} else if ( $task == 'import_post' ) {

+				$xtimings['###1'] = microtime(true)-$xstart;

+				//run some stuff to make the import quicker

+				wp_defer_term_counting( true );

+				wp_defer_comment_counting( true );

+				$wpdb->query( 'SET autocommit = 0;' );

 //

 //                remove_all_actions('publish_post');

 //                remove_all_actions('transition_post_status');

 //                remove_all_actions('publish_future_post');

 

-                if (!empty($file)) {

-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

-                    $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

-                    $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+				if (!empty($file)) {

+					$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+					$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

+					$default_status = 'publish';

+					$current_date = date_i18n( 'Y-m-d', time() );

                     

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

-                    $xtimings['###2'] = microtime(true)-$xstart;

-                    $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

-                    $processed_actual = 0;

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

-                        $gd_post = array();

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

+					$xtimings['###2'] = microtime(true)-$xstart;

+					$gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

+					$wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

+					$processed_actual = 0;

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

+						$gd_post = array();

                         

-                        if (isset($file[$index])) {

-                            $processed_actual++;

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+						if (isset($file[$index])) {

+							$processed_actual++;

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

+							$row = array_map( 'addslashes_gpc', $row );

                             

-                            $post_id = '';

-                            $post_title = '';

-                            $post_date = '';

-                            $post_author = '';

-                            $post_content = '';

-                            $post_category_arr = array();

-                            $default_category = '';

-                            $post_tags = array();

-                            $post_type = '';

-                            $post_status = '';

-                            $is_featured = 0;

-                            $geodir_video = '';

-                            $post_address = '';

-                            $post_city = '';

-                            $post_region = '';

-                            $post_country = '';

-                            $post_zip = '';

-                            $post_latitude = '';

-                            $post_longitude = '';

-                            $post_neighbourhood = '';

-                            $neighbourhood_latitude = '';

-                            $neighbourhood_longitude = '';

-                            $geodir_timing = '';

-                            $geodir_contact = '';

-                            $geodir_email = '';

-                            $geodir_website = '';

-                            $geodir_twitter = '';

-                            $geodir_facebook = '';

-                            $geodir_twitter = '';

-                            $geodir_link_business = null;

-                            $post_images = array();

+							$post_id = '';

+							$post_title = '';

+							$post_date = '';

+							$post_author = '';

+							$post_content = '';

+							$post_category_arr = array();

+							$default_category = '';

+							$post_tags = array();

+							$post_type = '';

+							$post_status = '';

+							$is_featured = 0;

+							$geodir_video = '';

+							$post_address = '';

+							$post_city = '';

+							$post_region = '';

+							$post_country = '';

+							$post_zip = '';

+							$post_latitude = '';

+							$post_longitude = '';

+							$post_neighbourhood = '';

+							$neighbourhood_latitude = '';

+							$neighbourhood_longitude = '';

+							$geodir_timing = '';

+							$geodir_contact = '';

+							$geodir_email = '';

+							$geodir_website = '';

+							$geodir_twitter = '';

+							$geodir_facebook = '';

+							$geodir_twitter = '';

+							$geodir_link_business = null;

+							$post_images = array();

                             

-                            $expire_date = 'Never';

+							$expire_date = 'Never';

                             

-                            $language = '';

-                            $original_post_id = '';

+							$language = '';

+							$original_post_id = '';

                             

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                $gd_post[$column] = $row[$c];

+							$c = 0;

+							foreach ($columns as $column ) {

+								$gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

-                                    $post_id = $row[$c];

-                                } else if ( $column == 'post_title' ) {

-                                    $post_title = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_author' ) {

-                                    $post_author = $row[$c];

-                                } else if ( $column == 'post_date' ) {

-                                    $post_date = $row[$c];

-                                } else if ( $column == 'post_content' ) {

-                                    $post_content = $row[$c];

-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {

-                                    $post_category_arr = explode( ',', $row[$c] );

-                                } else if ( $column == 'default_category' ) {

-                                    $default_category = wp_kses_normalize_entities($row[$c]);

-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );

-                                } else if ( $column == 'post_type' ) {

-                                    $post_type = $row[$c];

-                                } else if ( $column == 'post_status' ) {

-                                    $post_status = sanitize_key( $row[$c] );

-                                } else if ( $column == 'is_featured' ) {

-                                    $is_featured = (int)$row[$c];

-                                } else if ( $column == 'geodir_video' ) {

-                                    $geodir_video = $row[$c];

-                                } else if ( $column == 'post_address' ) {

-                                    $post_address = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_city' ) {

-                                    $post_city = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_region' ) {

-                                    $post_region = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_country' ) {

-                                    $post_country = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_zip' ) {

-                                    $post_zip = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_latitude' ) {

-                                    $post_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_longitude' ) {

-                                    $post_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_neighbourhood' ) {

-                                    $post_neighbourhood = sanitize_text_field($row[$c]);

-                                    unset($gd_post[$column]);

-                                } else if ( $column == 'neighbourhood_latitude' ) {

-                                    $neighbourhood_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'neighbourhood_longitude' ) {

-                                    $neighbourhood_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_timing' ) {

-                                    $geodir_timing = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_contact' ) {

-                                    $geodir_contact = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_email' ) {

-                                    $geodir_email = sanitize_email($row[$c]);

-                                } else if ( $column == 'geodir_website' ) {

-                                    $geodir_website = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_twitter' ) {

-                                    $geodir_twitter = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_facebook' ) {

-                                    $geodir_facebook = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

-                                    $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

-                                    $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

-                                } else if ( strpos( $column, 'linked_' ) === 0 ) {

-                                    $geodir_link_business = (int)$row[$c];

-                                }

-                                // WPML

-                                if ($is_wpml) {

-                                    if ($column == 'language') {

-                                        $language = geodir_strtolower(trim($row[$c]));

-                                    } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

-                                    }

-                                }

-                                // WPML

-                                $c++;

-                            }

-                            // listing claimed or not

-                            if ($is_claim_active && isset($gd_post['claimed'])) {

-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

-                            }

+								if ( $column == 'post_id' ) {

+									$post_id = $row[$c];

+								} else if ( $column == 'post_title' ) {

+									$post_title = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_author' ) {

+									$post_author = $row[$c];

+								} else if ( $column == 'post_date' ) {

+									$post_date = $row[$c];

+								} else if ( $column == 'post_content' ) {

+									$post_content = $row[$c];

+								} else if ( $column == 'post_category' && $row[$c] != '' ) {

+									$post_category_arr = explode( ',', $row[$c] );

+								} else if ( $column == 'default_category' ) {

+									$default_category = wp_kses_normalize_entities($row[$c]);

+								} else if ( $column == 'post_tags' && $row[$c] != '' ) {

+									$post_tags = explode( ',', sanitize_text_field($row[$c]) );

+								} else if ( $column == 'post_type' ) {

+									$post_type = $row[$c];

+								} else if ( $column == 'post_status' ) {

+									$post_status = sanitize_key( $row[$c] );

+								} else if ( $column == 'is_featured' ) {

+									$is_featured = (int)$row[$c];

+								} else if ( $column == 'geodir_video' ) {

+									$geodir_video = $row[$c];

+								} else if ( $column == 'post_address' ) {

+									$post_address = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_city' ) {

+									$post_city = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_region' ) {

+									$post_region = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_country' ) {

+									$post_country = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_zip' ) {

+									$post_zip = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_latitude' ) {

+									$post_latitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_longitude' ) {

+									$post_longitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_neighbourhood' ) {

+									$post_neighbourhood = sanitize_text_field($row[$c]);

+									unset($gd_post[$column]);

+								} else if ( $column == 'neighbourhood_latitude' ) {

+									$neighbourhood_latitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'neighbourhood_longitude' ) {

+									$neighbourhood_longitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_timing' ) {

+									$geodir_timing = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_contact' ) {

+									$geodir_contact = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_email' ) {

+									$geodir_email = sanitize_email($row[$c]);

+								} else if ( $column == 'geodir_website' ) {

+									$geodir_website = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_twitter' ) {

+									$geodir_twitter = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_facebook' ) {

+									$geodir_facebook = sanitize_text_field($row[$c]);

+								} else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

+									$post_images[] = $row[$c];

+								} else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

+								} else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+									$row[$c] = str_replace('/', '-', $row[$c]);

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+								} else if ( strpos( $column, 'linked_' ) === 0 ) {

+									$geodir_link_business = (int)$row[$c];

+								}

+								// WPML

+								if ($is_wpml) {

+									if ($column == 'language') {

+										$language = geodir_strtolower(trim($row[$c]));

+									} else if ($column == 'original_post_id') {

+										$original_post_id = (int)$row[$c];

+									}

+								}

+								// WPML

+								$c++;

+							}

+							// listing claimed or not

+							if ($is_claim_active && isset($gd_post['claimed'])) {

+								$gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

-                                $sitepress->switch_lang($language, true);

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $language != '') {

+								$sitepress->switch_lang($language, true);

+							}

+							// WPML

 

-                            $gd_post['IMAGE'] = $post_images;

+							$gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+							$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

+							$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

                                                                                                                 

-                            $valid = true;

+							$valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

-                                $invalid++;

-                                $valid = false;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

-                            }

-                            $xtimings['###3'] = microtime(true)-$xstart;

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

-                                $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

-                                    $invalid_addr++;

-                                    $valid = false;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

-                                        $invalid_addr++;

-                                        $valid = false;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                    } else {

-                                        if (!$location_manager) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

-                                        }

-                                    }

-                                }

-                            }

-                            $xtimings['###4']   = microtime(true)-$xstart;

-                            if ( !$valid ) {

-                                continue;

-                            }

+							if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+								$invalid++;

+								$valid = false;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+							}

+							$xtimings['###3'] = microtime(true)-$xstart;

+							$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+							if ( $location_allowed ) {

+								$location_result = geodir_get_default_location();

+								if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+									$invalid_addr++;

+									$valid = false;

+									geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+								} else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

+									if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+										$invalid_addr++;

+										$valid = false;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+									} else {

+										if (!$location_manager) {

+											$gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+										}

+									}

+								}

+							}

+							$xtimings['###4']   = microtime(true)-$xstart;

+							if ( !$valid ) {

+								continue;

+							}

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+							$cat_taxonomy = $post_type . 'category';

+							$tags_taxonomy = $post_type . '_tags';

                             

-                            if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

-                                $post_category_arr = array_merge(array($default_category), $post_category_arr);

-                            }

+							if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

+								$post_category_arr = array_merge(array($default_category), $post_category_arr);

+							}

 

-                            $post_category = array();

-                            $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+							$post_category = array();

+							$default_category_id = NULL;

+							if ( !empty( $post_category_arr ) ) {

+								foreach ( $post_category_arr as $value ) {

+									$category_name = wp_kses_normalize_entities( trim( $value ) );

                                     

-                                    if ( $category_name != '' ) {

-                                        $term_category = array();

+									if ( $category_name != '' ) {

+										$term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else {

-                                            $term_data = array();

-                                            $term_data['name'] = $category_name;

-                                            $term_data['taxonomy'] = $cat_taxonomy;

+										if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else {

+											$term_data = array();

+											$term_data['name'] = $category_name;

+											$term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

-                                            }

-                                        }

+											$term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

+											if ( $term_id ) {

+												$term_category = get_term( $term_id, $cat_taxonomy );

+											}

+										}

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

-                                            $post_category[] = intval($term_category->term_id);

+										if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+											$post_category[] = intval($term_category->term_id);

                                             

-                                            if ($category_name == $default_category) {

-                                                $default_category_id = intval($term_category->term_id);

-                                            }

-                                        }

-                                    }

-                                }

-                            }

-                            $xtimings['###5'] = microtime(true)-$xstart;

-                            $save_post = array();

-                            $save_post['post_title'] = $post_title;

-                            if (!empty($post_date)) {

-                                $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format.

+											if ($category_name == $default_category) {

+												$default_category_id = intval($term_category->term_id);

+											}

+										}

+									}

+								}

+							}

+							$xtimings['###5'] = microtime(true)-$xstart;

+							$save_post = array();

+							$save_post['post_title'] = $post_title;

+							if (!empty($post_date)) {

+								$post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format.

                                 

-                                $save_post['post_date'] = $post_date;

-                                $save_post['post_date_gmt'] = get_gmt_from_date( $post_date );

-                            }

-                            $save_post['post_content'] = $post_content;

-                            $save_post['post_type'] = $post_type;

-                            $save_post['post_author'] = $post_author;

-                            $save_post['post_status'] = $post_status;

-                            $save_post['post_category'] = $post_category;

-                            $save_post['post_tags'] = $post_tags;

-

-                            $saved_post_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

+								$save_post['post_date'] = $post_date;

+								$save_post['post_date_gmt'] = get_gmt_from_date( $post_date );

+							}

+							$save_post['post_content'] = $post_content;

+							$save_post['post_type'] = $post_type;

+							$save_post['post_author'] = $post_author;

+							$save_post['post_status'] = $post_status;

+							$save_post['post_category'] = $post_category;

+							$save_post['post_tags'] = $post_tags;

+

+							$saved_post_id = NULL;

+							if ( $import_choice == 'update' ) {

+								$gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

                                 

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

-                                    $save_post['ID'] = $post_id;

+								if ( $post_id > 0 && get_post( $post_id ) ) {

+									$save_post['ID'] = $post_id;

                                     

-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $saved_post_id = $post_id;

-                                            $updated++;

-                                        }

-                                    }

-                                } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $created++;

-                                        }

-                                    }

-                                }

+									if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+											$saved_post_id = 0;

+										} else {

+											$saved_post_id = $post_id;

+											$updated++;

+										}

+									}

+								} else {

+									if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+											$saved_post_id = 0;

+										} else {

+											$created++;

+										}

+									}

+								}

                                 

-                                if ( !$saved_post_id > 0 ) {

-                                    $invalid++;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

-                                }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

-                                    $skipped++;	

-                                } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $invalid++;

+								if ( !$saved_post_id > 0 ) {

+									$invalid++;

+									geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

+								}

+							} else if ( $import_choice == 'skip' ) {

+								if ( $post_id > 0 && get_post( $post_id ) ) {

+									$skipped++;	

+								} else {

+									if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$invalid++;

                                             

-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $created++;

-                                        }

-                                    } else {

-                                        $invalid++;

+											geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

+											$saved_post_id = 0;

+										} else {

+											$created++;

+										}

+									} else {

+										$invalid++;

                                         

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+									}

+								}

+							} else {

+								$invalid++;

                                 

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

-                            }

-                            $xtimings['###6'] = microtime(true)-$xstart;

-                            if ( (int)$saved_post_id > 0 ) {

-                                // WPML

-                                if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

-

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+							}

+							$xtimings['###6'] = microtime(true)-$xstart;

+							if ( (int)$saved_post_id > 0 ) {

+								// WPML

+								if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {

+									$wpml_post_type = 'post_' . $post_type;

+									$source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

+

+									$trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

-                                }

-                                // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+									$sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+								}

+								// WPML

+								$gd_post_info = geodir_get_post_info( $saved_post_id );

                                 

-                                $gd_post['post_id'] = $saved_post_id;

-                                $gd_post['ID'] = $saved_post_id;

-                                $gd_post['post_tags'] = $post_tags;

-                                $gd_post['post_title'] = $post_title;

-                                $gd_post['post_status'] = $post_status;

-                                $gd_post['submit_time'] = time();

-                                $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+								$gd_post['post_id'] = $saved_post_id;

+								$gd_post['ID'] = $saved_post_id;

+								$gd_post['post_tags'] = $post_tags;

+								$gd_post['post_title'] = $post_title;

+								$gd_post['post_status'] = $post_status;

+								$gd_post['submit_time'] = time();

+								$gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

                                                     

-                                // post location

-                                $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

-                                    $gd_post['post_neighbourhood'] = '';

+								// post location

+								$post_location_id = 0;

+								if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+									$gd_post['post_neighbourhood'] = '';

                                     

-                                    $post_location_info = array(

-                                                                'city' => $post_city,

-                                                                'region' => $post_region,

-                                                                'country' => $post_country,

-                                                                'geo_lat' => $post_latitude,

-                                                                'geo_lng' => $post_longitude

-                                                            );

-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

-                                        $post_location_id = $location_id;

-                                    }

+									$post_location_info = array(

+																'city' => $post_city,

+																'region' => $post_region,

+																'country' => $post_country,

+																'geo_lat' => $post_latitude,

+																'geo_lng' => $post_longitude

+															);

+									if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+										$post_location_id = $location_id;

+									}

                                     

-                                    if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {

-                                        $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);

+									if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {

+										$neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);

 

-                                        $hood_data = array();

-                                        $hood_data['hood_location_id'] = $post_location_id;

-                                        $hood_data['hood_name'] = $post_neighbourhood;

+										$hood_data = array();

+										$hood_data['hood_location_id'] = $post_location_id;

+										$hood_data['hood_name'] = $post_neighbourhood;

                                         

-                                        if (!empty($neighbourhood_info)) {

-                                            $hood_data['hood_id'] = $neighbourhood_info->hood_id;

-                                            $hood_data['hood_slug'] = $neighbourhood_info->hood_slug;

+										if (!empty($neighbourhood_info)) {

+											$hood_data['hood_id'] = $neighbourhood_info->hood_id;

+											$hood_data['hood_slug'] = $neighbourhood_info->hood_slug;

                                             

-                                            if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

-                                                $neighbourhood_latitude = $neighbourhood_info->hood_latitude;

-                                                $neighbourhood_longitude = $neighbourhood_info->hood_longitude;

-                                            }

-                                        }

+											if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

+												$neighbourhood_latitude = $neighbourhood_info->hood_latitude;

+												$neighbourhood_longitude = $neighbourhood_info->hood_longitude;

+											}

+										}

                                         

-                                        if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

-                                            $neighbourhood_latitude = $neighbourhood_info->hood_latitude;

-                                            $neighbourhood_longitude = $neighbourhood_info->hood_longitude;

-                                        }

+										if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

+											$neighbourhood_latitude = $neighbourhood_info->hood_latitude;

+											$neighbourhood_longitude = $neighbourhood_info->hood_longitude;

+										}

                                         

-                                        $hood_data['hood_latitude'] = $post_latitude;

-                                        $hood_data['hood_longitude'] = $post_longitude;

-

-                                        $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);

-                                        if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {

-                                            $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;

-                                        }

-                                    }

-                                }

-                                $gd_post['post_location_id'] = $post_location_id;

+										$hood_data['hood_latitude'] = $post_latitude;

+										$hood_data['hood_longitude'] = $post_longitude;

+

+										$neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);

+										if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {

+											$gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;

+										}

+									}

+								}

+								$gd_post['post_location_id'] = $post_location_id;

                                 

-                                if ($geodir_link_business !== null) {

-                                    $gd_post['geodir_link_business'] = $geodir_link_business > 0 ? $geodir_link_business : '';

-                                }

+								if ($geodir_link_business !== null) {

+									$gd_post['geodir_link_business'] = $geodir_link_business > 0 ? $geodir_link_business : '';

+								}

                                 

-                                // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

-                                if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

-                                    $package_id = $gd_post_info->package_id;

-                                }

+								// post package info

+								$package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+								if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

+									$package_id = $gd_post_info->package_id;

+								}

                                 

-                                $package_info = array();

-                                if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+								$package_info = array();

+								if ($package_id && function_exists('geodir_get_package_info_by_id')) {

+									$package_info = (array)geodir_get_package_info_by_id($package_id);

                                     

-                                    if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

-                                        $package_info = array();

-                                    }

-                                }

+									if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

+										$package_info = array();

+									}

+								}

                                 

-                                if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

-                                }

+								if (empty($package_info)) {

+									$package_info = (array)geodir_post_package_info( array(), '', $post_type );

+								}

                                  

-                                if (!empty($package_info))	 {

-                                    $package_id = $package_info['pid'];

+								if (!empty($package_info))	 {

+									$package_id = $package_info['pid'];

                                     

-                                    if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

-                                        $gd_post['expire_date'] = $expire_date;

-                                    } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

-                                        } else {

-                                            $gd_post['expire_date'] = 'Never';

-                                        }

-                                    }

+									if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

+										$gd_post['expire_date'] = $expire_date;

+									} else {

+										if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

+											$gd_post['alive_days'] = (int)$package_info['days'];

+											$gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+										} else {

+											$gd_post['expire_date'] = 'Never';

+										}

+									}

                                     

-                                    $gd_post['package_id'] = $package_id;

-                                }

+									$gd_post['package_id'] = $package_id;

+								}

 

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

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

                                 

-                                if ($post_type == 'gd_event') {

-                                    $gd_post = geodir_imex_process_event_data($gd_post);

-                                }

+								if ($post_type == 'gd_event') {

+									$gd_post = geodir_imex_process_event_data($gd_post);

+								}

                                 

-                                if (isset($gd_post['post_id'])) {

-                                    unset($gd_post['post_id']);

-                                }

+								if (isset($gd_post['post_id'])) {

+									unset($gd_post['post_id']);

+								}

 

-                                // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

-                                if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {

-                                        if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {

-                                            $gd_franchise_lock = array();

+								// Export franchise fields

+								$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+								if ($is_franchise_active) {

+									if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {

+										if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {

+											$gd_franchise_lock = array();

                                             

-                                            if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                                $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                                $gd_franchise_lock = trim( $gd_franchise_lock );

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

-                                            }

+											if ( isset( $gd_post['gd_franchise_lock'] ) ) {

+												$gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

+												$gd_franchise_lock = trim( $gd_franchise_lock );

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

+											}

                                             

-                                            update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                            update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

-                                        } else {

-                                            if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {

-                                                geodir_franchise_remove_franchise( $saved_post_id );

-                                            }

-                                        }

-                                    } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

-                                        }

-                                    }

-                                }

+											update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

+											update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+										} else {

+											if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {

+												geodir_franchise_remove_franchise( $saved_post_id );

+											}

+										}

+									} else {

+										if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

+											geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+										}

+									}

+								}

                                 

-                                if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

-                                    if ($default_category_id) {

-                                        $save_post['post_default_category'] = $default_category_id;

-                                        $gd_post['default_category'] = $default_category_id;

-                                    }

-                                    $gd_post[$cat_taxonomy] = $save_post['post_category'];

-                                }

-                                $xtimings['###7'] = microtime(true)-$xstart;

-                                // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

-                                $xtimings['###8'] = microtime(true)-$xstart;

-                                // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+								if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

+									$save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+									if ($default_category_id) {

+										$save_post['post_default_category'] = $default_category_id;

+										$gd_post['default_category'] = $default_category_id;

+									}

+									$gd_post[$cat_taxonomy] = $save_post['post_category'];

+								}

+								$xtimings['###7'] = microtime(true)-$xstart;

+								// Save post info

+								geodir_save_post_info( $saved_post_id, $gd_post );

+								$xtimings['###8'] = microtime(true)-$xstart;

+								// post taxonomies

+								if ( !empty( $save_post['post_category'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

-                                    if ($default_category_id) {

-                                        $post_default_category = $default_category_id;

-                                    }

-                                    $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

-                                    $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+									$post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+									if ($default_category_id) {

+										$post_default_category = $default_category_id;

+									}

+									$post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

+									$save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

+									$post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

                                     

-                                    if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

-                                    }

+									if ($post_category_str != '' && $post_default_category) {

+										$post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+									}

                                     

-                                    $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

+									$post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

-                                }

-                                $xtimings['###8.1'] = microtime(true)-$xstart;

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

-                                }

-                                $xtimings['###9'] = microtime(true)-$xstart;

-                                // Post images

-                                if ( !empty( $post_images ) ) {

-                                    $post_images = array_unique($post_images);

+									geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+								}

+								$xtimings['###8.1'] = microtime(true)-$xstart;

+								if ( !empty( $save_post['post_tags'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+								}

+								$xtimings['###9'] = microtime(true)-$xstart;

+								// Post images

+								if ( !empty( $post_images ) ) {

+									$post_images = array_unique($post_images);

                                     

-                                    $old_post_images_arr = array();

-                                    $saved_post_images_arr = array();

+									$old_post_images_arr = array();

+									$saved_post_images_arr = array();

                                     

-                                    $order = 1;

+									$order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

-                                    $xtimings['###9.1'] = microtime(true)-$xstart;

-                                    if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

-                                            if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

-                                                $old_post_images_arr[] = $old_post_image->file;

-                                            }

-                                        }

-                                    }

+									$old_post_images = geodir_get_images( $saved_post_id );

+									$xtimings['###9.1'] = microtime(true)-$xstart;

+									if (!empty($old_post_images)) {

+										foreach( $old_post_images as $old_post_image ) {

+											if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

+												$old_post_images_arr[] = $old_post_image->file;

+											}

+										}

+									}

 

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

-                                        $saved_post_images_arr[] = $image_name;

+									foreach ( $post_images as $post_image ) {

+										$image_name = basename( $post_image );

+										$saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

-                                            continue; // Skip if image already exists.

-                                        }

+										if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+											continue; // Skip if image already exists.

+										}

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

-                                        $xtimings['###9.2'] = microtime(true)-$xstart;

-                                        $arr_file_type = wp_check_filetype( $image_name );

-                                        $xtimings['###9.3'] = microtime(true)-$xstart;

-                                        if ( !empty( $arr_file_type ) ) {

-                                            $uploaded_file_type = $arr_file_type['type'];

+										$image_name_parts = explode( '.', $image_name );

+										array_pop( $image_name_parts );

+										$proper_image_name = implode( '.', $image_name_parts );

+										$xtimings['###9.2'] = microtime(true)-$xstart;

+										$arr_file_type = wp_check_filetype( $image_name );

+										$xtimings['###9.3'] = microtime(true)-$xstart;

+										if ( !empty( $arr_file_type ) ) {

+											$uploaded_file_type = $arr_file_type['type'];

                                             

-                                            $attachment = array();

-                                            $attachment['post_id'] = $saved_post_id;

-                                            $attachment['title'] = $proper_image_name;

-                                            $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

-                                            $attachment['mime_type'] = $uploaded_file_type;

-                                            $attachment['menu_order'] = $order;

-                                            $attachment['is_featured'] = 0;

-

-                                            $attachment_set = '';

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

-                                                if ( $val != '' ) {

-                                                    $attachment_set .= $key . " = '" . $val . "', ";

-                                                }

-                                            }

-                                            $attachment_set = trim( $attachment_set, ", " );

+											$attachment = array();

+											$attachment['post_id'] = $saved_post_id;

+											$attachment['title'] = $proper_image_name;

+											$attachment['content'] = '';

+											$attachment['file'] = $uploads_subdir . '/' . $image_name;

+											$attachment['mime_type'] = $uploaded_file_type;

+											$attachment['menu_order'] = $order;

+											$attachment['is_featured'] = 0;

+

+											$attachment_set = '';

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

+												if ( $val != '' ) {

+													$attachment_set .= $key . " = '" . $val . "', ";

+												}

+											}

+											$attachment_set = trim( $attachment_set, ", " );

                                                                                         

-                                            // Add new attachment

-                                            $xtimings['###9.4'] = microtime(true)-$xstart;

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

-                                            $xtimings['###9.5'] = microtime(true)-$xstart;

-                                            $order++;

-                                        }

-                                    }

-

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

-                                    // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

-                                    $xtimings['###9.6'] = microtime(true)-$xstart;

-                                    if ( !empty( $saved_post_images_arr ) ) {

-                                        geodir_set_wp_featured_image($saved_post_id);

-                                        $xtimings['###9.7'] = microtime(true)-$xstart;

-                                        /*

+											// Add new attachment

+											$xtimings['###9.4'] = microtime(true)-$xstart;

+											$wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+											$xtimings['###9.5'] = microtime(true)-$xstart;

+											$order++;

+										}

+									}

+

+									$saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+									// Remove previous attachment

+									$wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+									$xtimings['###9.6'] = microtime(true)-$xstart;

+									if ( !empty( $saved_post_images_arr ) ) {

+										geodir_set_wp_featured_image($saved_post_id);

+										$xtimings['###9.7'] = microtime(true)-$xstart;

+										/*

                                         $menu_order = 1;

                                         

                                         foreach ( $saved_post_images_arr as $img_name ) {

@@ -4619,288 +4619,288 @@ 
                                             }

                                             $menu_order++;

                                         }*/

-                                    }

+									}

                                     

-                                    if ( $order > 1 ) {

-                                        $images++;

-                                    }

-                                }

-                                $xtimings['###10'] = microtime(true)-$xstart;

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

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

-                                $xtimings['###11'] = microtime(true)-$xstart;

-                                if (isset($is_featured)) {

-                                    geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

-                                }

-                                if (isset($gd_post['alive_days'])) {

-                                    geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']);

-                                }

-                                if (isset($gd_post['expire_date'])) {

-                                    geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

-                                }

-                                $xtimings['###12'] = microtime(true)-$xstart;

-                            }

+									if ( $order > 1 ) {

+										$images++;

+									}

+								}

+								$xtimings['###10'] = microtime(true)-$xstart;

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

+								do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

+								$xtimings['###11'] = microtime(true)-$xstart;

+								if (isset($is_featured)) {

+									geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

+								}

+								if (isset($gd_post['alive_days'])) {

+									geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']);

+								}

+								if (isset($gd_post['expire_date'])) {

+									geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

+								}

+								$xtimings['###12'] = microtime(true)-$xstart;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

-                                $sitepress->switch_lang($active_lang, true);

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $language != '') {

+								$sitepress->switch_lang($active_lang, true);

+							}

+							// WPML

+						}

+					}

+				}

 

-                //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

-                $xtimings['###13'] = microtime(true)-$xstart;

-                $json = array();

-                $json['processed'] = $processed_actual;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['invalid_addr'] = $invalid_addr;

-                $json['images'] = $images;

-                $json['timing'] = microtime(true)-$xstart;

-                $json['timings'] = $xtimings;

+				//undo some stuff to make the import quicker

+				wp_defer_term_counting( false );

+				wp_defer_comment_counting( false );

+				$wpdb->query( 'COMMIT;' );

+				$wpdb->query( 'SET autocommit = 1;' );

+				$xtimings['###13'] = microtime(true)-$xstart;

+				$json = array();

+				$json['processed'] = $processed_actual;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['invalid_addr'] = $invalid_addr;

+				$json['images'] = $images;

+				$json['timing'] = microtime(true)-$xstart;

+				$json['timings'] = $xtimings;

                 

 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_loc' ) {

-                global $gd_post_types;

-                $gd_post_types = $post_types;

+				wp_send_json( $json );

+				exit;

+			} else if ( $task == 'import_loc' ) {

+				global $gd_post_types;

+				$gd_post_types = $post_types;

                 

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');

-                        wp_send_json( $json );

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');

+						wp_send_json( $json );

+					}

                     

-                    $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					$gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

+					$gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            $data = array();

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							$data = array();

                             

-                            foreach ($columns as $c => $column ) {

-                                if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {

-                                    $data[$column] = $row[$c];

-                                }

-                            }

+							foreach ($columns as $c => $column ) {

+								if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {

+									$data[$column] = $row[$c];

+								}

+							}

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                continue;

-                            }

+							if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+								continue;

+							}

                             

-                            $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

+							$data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

-                            if ( $import_choice == 'update' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+							if ( $import_choice == 'update' ) {

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$data['location_id'] = (int)$location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    }

+									if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									}

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $skipped++;

-                                } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                            }

-                        }

-                    }

-                }

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								} else {

+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								}

+							} elseif ( $import_choice == 'skip' ) {

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									$skipped++;

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$skipped++;

+								} else {

+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+							}

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-            } else if ( $task == 'import_hood' ) {               

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+				wp_send_json( $json );

+			} else if ( $task == 'import_hood' ) {               

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');

-                        wp_send_json( $json );

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');

+						wp_send_json( $json );

+					}

                     

-                    $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

-                    $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					$gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

+					$gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            $data = array();

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							$data = array();

                             

-                            foreach ($columns as $c => $column) {

-                                if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {

-                                    $data[$column] = sanitize_text_field($row[$c]);

-                                }

-                            }

+							foreach ($columns as $c => $column) {

+								if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {

+									$data[$column] = sanitize_text_field($row[$c]);

+								}

+							}

 

-                            if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                continue;

-                            }

+							if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+								continue;

+							}

                             

-                            $location_info = array();

-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);

-                            } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

-                                $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

-                            }

+							$location_info = array();

+							if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

+								$location_info = geodir_get_location_by_id('', (int)$data['location_id']);

+							} else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

+								$location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

+							}

 

-                            if (empty($location_info)) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                continue;

-                            }

+							if (empty($location_info)) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+								continue;

+							}

                             

-                            $location_id = $location_info->location_id;

+							$location_id = $location_info->location_id;

 

-                            $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;

+							$data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;

                             

-                            $hood_data = array();

-                            $hood_data['hood_name'] = $data['neighbourhood_name'];

-                            $hood_data['hood_slug'] = $data['neighbourhood_slug'];

-                            $hood_data['hood_latitude'] = $data['latitude'];

-                            $hood_data['hood_longitude'] = $data['longitude'];

-                            $hood_data['hood_location_id'] = $location_id;

+							$hood_data = array();

+							$hood_data['hood_name'] = $data['neighbourhood_name'];

+							$hood_data['hood_slug'] = $data['neighbourhood_slug'];

+							$hood_data['hood_latitude'] = $data['latitude'];

+							$hood_data['hood_longitude'] = $data['longitude'];

+							$hood_data['hood_location_id'] = $location_id;

                                     

-                            if ( $import_choice == 'update' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];

+							if ( $import_choice == 'update' ) {

+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+									$hood_data['hood_id'] = (int)$data['neighbourhood_id'];

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

+									$hood_data['hood_id'] = (int)$neighbourhood->hood_id;

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                } else {

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $skipped++;

-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $skipped++;

-                                } else {

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								} else {

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								}

+							} elseif ( $import_choice == 'skip' ) {

+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+									$skipped++;

+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

+									$skipped++;

+								} else {

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                            }

-                        }

-                    }

-                }

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+							}

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'import_finish':{

-            /**

-             * Run an action when an import finishes.

-             *

-             * This action can be used to fire functions after an import ends.

-             *

-             * @since 1.5.3

-             * @package GeoDirectory

-             */

-            do_action('geodir_import_finished');

-        }

-        break;

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'import_finish':{

+			/**

+			 * Run an action when an import finishes.

+			 *

+			 * This action can be used to fire functions after an import ends.

+			 *

+			 * @since 1.5.3

+			 * @package GeoDirectory

+			 */

+			do_action('geodir_import_finished');

+		}

+		break;

 

-    }

-    echo '0';

-    gd_die();

+	}

+	echo '0';

+	gd_die();

 }

 

 /**

@@ -4944,12 +4944,12 @@ 
 		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

 	}

 	

-    if( !empty( $term ) ) {

+	if( !empty( $term ) ) {

 		$result = wp_insert_term( $term, $taxonomy, $args );

-        if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

-    }

+		if( !is_wp_error( $result ) ) {

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

+	}

 	

 	return false;

 }

@@ -4995,16 +4995,16 @@ 
 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

 	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

 	} else {

 		return geodir_imex_insert_term( $taxonomy, $term_data );

 	}

@@ -5026,47 +5026,47 @@ 
  * @return int Posts count.

  */

 function geodir_get_posts_count( $post_type ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( !post_type_exists( $post_type ) ) {

-        return 0;

-    }

+	if ( !post_type_exists( $post_type ) ) {

+		return 0;

+	}

         

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

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

 

-    // Skip listing with statuses trash, auto-draft etc...

-    $skip_statuses = geodir_imex_export_skip_statuses();

-    $where_statuses = '';

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

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-    }

+	// Skip listing with statuses trash, auto-draft etc...

+	$skip_statuses = geodir_imex_export_skip_statuses();

+	$where_statuses = '';

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

+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+	}

     

-    /**

-     * Filter the SQL where clause part to filter posts count in import/export.

-     *

-     * @since 1.6.4

-     * @package GeoDirectory

-     *

-     * @param string $where SQL where clause part.

-     */

-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

-

-    $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

-

-    $posts_count = (int)$wpdb->get_var( $query );

+	/**

+	 * Filter the SQL where clause part to filter posts count in import/export.

+	 *

+	 * @since 1.6.4

+	 * @package GeoDirectory

+	 *

+	 * @param string $where SQL where clause part.

+	 */

+	$where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

+

+	$query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

+

+	$posts_count = (int)$wpdb->get_var( $query );

     

-    /**

-     * Modify returned post counts for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param int $posts_count Post counts.

-     * @param string $post_type Post type.

-     */

-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

-

-    return $posts_count;

+	/**

+	 * Modify returned post counts for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param int $posts_count Post counts.

+	 * @param string $post_type Post type.

+	 */

+	$posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

+

+	return $posts_count;

 }

 

 /**

@@ -5134,7 +5134,7 @@ 
 		}

 		$csv_row[] = 'post_status';

 		$csv_row[] = 'is_featured';

-        // Export claim listing field

+		// Export claim listing field

 		if ($is_claim_active) {

 			$csv_row[] = 'claimed';

 		}

@@ -5143,7 +5143,7 @@ 
 			$csv_row[] = 'alive_days';

 			$csv_row[] = 'expire_date';

 		}

-        $csv_row[] = 'post_date';

+		$csv_row[] = 'post_date';

 		$csv_row[] = 'post_address';

 		$csv_row[] = 'post_city';

 		$csv_row[] = 'post_region';

@@ -5151,11 +5151,11 @@ 
 		$csv_row[] = 'post_zip';

 		$csv_row[] = 'post_latitude';

 		$csv_row[] = 'post_longitude';

-        if ($neighbourhood_active) {

-            $csv_row[] = 'post_neighbourhood';

-            $csv_row[] = 'neighbourhood_latitude';

-            $csv_row[] = 'neighbourhood_longitude';

-        }

+		if ($neighbourhood_active) {

+			$csv_row[] = 'post_neighbourhood';

+			$csv_row[] = 'neighbourhood_latitude';

+			$csv_row[] = 'neighbourhood_longitude';

+		}

 		$csv_row[] = 'geodir_timing';

 		$csv_row[] = 'geodir_contact';

 		$csv_row[] = 'geodir_email';

@@ -5190,21 +5190,21 @@ 
 			$csv_row[] = 'franchise';

 		}

         

-        /**

-         * Filter columns field names of gd export listings csv.

-         *

-         * @since 1.6.5

-         * @package GeoDirectory

-         *

-         * @param array $csv_row Column names being exported in csv.

-         * @param string $post_type The post type.

-         */

-        $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);

+		/**

+		 * Filter columns field names of gd export listings csv.

+		 *

+		 * @since 1.6.5

+		 * @package GeoDirectory

+		 *

+		 * @param array $csv_row Column names being exported in csv.

+		 * @param string $post_type The post type.

+		 */

+		$csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);

 		

 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

+		$xx=0;

 		foreach ( $posts as $post ) {$xx++;

 			$post_id = $post['ID'];

 			

@@ -5335,15 +5335,15 @@ 
 			}

 			$csv_row[] = $post_info['post_status']; // post_status

 			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

-            if ($is_claim_active) {

-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

-            }

+			if ($is_claim_active) {

+				$csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

+			}

 			if ($is_payment_plugin) {

 				$csv_row[] = (int)$post_info['package_id']; // package_id

 				$csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

-            $csv_row[] = $post_info['post_date']; // post_date

+			$csv_row[] = $post_info['post_date']; // post_date

 			$csv_row[] = stripslashes($post_info['post_address']); // post_address

 			$csv_row[] = stripslashes($post_info['post_city']); // post_city

 			$csv_row[] = stripslashes($post_info['post_region']); // post_region

@@ -5351,21 +5351,21 @@ 
 			$csv_row[] = stripslashes($post_info['post_zip']); // post_zip

 			$csv_row[] = $post_info['post_latitude']; // post_latitude

 			$csv_row[] = $post_info['post_longitude']; // post_longitude

-            if ($neighbourhood_active) {

-                $post_neighbourhood = '';

-                $neighbourhood_latitude = '';

-                $neighbourhood_longitude = '';

-                if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {

-                    if (!empty($hood_info)) {

-                        $post_neighbourhood = $hood_info->hood_name;

-                        $neighbourhood_latitude = $hood_info->hood_latitude;

-                        $neighbourhood_longitude = $hood_info->hood_longitude;

-                    }

-                }

-                $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood

-                $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude

-                $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude

-            }

+			if ($neighbourhood_active) {

+				$post_neighbourhood = '';

+				$neighbourhood_latitude = '';

+				$neighbourhood_longitude = '';

+				if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {

+					if (!empty($hood_info)) {

+						$post_neighbourhood = $hood_info->hood_name;

+						$neighbourhood_latitude = $hood_info->hood_latitude;

+						$neighbourhood_longitude = $hood_info->hood_longitude;

+					}

+				}

+				$csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood

+				$csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude

+				$csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude

+			}

 			$csv_row[] = stripslashes($post_info['geodir_timing']); // geodir_timing

 			$csv_row[] = stripslashes($post_info['geodir_contact']); // geodir_contact

 			$csv_row[] = stripslashes($post_info['geodir_email']); // geodir_email

@@ -5408,16 +5408,16 @@ 
 				$csv_row[] = (int)$franchise; // franchise id

 			}

             

-            /**

-             * Filter columns values of gd export listings csv file

-             *

-             * @since 1.6.5

-             * @package GeoDirectory

-             *

-             * @param array $csv_row Field values being exported in csv.

-             * @param array $post_info The post info.

-             */

-            $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

+			/**

+			 * Filter columns values of gd export listings csv file

+			 *

+			 * @since 1.6.5

+			 * @package GeoDirectory

+			 *

+			 * @param array $csv_row Field values being exported in csv.

+			 * @param array $post_info The post info.

+			 */

+			$csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

 			

 			for ( $c = 0; $c < $images_count; $c++ ) {

 				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

@@ -5450,64 +5450,64 @@ 
  * @return array Array of posts data.

  */

 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

-        return new stdClass;

+	if ( ! post_type_exists( $post_type ) )

+		return new stdClass;

         

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

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

 

-    $limit = '';

-    if ( $per_page > 0 && $page_no > 0 ) {

-        $offset = ( $page_no - 1 ) * $per_page;

+	$limit = '';

+	if ( $per_page > 0 && $page_no > 0 ) {

+		$offset = ( $page_no - 1 ) * $per_page;

         

-        if ( $offset > 0 ) {

-            $limit = " LIMIT " . $offset . "," . $per_page;

-        } else {

-            $limit = " LIMIT " . $per_page;

-        }

-    }

+		if ( $offset > 0 ) {

+			$limit = " LIMIT " . $offset . "," . $per_page;

+		} else {

+			$limit = " LIMIT " . $per_page;

+		}

+	}

 

-    // Skip listing with statuses trash, auto-draft etc...

-    $skip_statuses = geodir_imex_export_skip_statuses();

-    $where_statuses = '';

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

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-    }

+	// Skip listing with statuses trash, auto-draft etc...

+	$skip_statuses = geodir_imex_export_skip_statuses();

+	$where_statuses = '';

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

+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+	}

     

-    /**

-     * Filter the SQL where clause part to filter posts in import/export.

-     *

-     * @since 1.6.4

-     * @package GeoDirectory

-     *

-     * @param string $where SQL where clause part.

-     */

-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

-

-    $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

-    /**

-     * Modify returned posts SQL query for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param int $query The SQL query.

-     * @param string $post_type Post type.

-     */

-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-    $results = (array)$wpdb->get_results( $query, ARRAY_A );

-

-    /**

-     * Modify returned post results for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param object $results An object containing all post ids.

-     * @param string $post_type Post type.

-     */

-    return apply_filters( 'geodir_export_posts', $results, $post_type );

+	/**

+	 * Filter the SQL where clause part to filter posts in import/export.

+	 *

+	 * @since 1.6.4

+	 * @package GeoDirectory

+	 *

+	 * @param string $where SQL where clause part.

+	 */

+	$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+

+	$query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

+	/**

+	 * Modify returned posts SQL query for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param int $query The SQL query.

+	 * @param string $post_type Post type.

+	 */

+	$query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

+	$results = (array)$wpdb->get_results( $query, ARRAY_A );

+

+	/**

+	 * Modify returned post results for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param object $results An object containing all post ids.

+	 * @param string $post_type Post type.

+	 */

+	return apply_filters( 'geodir_export_posts', $results, $post_type );

 }

 

 /**

@@ -5526,26 +5526,26 @@ 
  * @return string The SQL query.

  */

 function geodir_imex_get_events_query( $query, $post_type ) {

-    if ( $post_type == 'gd_event' ) {

-        global $wpdb, $plugin_prefix;

+	if ( $post_type == 'gd_event' ) {

+		global $wpdb, $plugin_prefix;

         

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

-        $schedule_table = EVENT_SCHEDULE;

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

+		$schedule_table = EVENT_SCHEDULE;

         

-        // Skip listing with statuses trash, auto-draft etc...

-        $skip_statuses = geodir_imex_export_skip_statuses();

-        $where_statuses = '';

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

-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-        }

+		// Skip listing with statuses trash, auto-draft etc...

+		$skip_statuses = geodir_imex_export_skip_statuses();

+		$where_statuses = '';

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

+			$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+		}

         

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

-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

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

+		$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

 

-        $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

-    }

+		$query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

+	}

 

-    return $query;

+	return $query;

 }

 

 /**

@@ -5567,36 +5567,36 @@ 
  * @return int Total terms count.

  */

 function geodir_get_terms_count( $post_type ) {

-    $args = array( 'hide_empty' => 0 );

+	$args = array( 'hide_empty' => 0 );

 

-    remove_all_filters( 'get_terms' );

+	remove_all_filters( 'get_terms' );

 

-    $taxonomy = $post_type . 'category';

+	$taxonomy = $post_type . 'category';

 

-    // WPML

-    $is_wpml = geodir_is_wpml();

-    $active_lang = 'all';

-    if ( $is_wpml ) {

-        global $sitepress;

-        $active_lang = $sitepress->get_current_language();

+	// WPML

+	$is_wpml = geodir_is_wpml();

+	$active_lang = 'all';

+	if ( $is_wpml ) {

+		global $sitepress;

+		$active_lang = $sitepress->get_current_language();

         

-        if ( $active_lang != 'all' ) {

-            $sitepress->switch_lang( 'all', true );

-        }

-    }

-    // WPML

+		if ( $active_lang != 'all' ) {

+			$sitepress->switch_lang( 'all', true );

+		}

+	}

+	// WPML

             

-    $count_terms = wp_count_terms( $taxonomy, $args );

+	$count_terms = wp_count_terms( $taxonomy, $args );

 

-    // WPML

-    if ( $is_wpml && $active_lang !== 'all' ) {

-        global $sitepress;

-        $sitepress->switch_lang( $active_lang, true );

-    }

-    // WPML

-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+	// WPML

+	if ( $is_wpml && $active_lang !== 'all' ) {

+		global $sitepress;

+		$sitepress->switch_lang( $active_lang, true );

+	}

+	// WPML

+	$count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

      

-    return $count_terms;

+	return $count_terms;

 }

 

 /**

@@ -5635,11 +5635,11 @@ 
 		$csv_row[] = 'cat_posttype';

 		$csv_row[] = 'cat_parent';

 		$csv_row[] = 'cat_schema';

-        // WPML

+		// WPML

 		$is_wpml = geodir_wpml_is_taxonomy_translated( $taxonomy );

 		if ($is_wpml) {

 			$csv_row[] = 'cat_language';

-            $csv_row[] = 'cat_id_original';

+			$csv_row[] = 'cat_id_original';

 		}

 		// WPML

 		$csv_row[] = 'cat_description';

@@ -5669,10 +5669,10 @@ 
 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

 			$csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

-            // WPML

+			// WPML

 			if ($is_wpml) {

 				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

+				$csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

 			}

 			// WPML

 			$csv_row[] = $term->description;

@@ -6090,43 +6090,43 @@ 
  * @param string $status Post status.

  */

 function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') {

-    global $wpdb, $current_user;

-

-    $option_value = get_option($option);

-

-    if ($option_value > 0) :

-        if (get_post($option_value)) :

-            // Page exists

-            return;

-        endif;

-    endif;

-

-    $page_found = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

-            array($slug)

-        )

-    );

-

-    if ($page_found) :

-        // Page exists

-        if (!$option_value) update_option($option, $page_found);

-        return;

-    endif;

-

-    $page_data = array(

-        'post_status' => $status,

-        'post_type' => 'page',

-        'post_author' => $current_user->ID,

-        'post_name' => $slug,

-        'post_title' => $page_title,

-        'post_content' => $page_content,

-        'post_parent' => $post_parent,

-        'comment_status' => 'closed'

-    );

-    $page_id = wp_insert_post($page_data);

-

-    add_option($option, $page_id);

+	global $wpdb, $current_user;

+

+	$option_value = get_option($option);

+

+	if ($option_value > 0) :

+		if (get_post($option_value)) :

+			// Page exists

+			return;

+		endif;

+	endif;

+

+	$page_found = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+			array($slug)

+		)

+	);

+

+	if ($page_found) :

+		// Page exists

+		if (!$option_value) update_option($option, $page_found);

+		return;

+	endif;

+

+	$page_data = array(

+		'post_status' => $status,

+		'post_type' => 'page',

+		'post_author' => $current_user->ID,

+		'post_name' => $slug,

+		'post_title' => $page_title,

+		'post_content' => $page_content,

+		'post_parent' => $post_parent,

+		'comment_status' => 'closed'

+	);

+	$page_id = wp_insert_post($page_data);

+

+	add_option($option, $page_id);

 

 }

 

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

  */

 function geodir_admin_upgrade_notice() {

-    $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

-    echo"<div class=\"$class\"> <p>$message</p></div>";

+	$class = "error";

+	$message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+	echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

 /**

@@ -6172,18 +6172,18 @@ 
  */

 function geodire_admin_upgrade_notice( $plugin_data, $r )

 {

-    // readme contents

-    $args = array(

-        'timeout'     => 15,

-        'redirection' => 5

-    );

-    $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+	// readme contents

+	$args = array(

+		'timeout'     => 15,

+		'redirection' => 5

+	);

+	$url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

+	$data       = wp_remote_get( $url, $args );

 

-    if (!is_wp_error($data) && $data['response']['code'] == 200) {

+	if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

-        geodir_in_plugin_update_message($data['body']);

-    }

+		geodir_in_plugin_update_message($data['body']);

+	}

 }

 

 

@@ -6191,28 +6191,28 @@ 
 * @param string $content http response body

 */

 function geodir_in_plugin_update_message($content) {

-    // Output Upgrade Notice

-    $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

-    $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

-

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

-

-

-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

-            $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

-            }

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

-        }

-        }

-    }

-    echo $upgrade_notice;

+	// Output Upgrade Notice

+	$matches        = null;

+	$regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+	$upgrade_notice = '';

+	if ( preg_match( $regexp, $content, $matches ) ) {

+		if(empty($matches)){return;}

+

+		$version = trim( $matches[1] );

+		if($version && $version>GEODIRECTORY_VERSION){

+

+

+		$notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

+		if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

+			$upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

+			foreach ( $notices as $index => $line ) {

+				$upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+			}

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

+		}

+		}

+	}

+	echo $upgrade_notice;

 }

 

 /**

@@ -6245,19 +6245,19 @@ 
  * @param array Listing statuses to be skipped.

  */

 function geodir_imex_export_skip_statuses() {

-    $statuses = array( 'trash', 'auto-draft' );

+	$statuses = array( 'trash', 'auto-draft' );

     

-    /**

-     * Filter the statuses to skip during GD export listings.

-     *

-     * @since 1.6.0

-     * @package GeoDirectory

-     *

-     * @param array $statuses Listing statuses to be skipped.

-     */

-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

+	/**

+	 * Filter the statuses to skip during GD export listings.

+	 *

+	 * @since 1.6.0

+	 * @package GeoDirectory

+	 *

+	 * @param array $statuses Listing statuses to be skipped.

+	 */

+	$statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

      

-    return $statuses;

+	return $statuses;

 }

 

 /**

@@ -6273,42 +6273,42 @@ 
  * @global string $typenow Current post type.

  */

 function geodir_admin_dequeue_scripts() {

-    global $typenow;

+	global $typenow;

     

-    // EDD

-    if (wp_script_is('jquery-chosen', 'enqueued')) {

-        wp_dequeue_script('jquery-chosen');

-    }

+	// EDD

+	if (wp_script_is('jquery-chosen', 'enqueued')) {

+		wp_dequeue_script('jquery-chosen');

+	}

     

-    // Ultimate Addons for Visual Composer

-    if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {

-        wp_dequeue_script('ultimate-vc-backend-script');

-    }

+	// Ultimate Addons for Visual Composer

+	if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {

+		wp_dequeue_script('ultimate-vc-backend-script');

+	}

     

-    // VC editor conflicts

-    if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {

-        wp_dequeue_script('dfd_vc_damin_scripts');

-    }

+	// VC editor conflicts

+	if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {

+		wp_dequeue_script('dfd_vc_damin_scripts');

+	}

     

-    // Ultimate chosen

-    if (wp_script_is('ultimate-chosen-script', 'enqueued')) {

-        wp_dequeue_script('ultimate-chosen-script');

-    }

+	// Ultimate chosen

+	if (wp_script_is('ultimate-chosen-script', 'enqueued')) {

+		wp_dequeue_script('ultimate-chosen-script');

+	}

     

-    // Crum composer choosen

-    if (wp_script_is('crum-composer-choosen', 'enqueued')) {

-        wp_dequeue_script('crum-composer-choosen');

-    }

+	// Crum composer choosen

+	if (wp_script_is('crum-composer-choosen', 'enqueued')) {

+		wp_dequeue_script('crum-composer-choosen');

+	}

     

-    // Fix conflict Fusion Builder jquery chosen with GD jquery chosen.

-    if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {

-        wp_dequeue_script('fusion_builder_chosen_js');

-    }

+	// Fix conflict Fusion Builder jquery chosen with GD jquery chosen.

+	if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {

+		wp_dequeue_script('fusion_builder_chosen_js');

+	}

     

-    // Fix conflicts timepicker & setting date value.

-    if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) {

-        wp_dequeue_script('acf-timepicker');

-    }

+	// Fix conflicts timepicker & setting date value.

+	if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) {

+		wp_dequeue_script('acf-timepicker');

+	}

 }

 

 /**

@@ -6324,48 +6324,48 @@ 
  * @return string SQL where clause part.

  */

 function geodir_imex_get_filter_where($where = '', $post_type = '') {

-    global $wpdb;

+	global $wpdb;

     

-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+	$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

     

-    if ( !empty( $filters ) ) {

-        foreach ( $filters as $field => $value ) {

-            switch ($field) {

-                case 'start_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

-                break;

-                case 'end_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

-                break;

-            }

-        }

-    }

+	if ( !empty( $filters ) ) {

+		foreach ( $filters as $field => $value ) {

+			switch ($field) {

+				case 'start_date':

+					$where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

+				break;

+				case 'end_date':

+					$where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

+				break;

+			}

+		}

+	}

     

-    return $where;

+	return $where;

 }

 add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2);

 add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);

 

 

 function geodir_fix_for_primer_theme(){

-    if(!defined( 'PRIMER_VERSION' )){return;}

-    global $pagenow;

+	if(!defined( 'PRIMER_VERSION' )){return;}

+	global $pagenow;

 

-    if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){

+	if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){

 

-        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );

+		$post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );

 

-        $post_types = geodir_get_posttypes();

-        if ($post_type && in_array($post_type, $post_types) ) {

-            global $primer_customizer_layouts;

-            remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);

-        }

-    }

+		$post_types = geodir_get_posttypes();

+		if ($post_type && in_array($post_type, $post_types) ) {

+			global $primer_customizer_layouts;

+			remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);

+		}

+	}

 

 }

 

 if(is_admin()){

-    add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);  

+	add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);  

 }

 

 

@@ -6498,96 +6498,96 @@ 
 

 function geodir_ga_activation_url() {

 

-    return add_query_arg( array(

-        'next'          => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),

-        'scope'         => GEODIR_GA_SCOPE,

-        'response_type' => 'code',

-        'redirect_uri'  => GEODIR_GA_REDIRECT,

-        'client_id'     => GEODIR_GA_CLIENTID,

-    ), 'https://accounts.google.com/o/oauth2/auth' );

+	return add_query_arg( array(

+		'next'          => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),

+		'scope'         => GEODIR_GA_SCOPE,

+		'response_type' => 'code',

+		'redirect_uri'  => GEODIR_GA_REDIRECT,

+		'client_id'     => GEODIR_GA_CLIENTID,

+	), 'https://accounts.google.com/o/oauth2/auth' );

 

-    return $url;

+	return $url;

 }

 

 function geodir_gd_accounts(){

-    $accounts = array();

-    $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true );

-    if($useAuth){

-        try {

-            $accounts = geodir_ga_get_analytics_accounts();

-        } catch (Exception $e) {

-            geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );

-        }

+	$accounts = array();

+	$useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true );

+	if($useAuth){

+		try {

+			$accounts = geodir_ga_get_analytics_accounts();

+		} catch (Exception $e) {

+			geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );

+		}

         

-        if(is_array($accounts)){

-            $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);

-        }elseif(get_option('geodir_ga_account_id')){

-            $accounts = array();

-            $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';

-        }

-    }

-    return $accounts;

+		if(is_array($accounts)){

+			$accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);

+		}elseif(get_option('geodir_ga_account_id')){

+			$accounts = array();

+			$accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';

+		}

+	}

+	return $accounts;

 }

 

 function geodir_ga_get_analytics_accounts()

 {

-    global $gd_ga_errors;

-    $accounts = array();

+	global $gd_ga_errors;

+	$accounts = array();

 

-    if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}

+	if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}

 

 

-    if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){

-      return get_option('geodir_gd_uids');

-    }

+	if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){

+	  return get_option('geodir_gd_uids');

+	}

 

-    # Create a new Gdata call

-    if ( trim(get_option('geodir_ga_auth_code')) != '' )

-        $stats = new GDGoogleAnalyticsStats();

-    else

-        return false;

+	# Create a new Gdata call

+	if ( trim(get_option('geodir_ga_auth_code')) != '' )

+		$stats = new GDGoogleAnalyticsStats();

+	else

+		return false;

 

-    # Check if Google sucessfully logged in

-    if ( ! $stats->checkLogin() )

-        return false;

+	# Check if Google sucessfully logged in

+	if ( ! $stats->checkLogin() )

+		return false;

 

-    # Get a list of accounts

-    try {

-        $accounts = $stats->getAllProfiles();

-    } catch (Exception $e) {

-        $gd_ga_errors[] = $e->getMessage();

-        return false;

-    }

+	# Get a list of accounts

+	try {

+		$accounts = $stats->getAllProfiles();

+	} catch (Exception $e) {

+		$gd_ga_errors[] = $e->getMessage();

+		return false;

+	}

 

 

-    natcasesort ($accounts);

+	natcasesort ($accounts);

 

-    # Return the account array if there are accounts

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

-        update_option('geodir_gd_uids',$accounts);

-        return $accounts;

-    }

-    else

-        return false;

+	# Return the account array if there are accounts

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

+		update_option('geodir_gd_uids',$accounts);

+		return $accounts;

+	}

+	else

+		return false;

 }

 

 add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' );

 function geodir_ga_deauthorize(){

 

-    if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {

+	if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {

 

-        die( 'Security check' );

+		die( 'Security check' );

 

-    } else {

-        update_option('geodir_ga_auth_token','');

-        update_option('geodir_ga_auth_code','');

-        update_option('geodir_gd_uids','');

+	} else {

+		update_option('geodir_ga_auth_token','');

+		update_option('geodir_ga_auth_code','');

+		update_option('geodir_gd_uids','');

 

 

-        echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');

-    }

+		echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');

+	}

 

-    die();

+	die();

 }

 

 

@@ -6598,14 +6598,14 @@ 
  * @package GeoDirectory

  */

 function geodir_post_type_setting_fun() {

-    $post_type_arr = array();

+	$post_type_arr = array();

 

-    $post_types = geodir_get_posttypes('object');

+	$post_types = geodir_get_posttypes('object');

 

-    foreach ($post_types as $key => $post_types_obj) {

-        $post_type_arr[$key] = $post_types_obj->labels->singular_name;

-    }

-    return $post_type_arr;

+	foreach ($post_types as $key => $post_types_obj) {

+		$post_type_arr[$key] = $post_types_obj->labels->singular_name;

+	}

+	return $post_type_arr;

 }

 

 /**

@@ -6616,35 +6616,35 @@ 
  */

 function geodir_listing_image_size_arr(){

 

-    global $_wp_additional_image_sizes;

-

-    $sizes = array();

-

-    foreach ( get_intermediate_image_sizes() as $_size ) {

-        if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {

-            $sizes[ $_size ]['width']  = get_option( "{$_size}_size_w" );

-            $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );

-            $sizes[ $_size ]['crop']   = (bool) get_option( "{$_size}_crop" );

-        } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {

-            $sizes[ $_size ] = array(

-                'width'  => $_wp_additional_image_sizes[ $_size ]['width'],

-                'height' => $_wp_additional_image_sizes[ $_size ]['height'],

-                'crop'   => $_wp_additional_image_sizes[ $_size ]['crop'],

-            );

-        }

-    }

+	global $_wp_additional_image_sizes;

+

+	$sizes = array();

+

+	foreach ( get_intermediate_image_sizes() as $_size ) {

+		if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {

+			$sizes[ $_size ]['width']  = get_option( "{$_size}_size_w" );

+			$sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );

+			$sizes[ $_size ]['crop']   = (bool) get_option( "{$_size}_crop" );

+		} elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {

+			$sizes[ $_size ] = array(

+				'width'  => $_wp_additional_image_sizes[ $_size ]['width'],

+				'height' => $_wp_additional_image_sizes[ $_size ]['height'],

+				'crop'   => $_wp_additional_image_sizes[ $_size ]['crop'],

+			);

+		}

+	}

 

 

 

-    $options = array();

+	$options = array();

 

-    $options['default'] = __('GD Default', 'geodirectory');

+	$options['default'] = __('GD Default', 'geodirectory');

 

-    if(!empty($sizes)){

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

-            $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )';

-        }

-    }

+	if(!empty($sizes)){

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

+			$options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )';

+		}

+	}

 

-    return $options;

+	return $options;

 }
\ No newline at end of file

geodirectory-functions/custom_fields_input_functions.php

Spacing +233 added lines, -233 removed lines

@@ -17,12 +17,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_fieldset($html,$cf){
+function geodir_cfi_fieldset($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_fieldset_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_fieldset_{$html_var}")) {
         /**
          * Filter the fieldset html by individual custom field.
          *
@@ -30,18 +30,18 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         ?>
         <h5 id="geodir_fieldset_<?php echo (int) $cf['id']; ?>" class="geodir-fieldset-row"
-            gd-fieldset="<?php echo (int) $cf['id']; ?>"><?php echo __( $cf['site_title'], 'geodirectory' ); ?>
-            <?php if ( $cf['desc'] != '' ) {
-                echo '<small>( ' . __( $cf['desc'], 'geodirectory' ) . ' )</small>';
+            gd-fieldset="<?php echo (int) $cf['id']; ?>"><?php echo __($cf['site_title'], 'geodirectory'); ?>
+            <?php if ($cf['desc'] != '') {
+                echo '<small>( '.__($cf['desc'], 'geodirectory').' )</small>';
             } ?></h5>
         <?php
         $html = ob_get_clean();
@@ -49,7 +49,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_fieldset','geodir_cfi_fieldset',10,2);
+add_filter('geodir_custom_field_input_fieldset', 'geodir_cfi_fieldset', 10, 2);
 
 
 
@@ -62,12 +62,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_text($html,$cf){
+function geodir_cfi_text($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_text_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_text_{$html_var}")) {
         /**
          * Filter the text html by individual custom field.
          *
@@ -75,41 +75,41 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_text_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_text_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
 
         $value = geodir_get_cf_value($cf);
         $type = $cf['type'];
         //number and float validation $validation_pattern
-        if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';}
-        elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
+        if (isset($cf['data_type']) && $cf['data_type'] == 'INT') {$type = 'number'; }
+        elseif (isset($cf['data_type']) && $cf['data_type'] == 'FLOAT') {$type = 'float'; }
 
         //validation
-        if(isset($cf['validation_pattern']) && $cf['validation_pattern']){
+        if (isset($cf['validation_pattern']) && $cf['validation_pattern']) {
             $validation = 'pattern="'.$cf['validation_pattern'].'"';
-        }else{$validation='';}
+        } else {$validation = ''; }
 
         // validation message
-        if(isset($cf['validation_msg']) && $cf['validation_msg']){
+        if (isset($cf['validation_msg']) && $cf['validation_msg']) {
             $validation_msg = 'title="'.$cf['validation_msg'].'"';
-        }else{$validation_msg='';}
+        } else {$validation_msg = ''; }
         ?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $type;?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <input field_type="<?php echo $type; ?>" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="<?php echo $type; ?>" class="geodir_textfield" <?php echo $validation; echo $validation_msg; ?> />
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -121,7 +121,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_text','geodir_cfi_text',10,2);
+add_filter('geodir_custom_field_input_text', 'geodir_cfi_text', 10, 2);
 
 
 /**
@@ -133,12 +133,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_email($html,$cf){
+function geodir_cfi_email($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_email_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_email_{$html_var}")) {
         /**
          * Filter the email html by individual custom field.
          *
@@ -146,11 +146,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_email_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_email_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -159,16 +159,16 @@ 
             $value = '';
         }?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php  echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="email" class="geodir_textfield"/>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -180,7 +180,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_email','geodir_cfi_email',10,2);
+add_filter('geodir_custom_field_input_email', 'geodir_cfi_email', 10, 2);
 
 
 
@@ -193,12 +193,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_phone($html,$cf){
+function geodir_cfi_phone($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_phone_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_phone_{$html_var}")) {
         /**
          * Filter the phone html by individual custom field.
          *
@@ -206,11 +206,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_phone_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_phone_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -219,16 +219,16 @@ 
             $value = '';
         }?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php  echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="tel" class="geodir_textfield"/>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -240,7 +240,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_phone','geodir_cfi_phone',10,2);
+add_filter('geodir_custom_field_input_phone', 'geodir_cfi_phone', 10, 2);
 
 
 
@@ -253,12 +253,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_url($html,$cf){
+function geodir_cfi_url($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_url_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_url_{$html_var}")) {
         /**
          * Filter the url html by individual custom field.
          *
@@ -266,11 +266,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_url_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_url_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -279,19 +279,19 @@ 
             $value = '';
         }?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="url" class="geodir_textfield"
                    oninvalid="setCustomValidity('<?php _e('Please enter a valid URL including http://', 'geodirectory'); ?>')"
                    onchange="try{setCustomValidity('')}catch(e){}"
             />
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -303,7 +303,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_url','geodir_cfi_url',10,2);
+add_filter('geodir_custom_field_input_url', 'geodir_cfi_url', 10, 2);
 
 
 /**
@@ -315,12 +315,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_radio($html,$cf){
+function geodir_cfi_radio($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_radio_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_radio_{$html_var}")) {
         /**
          * Filter the radio html by individual custom field.
          *
@@ -328,22 +328,22 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_radio_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_radio_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
 
         ?>
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <?php if ($cf['option_values']) {
                 $option_values = geodir_string_values_to_options($cf['option_values'], true);
@@ -352,14 +352,14 @@ 
                     foreach ($option_values as $option_value) {
                         if (empty($option_value['optgroup'])) {
                             ?>
-                            <span class="gd-radios"><input name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" <?php checked(stripslashes($value), $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="radio" /><?php echo $option_value['label']; ?></span>
+                            <span class="gd-radios"><input name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>" <?php checked(stripslashes($value), $option_value['value']); ?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $cf['type']; ?>" type="radio" /><?php echo $option_value['label']; ?></span>
                             <?php
                         }
                     }
                 }
             }
             ?>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -371,7 +371,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_radio','geodir_cfi_radio',10,2);
+add_filter('geodir_custom_field_input_radio', 'geodir_cfi_radio', 10, 2);
 
 
 /**
@@ -383,12 +383,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_checkbox($html,$cf){
+function geodir_cfi_checkbox($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_checkbox_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_checkbox_{$html_var}")) {
         /**
          * Filter the checkbox html by individual custom field.
          *
@@ -396,11 +396,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -411,22 +411,22 @@ 
         }
         ?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <?php if ($value != '1') {
                 $value = '0';
             }?>
-            <input type="hidden" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" value="<?php echo esc_attr($value);?>"/>
+            <input type="hidden" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>" value="<?php echo esc_attr($value); ?>"/>
             <input  <?php if ($value == '1') {
                 echo 'checked="checked"';
-            }?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="checkbox"
-                 onchange="if(this.checked){jQuery('#<?php echo $cf['name'];?>').val('1');} else{ jQuery('#<?php echo $cf['name'];?>').val('0');}"/>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            }?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type']; ?>" type="checkbox"
+                 onchange="if(this.checked){jQuery('#<?php echo $cf['name']; ?>').val('1');} else{ jQuery('#<?php echo $cf['name']; ?>').val('0');}"/>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -438,7 +438,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_checkbox','geodir_cfi_checkbox',10,2);
+add_filter('geodir_custom_field_input_checkbox', 'geodir_cfi_checkbox', 10, 2);
 
 
 /**
@@ -450,12 +450,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_textarea($html,$cf){
+function geodir_cfi_textarea($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_textarea_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_textarea_{$html_var}")) {
         /**
          * Filter the textarea html by individual custom field.
          *
@@ -463,11 +463,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_textarea_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_textarea_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -475,32 +475,32 @@ 
         $extra_fields = unserialize($cf['extra_fields']);
         ?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label><?php
 
 
             if (is_array($extra_fields) && in_array('1', $extra_fields)) {
 
-                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>
+                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>
 
-            <div class="editor" field_id="<?php echo $cf['name'];?>" field_type="editor">
+            <div class="editor" field_id="<?php echo $cf['name']; ?>" field_type="editor">
                 <?php wp_editor(stripslashes($value), $cf['name'], $editor_settings); ?>
                 </div><?php
 
             } else {
 
-                ?><textarea field_type="<?php echo $cf['type'];?>" class="geodir_textarea" name="<?php echo $cf['name'];?>"
-                            id="<?php echo $cf['name'];?>"><?php echo stripslashes($value);?></textarea><?php
+                ?><textarea field_type="<?php echo $cf['type']; ?>" class="geodir_textarea" name="<?php echo $cf['name']; ?>"
+                            id="<?php echo $cf['name']; ?>"><?php echo stripslashes($value); ?></textarea><?php
 
             }?>
 
 
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -512,7 +512,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_textarea','geodir_cfi_textarea',10,2);
+add_filter('geodir_custom_field_input_textarea', 'geodir_cfi_textarea', 10, 2);
 
 
 /**
@@ -524,12 +524,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_select($html,$cf){
+function geodir_cfi_select($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_select_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_select_{$html_var}")) {
         /**
          * Filter the select html by individual custom field.
          *
@@ -537,22 +537,22 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_select_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_select_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
 
         ?>
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <?php
             $option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
@@ -562,22 +562,22 @@ 
                     if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
                         $option_label = isset($option_row['label']) ? $option_row['label'] : '';
 
-                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="'.esc_attr($option_label).'">' : '</optgroup>';
                     } else {
                         $option_label = isset($option_row['label']) ? $option_row['label'] : '';
                         $option_value = isset($option_row['value']) ? $option_row['value'] : '';
                         $selected = $option_value == stripslashes($value) ? 'selected="selected"' : '';
 
-                        $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+                        $select_options .= '<option value="'.esc_attr($option_value).'" '.$selected.'>'.$option_label.'</option>';
                     }
                 }
             }
             ?>
-            <select field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
+            <select field_type="<?php echo $cf['type']; ?>" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
                     class="geodir_textfield textfield_x chosen_select"
-                    data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;';?>"
-                    option-ajaxchosen="false"><?php echo $select_options;?></select>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+                    data-placeholder="<?php echo __('Choose', 'geodirectory').' '.$site_title.'&hellip;'; ?>"
+                    option-ajaxchosen="false"><?php echo $select_options; ?></select>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -589,7 +589,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_select','geodir_cfi_select',10,2);
+add_filter('geodir_custom_field_input_select', 'geodir_cfi_select', 10, 2);
 
 
 /**
@@ -601,12 +601,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_multiselect($html,$cf){
+function geodir_cfi_multiselect($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_multiselect_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_multiselect_{$html_var}")) {
         /**
          * Filter the multiselect html by individual custom field.
          *
@@ -614,11 +614,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -655,9 +655,9 @@ 
                                 $option_label = isset($option_row['label']) ? $option_row['label'] : '';
 
                                 if ($multi_display == 'select') {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+                                    $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="'.esc_attr($option_label).'">' : '</optgroup>';
                                 } else {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';
+                                    $select_options .= $option_row['optgroup'] == 'start' ? '<li>'.$option_label.'</li>' : '';
                                 }
                             } else {
                                 if (!is_array($value) && $value != '') {
@@ -690,9 +690,9 @@ 
                                 }
 
                                 if ($multi_display == 'select') {
-                                    $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+                                    $select_options .= '<option value="'.esc_attr($option_value).'" '.$selected.'>'.$option_label.'</option>';
                                 } else {
-                                    $select_options .= '<li><input name="' . $cf['name'] . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';
+                                    $select_options .= '<li><input name="'.$cf['name'].'[]" '.$checked.' value="'.esc_attr($option_value).'" class="gd-'.$multi_display.'" field_type="'.$multi_display.'" type="'.$multi_display.'" />&nbsp;'.$option_label.' </li>';
                                 }
                             }
                         }
@@ -712,7 +712,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_multiselect','geodir_cfi_multiselect',10,2);
+add_filter('geodir_custom_field_input_multiselect', 'geodir_cfi_multiselect', 10, 2);
 
 
 /**
@@ -724,12 +724,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_html($html,$cf){
+function geodir_cfi_html($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_html_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_html_{$html_var}")) {
         /**
          * Filter the html html by individual custom field.
          *
@@ -737,11 +737,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_html_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_html_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -774,7 +774,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_html','geodir_cfi_html',10,2);
+add_filter('geodir_custom_field_input_html', 'geodir_cfi_html', 10, 2);
 
 
 
@@ -787,12 +787,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_datepicker($html,$cf){
+function geodir_cfi_datepicker($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_datepicker_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_datepicker_{$html_var}")) {
         /**
          * Filter the datepicker html by individual custom field.
          *
@@ -800,11 +800,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -816,23 +816,23 @@ 
             $extra_fields['date_format'] = 'yy-mm-dd';
 
         $date_format = $extra_fields['date_format'];
-        $jquery_date_format  = $date_format;
+        $jquery_date_format = $date_format;
 
 
         // check if we need to change the format or not
         $date_format_len = strlen(str_replace(' ', '', $date_format));
-        if($date_format_len>5){// if greater then 5 then it's the old style format.
+        if ($date_format_len > 5) {// if greater then 5 then it's the old style format.
 
-            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-            $replace = array('d','j','l','m','n','F','Y');//PHP date format
+            $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
+            $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
 
             $date_format = str_replace($search, $replace, $date_format);
-        }else{
-            $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );
+        } else {
+            $jquery_date_format = geodir_date_format_php_to_jqueryui($jquery_date_format);
         }
 
-        if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty
-        if($value && !isset($_REQUEST['backandedit'])) {
+        if ($value == '0000-00-00') {$value = ''; }//if date not set, then mark it empty
+        if ($value && !isset($_REQUEST['backandedit'])) {
             //$time = strtotime($value);
             //$value = date_i18n($date_format, $time);
         }
@@ -843,37 +843,37 @@ 
 
             jQuery(function () {
 
-                jQuery("#<?php echo $cf['name'];?>").datepicker({changeMonth: true, changeYear: true <?php
+                jQuery("#<?php echo $cf['name']; ?>").datepicker({changeMonth: true, changeYear: true <?php
                     /**
                      * Used to add extra option to datepicker per custom field.
                      *
                      * @since 1.5.7
                      * @param string $name The custom field name.
                      */
-                    echo apply_filters("gd_datepicker_extra_{$name}",'');?>});
+                    echo apply_filters("gd_datepicker_extra_{$name}", ''); ?>});
 
-                jQuery("#<?php echo $name;?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format;?>');
+                jQuery("#<?php echo $name; ?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format; ?>');
 
-                <?php if(!empty($value)){?>
-                jQuery("#<?php echo $name;?>").datepicker("setDate", '<?php echo $value;?>');
+                <?php if (!empty($value)) {?>
+                jQuery("#<?php echo $name; ?>").datepicker("setDate", '<?php echo $value; ?>');
                 <?php } ?>
 
             });
 
         </script>
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
 
-            <input field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>" id="<?php echo $name;?>"
-                   value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"
+                   value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>
 
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -885,7 +885,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_datepicker','geodir_cfi_datepicker',10,2);
+add_filter('geodir_custom_field_input_datepicker', 'geodir_cfi_datepicker', 10, 2);
 
 
 /**
@@ -897,12 +897,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_time($html,$cf){
+function geodir_cfi_time($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_time_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_time_{$html_var}")) {
         /**
          * Filter the time html by individual custom field.
          *
@@ -910,11 +910,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_time_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_time_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -927,25 +927,25 @@ 
         <script type="text/javascript">
             jQuery(document).ready(function () {
 
-                jQuery('#<?php echo $name;?>').timepicker({
+                jQuery('#<?php echo $name; ?>').timepicker({
                     showPeriod: true,
                     showLeadingZero: true,
                     showPeriod: true,
                 });
             });
         </script>
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input readonly="readonly" field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>"
-                   id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>
+            <input readonly="readonly" field_type="<?php echo $cf['type']; ?>" name="<?php echo $name; ?>"
+                   id="<?php echo $name; ?>" value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>
 
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -956,7 +956,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_time','geodir_cfi_time',10,2);
+add_filter('geodir_custom_field_input_time', 'geodir_cfi_time', 10, 2);
 
 
 /**
@@ -968,12 +968,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_address($html,$cf){
+function geodir_cfi_address($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_address_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_address_{$html_var}")) {
         /**
          * Filter the address html by individual custom field.
          *
@@ -981,11 +981,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_address_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_address_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         global $gd_session;
         ob_start(); // Start  buffering;
@@ -998,12 +998,12 @@ 
         $site_title = $cf['site_title'];
         $is_admin = $cf['is_admin'];
         $extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
-        $prefix = $name . '_';
+        $prefix = $name.'_';
 
-        ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');
-        ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');
+        ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix.' address');
+        ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix.' zip/post code ');
         ($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');
-        ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');
+        ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix.' mapview');
 
         $address = '';
         $zip = '';
@@ -1014,21 +1014,21 @@ 
 
         if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
             $post = $gd_ses_listing;
-            $address = $post[$prefix . 'address'];
-            $zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';
-            $lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';
-            $lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';
-            $mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';
+            $address = $post[$prefix.'address'];
+            $zip = isset($post[$prefix.'zip']) ? $post[$prefix.'zip'] : '';
+            $lat = isset($post[$prefix.'latitude']) ? $post[$prefix.'latitude'] : '';
+            $lng = isset($post[$prefix.'longitude']) ? $post[$prefix.'longitude'] : '';
+            $mapview = isset($post[$prefix.'mapview']) ? $post[$prefix.'mapview'] : '';
+            $mapzoom = isset($post[$prefix.'mapzoom']) ? $post[$prefix.'mapzoom'] : '';
         } else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {
-            $post_info = (array)$post_info;
-
-            $address = $post_info[$prefix . 'address'];
-            $zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';
-            $lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';
-            $lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';
-            $mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';
+            $post_info = (array) $post_info;
+
+            $address = $post_info[$prefix.'address'];
+            $zip = isset($post_info[$prefix.'zip']) ? $post_info[$prefix.'zip'] : '';
+            $lat = isset($post_info[$prefix.'latitude']) ? $post_info[$prefix.'latitude'] : '';
+            $lng = isset($post_info[$prefix.'longitude']) ? $post_info[$prefix.'longitude'] : '';
+            $mapview = isset($post_info[$prefix.'mapview']) ? $post_info[$prefix.'mapview'] : '';
+            $mapzoom = isset($post_info[$prefix.'mapzoom']) ? $post_info[$prefix.'mapzoom'] : '';
         }
 
         $location = geodir_get_default_location();
@@ -1066,18 +1066,18 @@ 
         $locate_me = !empty($extra_fields['show_map']) && geodir_map_name() != 'none' ? true : false;
         $locate_me_class = $locate_me ? ' gd-form-control' : '';
         ?>
-        <div id="geodir_<?php echo $prefix . 'address';?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
-            <label><?php _e($address_title, 'geodirectory'); ?> <?php if ($is_required) echo '<span>*</span>';?></label>
+        <div id="geodir_<?php echo $prefix.'address'; ?>_row"
+             class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
+            <label><?php _e($address_title, 'geodirectory'); ?> <?php if ($is_required) echo '<span>*</span>'; ?></label>
             <?php if ($locate_me) { ?>
             <div class="gd-input-group gd-locate-me">
             <?php } ?>
-                <input type="text" field_type="<?php echo $type;?>" name="<?php echo $prefix . 'address';?>" id="<?php echo $prefix . 'address';?>" class="geodir_textfield<?php echo $locate_me_class;?>" value="<?php echo esc_attr(stripslashes($address)); ?>" />
+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'address'; ?>" id="<?php echo $prefix.'address'; ?>" class="geodir_textfield<?php echo $locate_me_class; ?>" value="<?php echo esc_attr(stripslashes($address)); ?>" />
                 <?php if ($locate_me) { ?>
                 <span onclick="gdGeoLocateMe(this, 'add-listing');" class="gd-locate-me-btn gd-input-group-addon" title="<?php esc_attr_e('My location', 'geodirlocation'); ?>"><i class="fa fa-crosshairs fa-fw" aria-hidden="true"></i></span>
             </div>
             <?php } ?>
-            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>
             <?php if ($is_required) { ?>
                 <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>
             <?php } ?>
@@ -1096,14 +1096,14 @@ 
 
         if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>
 
-            <div id="geodir_<?php echo $prefix . 'zip'; ?>_row"
+            <div id="geodir_<?php echo $prefix.'zip'; ?>_row"
                  class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix gd-fieldset-details">
                 <label>
                     <?php _e($zip_title, 'geodirectory'); ?>
                     <?php /*if($is_required) echo '<span>*</span>';*/ ?>
                 </label>
-                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'zip'; ?>"
-                       id="<?php echo $prefix . 'zip'; ?>" class="geodir_textfield autofill"
+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'zip'; ?>"
+                       id="<?php echo $prefix.'zip'; ?>" class="geodir_textfield autofill"
                        value="<?php echo esc_attr(stripslashes($zip)); ?>"/>
                 <?php /*if($is_required) {?>
 					<span class="geodir_message_error"><?php echo _e($required_msg,'geodirectory');?></span>
@@ -1113,14 +1113,14 @@ 
 
         <?php if (isset($extra_fields['show_map']) && $extra_fields['show_map']) { ?>
 
-            <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
+            <div id="geodir_<?php echo $prefix.'map'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
                 <?php
                 /**
                  * Contains add listing page map functions.
                  *
                  * @since 1.0.0
                  */
-                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");
+                include(geodir_plugin_path()."/geodirectory-functions/map-functions/map_on_add_listing_page.php");
                 if ($lat_lng_blank) {
                     $lat = '';
                     $lng = '';
@@ -1131,14 +1131,14 @@ 
             <?php
             /* show lat lng */
             $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>
-            <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"
+            <div id="geodir_<?php echo $prefix.'latitude'; ?>_row"
                  class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
                     <?php echo PLACE_ADDRESS_LAT; ?>
                     <?php if ($is_required) echo '<span>*</span>'; ?>
                 </label>
-                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'latitude'; ?>"
-                       id="<?php echo $prefix . 'latitude'; ?>" class="geodir_textfield"
+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'latitude'; ?>"
+                       id="<?php echo $prefix.'latitude'; ?>" class="geodir_textfield"
                        value="<?php echo esc_attr(stripslashes($lat)); ?>" size="25"/>
                 <span class="geodir_message_note"><?php echo GET_LATITUDE_MSG; ?></span>
                 <?php if ($is_required) { ?>
@@ -1146,14 +1146,14 @@ 
                 <?php } ?>
             </div>
 
-            <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"
+            <div id="geodir_<?php echo $prefix.'longitude'; ?>_row"
                  class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
                     <?php echo PLACE_ADDRESS_LNG; ?>
                     <?php if ($is_required) echo '<span>*</span>'; ?>
                 </label>
-                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'longitude'; ?>"
-                       id="<?php echo $prefix . 'longitude'; ?>" class="geodir_textfield"
+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'longitude'; ?>"
+                       id="<?php echo $prefix.'longitude'; ?>" class="geodir_textfield"
                        value="<?php echo esc_attr(stripslashes($lng)); ?>" size="25"/>
                 <span class="geodir_message_note"><?php echo GET_LOGNGITUDE_MSG; ?></span>
                 <?php if ($is_required) { ?>
@@ -1163,32 +1163,32 @@ 
         <?php } ?>
 
         <?php if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) { ?>
-            <div id="geodir_<?php echo $prefix . 'mapview'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
+            <div id="geodir_<?php echo $prefix.'mapview'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
                 <label><?php _e($mapview_title, 'geodirectory'); ?></label>
 
 
                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
-                                                            name="<?php echo $prefix . 'mapview'; ?>"
-                                                            id="<?php echo $prefix . 'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {
+                                                            name="<?php echo $prefix.'mapview'; ?>"
+                                                            id="<?php echo $prefix.'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {
                             echo 'checked="checked"';
                         } ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>
                     <span class="geodir_user_define"> <input field_type="<?php echo $type; ?>" type="radio"
                                                              class="gd-checkbox"
-                                                             name="<?php echo $prefix . 'mapview'; ?>"
+                                                             name="<?php echo $prefix.'mapview'; ?>"
                                                              id="map_view1" <?php if ($mapview == 'SATELLITE') {
                             echo 'checked="checked"';
                         } ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>
 
                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
-                                                            name="<?php echo $prefix . 'mapview'; ?>"
+                                                            name="<?php echo $prefix.'mapview'; ?>"
                                                             id="map_view2" <?php if ($mapview == 'HYBRID') {
                             echo 'checked="checked"';
                         } ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>
 					<span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
-                                                            name="<?php echo $prefix . 'mapview'; ?>"
+                                                            name="<?php echo $prefix.'mapview'; ?>"
                                                             id="map_view3" <?php if ($mapview == 'TERRAIN') {
                             echo 'checked="checked"';
                         } ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>
@@ -1200,7 +1200,7 @@ 
         <?php if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) { ?>
             <input type="hidden" value="<?php if (isset($mapzoom)) {
                 echo esc_attr($mapzoom);
-            } ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>
+            } ?>" name="<?php echo $prefix.'mapzoom'; ?>" id="<?php echo $prefix.'mapzoom'; ?>"/>
         <?php }
 
         $html = ob_get_clean();
@@ -1208,7 +1208,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_address','geodir_cfi_address',10,2);
+add_filter('geodir_custom_field_input_address', 'geodir_cfi_address', 10, 2);
 
 
 
@@ -1221,12 +1221,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_taxonomy($html,$cf){
+function geodir_cfi_taxonomy($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_taxonomy_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_taxonomy_{$html_var}")) {
         /**
          * Filter the taxonomy html by individual custom field.
          *
@@ -1234,11 +1234,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -1253,15 +1253,15 @@ 
         if ($value == $cf['default']) {
             $value = '';
         } ?>
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($site_title, 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($is_required) echo '<span>*</span>';?>
+                <?php if ($is_required) echo '<span>*</span>'; ?>
             </label>
 
-            <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">
+            <div id="<?php echo $name; ?>" class="geodir_taxonomy_field" style="float:left; width:70%;">
                 <?php
                 global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;
 
@@ -1273,7 +1273,7 @@ 
 
                     $package_info = array();
 
-                    $package_info = (array)geodir_post_package_info($package_info, $post, $post_type);
+                    $package_info = (array) geodir_post_package_info($package_info, $post, $post_type);
 
                     if (!empty($package_info)) {
 
@@ -1302,7 +1302,7 @@ 
 
                     $catadd_limit = $wpdb->get_var(
                         $wpdb->prepare(
-                            "SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",
+                            "SELECT cat_limit FROM ".GEODIR_PRICE_TABLE." WHERE pid = %d",
                             array($package_id)
                         )
                     );
@@ -1318,13 +1318,13 @@ 
                     $required_limit_msg = '';
                     if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {
 
-                        $required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');
+                        $required_limit_msg = __('Only select', 'geodirectory').' '.$catadd_limit.__(' categories for this package.', 'geodirectory');
 
                     } else {
                         $required_limit_msg = $required_msg;
                     }
 
-                    echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';
+                    echo '<input type="hidden" cat_limit="'.$catadd_limit.'" id="cat_limit" value="'.esc_attr($required_limit_msg).'" name="cat_limit['.$name.']"  />';
 
 
                     if ($cat_display == 'select' || $cat_display == 'multiselect') {
@@ -1334,11 +1334,11 @@ 
                         if ($cat_display == 'multiselect')
                             $multiple = 'multiple="multiple"';
 
-                        echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';
+                        echo '<select id="'.$name.'" '.$multiple.' type="'.$name.'" name="post_category['.$name.'][]" alt="'.$name.'" field_type="'.$cat_display.'" class="geodir_textfield textfield_x chosen_select" data-placeholder="'.__('Select Category', 'geodirectory').'">';
 
 
                         if ($cat_display == 'select')
-                            echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+                            echo '<option value="">'.__('Select Category', 'geodirectory').'</option>';
 
                     }
 
@@ -1356,7 +1356,7 @@ 
                 ?>
             </div>
 
-            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>
             <?php if ($is_required) { ?>
                 <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>
             <?php } ?>
@@ -1368,7 +1368,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_taxonomy','geodir_cfi_taxonomy',10,2);
+add_filter('geodir_custom_field_input_taxonomy', 'geodir_cfi_taxonomy', 10, 2);
 
 
 /**
@@ -1380,12 +1380,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_file($html,$cf){
+function geodir_cfi_file($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_file_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_file_{$html_var}")) {
         /**
          * Filter the file html by individual custom field.
          *
@@ -1393,11 +1393,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_file_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_file_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -1440,8 +1440,8 @@ 
                 $file_totImg = count($curImages);
         }
 
-        $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';
-        $display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';
+        $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? implode(",", $extra_fields['gd_file_types']) : '';
+        $display_file_types = $allowed_file_types != '' ? '.'.implode(", .", $extra_fields['gd_file_types']) : '';
 
         ?>
         <?php /*?> <h5 class="geodir-form_title"> <?php echo $site_title; ?>
@@ -1451,13 +1451,13 @@ 
 			</h5>   <?php */
         ?>
 
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
 
             <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">
                 <label
                     style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');
-                    echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>
+                    echo $site_title; ?><?php if ($is_required) echo '<span>*</span>'; ?></label>
                 <input class="geodir-custom-file-upload" field_type="file" type="hidden"
                        name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"
                        value="<?php echo esc_attr($file_value); ?>"/>
@@ -1465,7 +1465,7 @@ 
                        id="<?php echo $file_id; ?>image_limit" value="<?php echo $file_image_limit; ?>"/>
                 <?php if ($allowed_file_types != '') { ?>
                     <input type="hidden" name="<?php echo $file_id; ?>_allowed_types"
-                           id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types);?>"/>
+                           id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types); ?>"/>
                 <?php } ?>
                 <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"
                        value="<?php if (isset($file_totImg)) {
@@ -1481,10 +1481,10 @@ 
                         <?php /*?><h4><?php _e('Drop files to upload');?></h4><br/><?php */
                         ?>
                         <input id="<?php echo $file_id; ?>plupload-browse-button" type="button"
-                               value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory') ); ?>"
+                               value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory')); ?>"
                                class="geodir_button" style="margin-top:10px;"/>
                             <span class="ajaxnonceplu"
-                                  id="ajaxnonceplu<?php echo wp_create_nonce($file_id . 'pluploadan'); ?>"></span>
+                                  id="ajaxnonceplu<?php echo wp_create_nonce($file_id.'pluploadan'); ?>"></span>
                         <?php if ($file_width && $file_height): ?>
                             <span class="plupload-resize"></span>
                             <span class="plupload-width" id="plupload-width<?php echo $file_width; ?>"></span>
@@ -1504,7 +1504,7 @@ 
 
                 </div>
             </div>
-            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?> <?php echo ( $display_file_types != '' ? __('Allowed file types:', 'geodirectory') . ' ' . $display_file_types : '' );?></span>
+            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?> <?php echo ($display_file_types != '' ? __('Allowed file types:', 'geodirectory').' '.$display_file_types : ''); ?></span>
             <?php if ($is_required) { ?>
                 <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>
             <?php } ?>
@@ -1517,4 +1517,4 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_file','geodir_cfi_file',10,2);
\ No newline at end of file
+add_filter('geodir_custom_field_input_file', 'geodir_cfi_file', 10, 2);
\ No newline at end of file

Indentation +711 added lines, -711 removed lines

@@ -19,35 +19,35 @@ 
  */
 function geodir_cfi_fieldset($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_fieldset_{$html_var}")){
-        /**
-         * Filter the fieldset html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_fieldset_{$html_var}")){
+		/**
+		 * Filter the fieldset html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+		?>
         <h5 id="geodir_fieldset_<?php echo (int) $cf['id']; ?>" class="geodir-fieldset-row"
             gd-fieldset="<?php echo (int) $cf['id']; ?>"><?php echo __( $cf['site_title'], 'geodirectory' ); ?>
             <?php if ( $cf['desc'] != '' ) {
-                echo '<small>( ' . __( $cf['desc'], 'geodirectory' ) . ' )</small>';
-            } ?></h5>
+				echo '<small>( ' . __( $cf['desc'], 'geodirectory' ) . ' )</small>';
+			} ?></h5>
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_fieldset','geodir_cfi_fieldset',10,2);
 
@@ -64,47 +64,47 @@ 
  */
 function geodir_cfi_text($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_text_{$html_var}")){
-        /**
-         * Filter the text html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_text_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-
-        $value = geodir_get_cf_value($cf);
-        $type = $cf['type'];
-        //number and float validation $validation_pattern
-        if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';}
-        elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
-
-        //validation
-        if(isset($cf['validation_pattern']) && $cf['validation_pattern']){
-            $validation = 'pattern="'.$cf['validation_pattern'].'"';
-        }else{$validation='';}
-
-        // validation message
-        if(isset($cf['validation_msg']) && $cf['validation_msg']){
-            $validation_msg = 'title="'.$cf['validation_msg'].'"';
-        }else{$validation_msg='';}
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_text_{$html_var}")){
+		/**
+		 * Filter the text html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_text_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+
+		$value = geodir_get_cf_value($cf);
+		$type = $cf['type'];
+		//number and float validation $validation_pattern
+		if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';}
+		elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
+
+		//validation
+		if(isset($cf['validation_pattern']) && $cf['validation_pattern']){
+			$validation = 'pattern="'.$cf['validation_pattern'].'"';
+		}else{$validation='';}
+
+		// validation message
+		if(isset($cf['validation_msg']) && $cf['validation_msg']){
+			$validation_msg = 'title="'.$cf['validation_msg'].'"';
+		}else{$validation_msg='';}
+		?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $type;?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -116,10 +116,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_text','geodir_cfi_text',10,2);
 
@@ -135,35 +135,35 @@ 
  */
 function geodir_cfi_email($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_email_{$html_var}")){
-        /**
-         * Filter the email html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_email_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_email_{$html_var}")){
+		/**
+		 * Filter the email html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_email_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        if ($value == $cf['default']) {
-            $value = '';
-        }?>
+		if ($value == $cf['default']) {
+			$value = '';
+		}?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -175,10 +175,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_email','geodir_cfi_email',10,2);
 
@@ -195,35 +195,35 @@ 
  */
 function geodir_cfi_phone($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_phone_{$html_var}")){
-        /**
-         * Filter the phone html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_phone_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_phone_{$html_var}")){
+		/**
+		 * Filter the phone html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_phone_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        if ($value == $cf['default']) {
-            $value = '';
-        }?>
+		if ($value == $cf['default']) {
+			$value = '';
+		}?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -235,10 +235,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_phone','geodir_cfi_phone',10,2);
 
@@ -255,35 +255,35 @@ 
  */
 function geodir_cfi_url($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_url_{$html_var}")){
-        /**
-         * Filter the url html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_url_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_url_{$html_var}")){
+		/**
+		 * Filter the url html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_url_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        if ($value == $cf['default']) {
-            $value = '';
-        }?>
+		if ($value == $cf['default']) {
+			$value = '';
+		}?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -298,10 +298,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_url','geodir_cfi_url',10,2);
 
@@ -317,48 +317,48 @@ 
  */
 function geodir_cfi_radio($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_radio_{$html_var}")){
-        /**
-         * Filter the radio html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_radio_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_radio_{$html_var}")){
+		/**
+		 * Filter the radio html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_radio_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        ?>
+		?>
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <?php if ($cf['option_values']) {
-                $option_values = geodir_string_values_to_options($cf['option_values'], true);
+				$option_values = geodir_string_values_to_options($cf['option_values'], true);
 
-                if (!empty($option_values)) {
-                    foreach ($option_values as $option_value) {
-                        if (empty($option_value['optgroup'])) {
-                            ?>
+				if (!empty($option_values)) {
+					foreach ($option_values as $option_value) {
+						if (empty($option_value['optgroup'])) {
+							?>
                             <span class="gd-radios"><input name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" <?php checked(stripslashes($value), $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="radio" /><?php echo $option_value['label']; ?></span>
                             <?php
-                        }
-                    }
-                }
-            }
-            ?>
+						}
+					}
+				}
+			}
+			?>
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
@@ -366,10 +366,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_radio','geodir_cfi_radio',10,2);
 
@@ -385,46 +385,46 @@ 
  */
 function geodir_cfi_checkbox($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_checkbox_{$html_var}")){
-        /**
-         * Filter the checkbox html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_checkbox_{$html_var}")){
+		/**
+		 * Filter the checkbox html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
 
-        if ($value == '' && $cf['default']) {
-            $value = '1';
-        }
-        ?>
+		if ($value == '' && $cf['default']) {
+			$value = '1';
+		}
+		?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <?php if ($value != '1') {
-                $value = '0';
-            }?>
+				$value = '0';
+			}?>
             <input type="hidden" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" value="<?php echo esc_attr($value);?>"/>
             <input  <?php if ($value == '1') {
-                echo 'checked="checked"';
-            }?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="checkbox"
+				echo 'checked="checked"';
+			}?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="checkbox"
                  onchange="if(this.checked){jQuery('#<?php echo $cf['name'];?>').val('1');} else{ jQuery('#<?php echo $cf['name'];?>').val('0');}"/>
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
             <?php if ($cf['is_required']) { ?>
@@ -433,10 +433,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_checkbox','geodir_cfi_checkbox',10,2);
 
@@ -452,52 +452,52 @@ 
  */
 function geodir_cfi_textarea($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_textarea_{$html_var}")){
-        /**
-         * Filter the textarea html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_textarea_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_textarea_{$html_var}")){
+		/**
+		 * Filter the textarea html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_textarea_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $extra_fields = unserialize($cf['extra_fields']);
-        ?>
+		$extra_fields = unserialize($cf['extra_fields']);
+		?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label><?php
 
 
-            if (is_array($extra_fields) && in_array('1', $extra_fields)) {
+			if (is_array($extra_fields) && in_array('1', $extra_fields)) {
 
-                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>
+				$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>
 
             <div class="editor" field_id="<?php echo $cf['name'];?>" field_type="editor">
                 <?php wp_editor(stripslashes($value), $cf['name'], $editor_settings); ?>
                 </div><?php
 
-            } else {
+			} else {
 
-                ?><textarea field_type="<?php echo $cf['type'];?>" class="geodir_textarea" name="<?php echo $cf['name'];?>"
+				?><textarea field_type="<?php echo $cf['type'];?>" class="geodir_textarea" name="<?php echo $cf['name'];?>"
                             id="<?php echo $cf['name'];?>"><?php echo stripslashes($value);?></textarea><?php
 
-            }?>
+			}?>
 
 
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
@@ -507,10 +507,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_textarea','geodir_cfi_textarea',10,2);
 
@@ -526,53 +526,53 @@ 
  */
 function geodir_cfi_select($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_select_{$html_var}")){
-        /**
-         * Filter the select html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_select_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_select_{$html_var}")){
+		/**
+		 * Filter the select html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_select_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        ?>
+		?>
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <?php
-            $option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
-            $select_options = '';
-            if (!empty($option_values_arr)) {
-                foreach ($option_values_arr as $option_row) {
-                    if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
-                        $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-
-                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
-                    } else {
-                        $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-                        $option_value = isset($option_row['value']) ? $option_row['value'] : '';
-                        $selected = $option_value == stripslashes($value) ? 'selected="selected"' : '';
-
-                        $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
-                    }
-                }
-            }
-            ?>
+			$option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
+			$select_options = '';
+			if (!empty($option_values_arr)) {
+				foreach ($option_values_arr as $option_row) {
+					if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
+						$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+
+						$select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+					} else {
+						$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+						$option_value = isset($option_row['value']) ? $option_row['value'] : '';
+						$selected = $option_value == stripslashes($value) ? 'selected="selected"' : '';
+
+						$select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+					}
+				}
+			}
+			?>
             <select field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
                     class="geodir_textfield textfield_x chosen_select"
                     data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;';?>"
@@ -584,10 +584,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_select','geodir_cfi_select',10,2);
 
@@ -603,36 +603,36 @@ 
  */
 function geodir_cfi_multiselect($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_multiselect_{$html_var}")){
-        /**
-         * Filter the multiselect html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-
-        $multi_display = 'select';
-        if (!empty($cf['extra_fields'])) {
-            $multi_display = unserialize($cf['extra_fields']);
-        }
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_multiselect_{$html_var}")){
+		/**
+		 * Filter the multiselect html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+
+		$multi_display = 'select';
+		if (!empty($cf['extra_fields'])) {
+			$multi_display = unserialize($cf['extra_fields']);
+		}
+		?>
         <div id="<?php echo $cf['name']; ?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <input type="hidden" name="gd_field_<?php echo $cf['name']; ?>" value="1"/>
@@ -643,63 +643,63 @@ 
                         data-placeholder="<?php _e('Select', 'geodirectory'); ?>"
                         option-ajaxchosen="false">
                     <?php
-                    } else {
-                        echo '<ul class="gd_multi_choice">';
-                    }
-
-                    $option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
-                    $select_options = '';
-                    if (!empty($option_values_arr)) {
-                        foreach ($option_values_arr as $option_row) {
-                            if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
-                                $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-
-                                if ($multi_display == 'select') {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
-                                } else {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';
-                                }
-                            } else {
-                                if (!is_array($value) && $value != '') {
-                                    $value = trim($value);
-                                }
+					} else {
+						echo '<ul class="gd_multi_choice">';
+					}
+
+					$option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
+					$select_options = '';
+					if (!empty($option_values_arr)) {
+						foreach ($option_values_arr as $option_row) {
+							if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
+								$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+
+								if ($multi_display == 'select') {
+									$select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+								} else {
+									$select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';
+								}
+							} else {
+								if (!is_array($value) && $value != '') {
+									$value = trim($value);
+								}
                                 
-                                $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-                                $option_value = isset($option_row['value']) ? $option_row['value'] : '';
-                                $selected = $option_value == $value ? 'selected="selected"' : '';
-                                $selected = '';
-                                $checked = '';
-
-                                if ((!is_array($value) && trim($value) != '') || (is_array($value) && !empty($value))) {
-                                    if (!is_array($value)) {
-                                        $value_array = explode(',', $value);
-                                    } else {
-                                        $value_array = $value;
-                                    }
+								$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+								$option_value = isset($option_row['value']) ? $option_row['value'] : '';
+								$selected = $option_value == $value ? 'selected="selected"' : '';
+								$selected = '';
+								$checked = '';
+
+								if ((!is_array($value) && trim($value) != '') || (is_array($value) && !empty($value))) {
+									if (!is_array($value)) {
+										$value_array = explode(',', $value);
+									} else {
+										$value_array = $value;
+									}
                                     
-                                    $value_array = stripslashes_deep($value_array);
+									$value_array = stripslashes_deep($value_array);
 
-                                    if (is_array($value_array)) {
-                                        $value_array = array_map('trim', $value_array);
+									if (is_array($value_array)) {
+										$value_array = array_map('trim', $value_array);
                                         
-                                        if (in_array($option_value, $value_array)) {
-                                            $selected = 'selected="selected"';
-                                            $checked = 'checked="checked"';
-                                        }
-                                    }
-                                }
-
-                                if ($multi_display == 'select') {
-                                    $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
-                                } else {
-                                    $select_options .= '<li><input name="' . $cf['name'] . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';
-                                }
-                            }
-                        }
-                    }
-                    echo $select_options;
-
-                    if ($multi_display == 'select') { ?></select></div>
+										if (in_array($option_value, $value_array)) {
+											$selected = 'selected="selected"';
+											$checked = 'checked="checked"';
+										}
+									}
+								}
+
+								if ($multi_display == 'select') {
+									$select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+								} else {
+									$select_options .= '<li><input name="' . $cf['name'] . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';
+								}
+							}
+						}
+					}
+					echo $select_options;
+
+					if ($multi_display == 'select') { ?></select></div>
         <?php } else { ?></ul><?php } ?>
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
@@ -707,10 +707,10 @@ 
             <?php } ?>
         </div>
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_multiselect','geodir_cfi_multiselect',10,2);
 
@@ -726,32 +726,32 @@ 
  */
 function geodir_cfi_html($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_html_{$html_var}")){
-        /**
-         * Filter the html html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_html_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_html_{$html_var}")){
+		/**
+		 * Filter the html html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_html_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-        ?>
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+		?>
 
         <div id="<?php echo $cf['name']; ?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
 
@@ -769,10 +769,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_html','geodir_cfi_html',10,2);
 
@@ -789,68 +789,68 @@ 
  */
 function geodir_cfi_datepicker($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_datepicker_{$html_var}")){
-        /**
-         * Filter the datepicker html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_datepicker_{$html_var}")){
+		/**
+		 * Filter the datepicker html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $extra_fields = unserialize($cf['extra_fields']);
-        $name = $cf['name'];
+		$extra_fields = unserialize($cf['extra_fields']);
+		$name = $cf['name'];
 
-        if ($extra_fields['date_format'] == '')
-            $extra_fields['date_format'] = 'yy-mm-dd';
+		if ($extra_fields['date_format'] == '')
+			$extra_fields['date_format'] = 'yy-mm-dd';
 
-        $date_format = $extra_fields['date_format'];
-        $jquery_date_format  = $date_format;
+		$date_format = $extra_fields['date_format'];
+		$jquery_date_format  = $date_format;
 
 
-        // check if we need to change the format or not
-        $date_format_len = strlen(str_replace(' ', '', $date_format));
-        if($date_format_len>5){// if greater then 5 then it's the old style format.
+		// check if we need to change the format or not
+		$date_format_len = strlen(str_replace(' ', '', $date_format));
+		if($date_format_len>5){// if greater then 5 then it's the old style format.
 
-            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-            $replace = array('d','j','l','m','n','F','Y');//PHP date format
+			$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
+			$replace = array('d','j','l','m','n','F','Y');//PHP date format
 
-            $date_format = str_replace($search, $replace, $date_format);
-        }else{
-            $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );
-        }
+			$date_format = str_replace($search, $replace, $date_format);
+		}else{
+			$jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );
+		}
 
-        if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty
-        if($value && !isset($_REQUEST['backandedit'])) {
-            //$time = strtotime($value);
-            //$value = date_i18n($date_format, $time);
-        }
-        $value = geodir_date($value, 'Y-m-d', $date_format);
+		if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty
+		if($value && !isset($_REQUEST['backandedit'])) {
+			//$time = strtotime($value);
+			//$value = date_i18n($date_format, $time);
+		}
+		$value = geodir_date($value, 'Y-m-d', $date_format);
 
-        ?>
+		?>
         <script type="text/javascript">
 
             jQuery(function () {
 
                 jQuery("#<?php echo $cf['name'];?>").datepicker({changeMonth: true, changeYear: true <?php
-                    /**
-                     * Used to add extra option to datepicker per custom field.
-                     *
-                     * @since 1.5.7
-                     * @param string $name The custom field name.
-                     */
-                    echo apply_filters("gd_datepicker_extra_{$name}",'');?>});
+					/**
+					 * Used to add extra option to datepicker per custom field.
+					 *
+					 * @since 1.5.7
+					 * @param string $name The custom field name.
+					 */
+					echo apply_filters("gd_datepicker_extra_{$name}",'');?>});
 
                 jQuery("#<?php echo $name;?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format;?>');
 
@@ -866,7 +866,7 @@ 
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
 
@@ -880,10 +880,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_datepicker','geodir_cfi_datepicker',10,2);
 
@@ -899,31 +899,31 @@ 
  */
 function geodir_cfi_time($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_time_{$html_var}")){
-        /**
-         * Filter the time html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_time_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_time_{$html_var}")){
+		/**
+		 * Filter the time html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_time_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $name = $cf['name'];
+		$name = $cf['name'];
 
-        if ($value != '')
-            $value = date('H:i', strtotime($value));
-        ?>
+		if ($value != '')
+			$value = date('H:i', strtotime($value));
+		?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
 
@@ -939,7 +939,7 @@ 
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input readonly="readonly" field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>"
@@ -951,10 +951,10 @@ 
             <?php } ?>
         </div>
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_time','geodir_cfi_time',10,2);
 
@@ -970,102 +970,102 @@ 
  */
 function geodir_cfi_address($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_address_{$html_var}")){
-        /**
-         * Filter the address html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_address_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        global $gd_session;
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-        $name = $cf['name'];
-        $type = $cf['type'];
-        $admin_desc = $cf['desc'];
-        $is_required = $cf['is_required'];
-        $required_msg = $cf['required_msg'];
-        $site_title = $cf['site_title'];
-        $is_admin = $cf['is_admin'];
-        $extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
-        $prefix = $name . '_';
-
-        ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');
-        ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');
-        ($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');
-        ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');
-
-        $address = '';
-        $zip = '';
-        $mapview = '';
-        $mapzoom = '';
-        $lat = '';
-        $lng = '';
-
-        if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
-            $post = $gd_ses_listing;
-            $address = $post[$prefix . 'address'];
-            $zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';
-            $lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';
-            $lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';
-            $mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';
-        } else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {
-            $post_info = (array)$post_info;
-
-            $address = $post_info[$prefix . 'address'];
-            $zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';
-            $lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';
-            $lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';
-            $mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';
-        }
-
-        $location = geodir_get_default_location();
-        if (empty($city)) $city = isset($location->city) ? $location->city : '';
-        if (empty($region)) $region = isset($location->region) ? $location->region : '';
-        if (empty($country)) $country = isset($location->country) ? $location->country : '';
-
-        $lat_lng_blank = false;
-        if (empty($lat) && empty($lng)) {
-            $lat_lng_blank = true;
-        }
-
-        if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';
-        if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';
-
-        /**
-         * Filter the default latitude.
-         *
-         * @since 1.0.0
-         *
-         * @param float $lat Default latitude.
-         * @param bool $is_admin For admin use only?.
-         */
-        $lat = apply_filters('geodir_default_latitude', $lat, $is_admin);
-        /**
-         * Filter the default longitude.
-         *
-         * @since 1.0.0
-         *
-         * @param float $lat Default longitude.
-         * @param bool $is_admin For admin use only?.
-         */
-        $lng = apply_filters('geodir_default_longitude', $lng, $is_admin);
-
-        $locate_me = !empty($extra_fields['show_map']) && geodir_map_name() != 'none' ? true : false;
-        $locate_me_class = $locate_me ? ' gd-form-control' : '';
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_address_{$html_var}")){
+		/**
+		 * Filter the address html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_address_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		global $gd_session;
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+		$name = $cf['name'];
+		$type = $cf['type'];
+		$admin_desc = $cf['desc'];
+		$is_required = $cf['is_required'];
+		$required_msg = $cf['required_msg'];
+		$site_title = $cf['site_title'];
+		$is_admin = $cf['is_admin'];
+		$extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
+		$prefix = $name . '_';
+
+		($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');
+		($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');
+		($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');
+		($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');
+
+		$address = '';
+		$zip = '';
+		$mapview = '';
+		$mapzoom = '';
+		$lat = '';
+		$lng = '';
+
+		if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
+			$post = $gd_ses_listing;
+			$address = $post[$prefix . 'address'];
+			$zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';
+			$lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';
+			$lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';
+			$mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';
+			$mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';
+		} else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {
+			$post_info = (array)$post_info;
+
+			$address = $post_info[$prefix . 'address'];
+			$zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';
+			$lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';
+			$lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';
+			$mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';
+			$mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';
+		}
+
+		$location = geodir_get_default_location();
+		if (empty($city)) $city = isset($location->city) ? $location->city : '';
+		if (empty($region)) $region = isset($location->region) ? $location->region : '';
+		if (empty($country)) $country = isset($location->country) ? $location->country : '';
+
+		$lat_lng_blank = false;
+		if (empty($lat) && empty($lng)) {
+			$lat_lng_blank = true;
+		}
+
+		if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';
+		if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';
+
+		/**
+		 * Filter the default latitude.
+		 *
+		 * @since 1.0.0
+		 *
+		 * @param float $lat Default latitude.
+		 * @param bool $is_admin For admin use only?.
+		 */
+		$lat = apply_filters('geodir_default_latitude', $lat, $is_admin);
+		/**
+		 * Filter the default longitude.
+		 *
+		 * @since 1.0.0
+		 *
+		 * @param float $lat Default longitude.
+		 * @param bool $is_admin For admin use only?.
+		 */
+		$lng = apply_filters('geodir_default_longitude', $lng, $is_admin);
+
+		$locate_me = !empty($extra_fields['show_map']) && geodir_map_name() != 'none' ? true : false;
+		$locate_me_class = $locate_me ? ' gd-form-control' : '';
+		?>
         <div id="geodir_<?php echo $prefix . 'address';?>_row"
              class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label><?php _e($address_title, 'geodirectory'); ?> <?php if ($is_required) echo '<span>*</span>';?></label>
@@ -1084,17 +1084,17 @@ 
         </div>
         
         <?php
-        /**
-         * Called after the address input on the add listings.
-         *
-         * This is used by the location manage to add further locations info etc.
-         *
-         * @since 1.0.0
-         * @param array $cf The array of setting for the custom field. {@see geodir_custom_field_save()}.
-         */
-        do_action('geodir_address_extra_listing_fields', $cf);
-
-        if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>
+		/**
+		 * Called after the address input on the add listings.
+		 *
+		 * This is used by the location manage to add further locations info etc.
+		 *
+		 * @since 1.0.0
+		 * @param array $cf The array of setting for the custom field. {@see geodir_custom_field_save()}.
+		 */
+		do_action('geodir_address_extra_listing_fields', $cf);
+
+		if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>
 
             <div id="geodir_<?php echo $prefix . 'zip'; ?>_row"
                  class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix gd-fieldset-details">
@@ -1115,22 +1115,22 @@ 
 
             <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
                 <?php
-                /**
-                 * Contains add listing page map functions.
-                 *
-                 * @since 1.0.0
-                 */
-                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");
-                if ($lat_lng_blank) {
-                    $lat = '';
-                    $lng = '';
-                }
-                ?>
+				/**
+				 * Contains add listing page map functions.
+				 *
+				 * @since 1.0.0
+				 */
+				include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");
+				if ($lat_lng_blank) {
+					$lat = '';
+					$lng = '';
+				}
+				?>
                 <span class="geodir_message_note"><?php echo stripslashes(GET_MAP_MSG); ?></span>
             </div>
             <?php
-            /* show lat lng */
-            $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>
+			/* show lat lng */
+			$style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>
             <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"
                  class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
@@ -1171,27 +1171,27 @@ 
                                                             class="gd-checkbox"
                                                             name="<?php echo $prefix . 'mapview'; ?>"
                                                             id="<?php echo $prefix . 'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {
-                            echo 'checked="checked"';
-                        } ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>
                     <span class="geodir_user_define"> <input field_type="<?php echo $type; ?>" type="radio"
                                                              class="gd-checkbox"
                                                              name="<?php echo $prefix . 'mapview'; ?>"
                                                              id="map_view1" <?php if ($mapview == 'SATELLITE') {
-                            echo 'checked="checked"';
-                        } ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>
 
                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
                                                             name="<?php echo $prefix . 'mapview'; ?>"
                                                             id="map_view2" <?php if ($mapview == 'HYBRID') {
-                            echo 'checked="checked"';
-                        } ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>
 					<span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
                                                             name="<?php echo $prefix . 'mapview'; ?>"
                                                             id="map_view3" <?php if ($mapview == 'TERRAIN') {
-                            echo 'checked="checked"';
-                        } ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>
 
 
             </div>
@@ -1199,14 +1199,14 @@ 
 
         <?php if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) { ?>
             <input type="hidden" value="<?php if (isset($mapzoom)) {
-                echo esc_attr($mapzoom);
-            } ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>
+				echo esc_attr($mapzoom);
+			} ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>
         <?php }
 
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_address','geodir_cfi_address',10,2);
 
@@ -1223,135 +1223,135 @@ 
  */
 function geodir_cfi_taxonomy($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_taxonomy_{$html_var}")){
-        /**
-         * Filter the taxonomy html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-
-        $name = $cf['name'];
-        $site_title = $cf['site_title'];
-        $admin_desc = $cf['desc'];
-        $is_required = $cf['is_required'];
-        $is_admin = $cf['is_admin'];
-        $required_msg = $cf['required_msg'];
-
-        if ($value == $cf['default']) {
-            $value = '';
-        } ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_taxonomy_{$html_var}")){
+		/**
+		 * Filter the taxonomy html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+
+		$name = $cf['name'];
+		$site_title = $cf['site_title'];
+		$admin_desc = $cf['desc'];
+		$is_required = $cf['is_required'];
+		$is_admin = $cf['is_admin'];
+		$required_msg = $cf['required_msg'];
+
+		if ($value == $cf['default']) {
+			$value = '';
+		} ?>
         <div id="<?php echo $name;?>_row"
              class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($site_title, 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($is_required) echo '<span>*</span>';?>
             </label>
 
             <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">
                 <?php
-                global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;
+				global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;
 
-                $exclude_cats = array();
+				$exclude_cats = array();
 
-                if ($is_admin == '1') {
+				if ($is_admin == '1') {
 
-                    $post_type = get_post_type();
+					$post_type = get_post_type();
 
-                    $package_info = array();
+					$package_info = array();
 
-                    $package_info = (array)geodir_post_package_info($package_info, $post, $post_type);
+					$package_info = (array)geodir_post_package_info($package_info, $post, $post_type);
 
-                    if (!empty($package_info)) {
+					if (!empty($package_info)) {
 
-                        if (isset($package_info['cat']) && $package_info['cat'] != '') {
+						if (isset($package_info['cat']) && $package_info['cat'] != '') {
 
-                            $exclude_cats = explode(',', $package_info['cat']);
+							$exclude_cats = explode(',', $package_info['cat']);
 
-                        }
-                    }
-                }
+						}
+					}
+				}
 
-                $cat_display = unserialize($cf['extra_fields']);
+				$cat_display = unserialize($cf['extra_fields']);
 
-                if (isset($_REQUEST['backandedit']) && !empty($post_cat[$name]) && is_array($post_cat[$name])) {
-                    $post_cat = implode(",", $post_cat[$name]);
-                } else {
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
-                        $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
-                }
+				if (isset($_REQUEST['backandedit']) && !empty($post_cat[$name]) && is_array($post_cat[$name])) {
+					$post_cat = implode(",", $post_cat[$name]);
+				} else {
+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
+						$post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
+				}
 
 
-                global $geodir_addon_list;
-                if (!empty($geodir_addon_list) && array_key_exists('geodir_payment_manager', $geodir_addon_list) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {
+				global $geodir_addon_list;
+				if (!empty($geodir_addon_list) && array_key_exists('geodir_payment_manager', $geodir_addon_list) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {
 
-                    $catadd_limit = $wpdb->get_var(
-                        $wpdb->prepare(
-                            "SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",
-                            array($package_id)
-                        )
-                    );
+					$catadd_limit = $wpdb->get_var(
+						$wpdb->prepare(
+							"SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",
+							array($package_id)
+						)
+					);
 
 
-                } else {
-                    $catadd_limit = 0;
-                }
+				} else {
+					$catadd_limit = 0;
+				}
 
 
-                if ($cat_display != '' && $cat_display != 'ajax_chained') {
+				if ($cat_display != '' && $cat_display != 'ajax_chained') {
 
-                    $required_limit_msg = '';
-                    if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {
+					$required_limit_msg = '';
+					if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {
 
-                        $required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');
+						$required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');
 
-                    } else {
-                        $required_limit_msg = $required_msg;
-                    }
+					} else {
+						$required_limit_msg = $required_msg;
+					}
 
-                    echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';
+					echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';
 
 
-                    if ($cat_display == 'select' || $cat_display == 'multiselect') {
+					if ($cat_display == 'select' || $cat_display == 'multiselect') {
 
-                        $cat_display == '';
-                        $multiple = '';
-                        if ($cat_display == 'multiselect')
-                            $multiple = 'multiple="multiple"';
+						$cat_display == '';
+						$multiple = '';
+						if ($cat_display == 'multiselect')
+							$multiple = 'multiple="multiple"';
 
-                        echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';
+						echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';
 
 
-                        if ($cat_display == 'select')
-                            echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+						if ($cat_display == 'select')
+							echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
 
-                    }
+					}
 
-                    echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);
+					echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);
 
-                    if ($cat_display == 'select' || $cat_display == 'multiselect')
-                        echo '</select>';
+					if ($cat_display == 'select' || $cat_display == 'multiselect')
+						echo '</select>';
 
-                } else {
+				} else {
 
-                    echo geodir_custom_taxonomy_walker2($name, $catadd_limit);
+					echo geodir_custom_taxonomy_walker2($name, $catadd_limit);
 
-                }
+				}
 
-                ?>
+				?>
             </div>
 
             <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>
@@ -1361,10 +1361,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_taxonomy','geodir_cfi_taxonomy',10,2);
 
@@ -1380,74 +1380,74 @@ 
  */
 function geodir_cfi_file($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_file_{$html_var}")){
-        /**
-         * Filter the file html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_file_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_file_{$html_var}")){
+		/**
+		 * Filter the file html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_file_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $name = $cf['name'];
-        $site_title = $cf['site_title'];
-        $admin_desc = $cf['desc'];
-        $is_required = $cf['is_required'];
-        $required_msg = $cf['required_msg'];
-        $extra_fields = unserialize($cf['extra_fields']);
+		$name = $cf['name'];
+		$site_title = $cf['site_title'];
+		$admin_desc = $cf['desc'];
+		$is_required = $cf['is_required'];
+		$required_msg = $cf['required_msg'];
+		$extra_fields = unserialize($cf['extra_fields']);
 
 
-        // adjust values here
-        $file_id = $name; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls
+		// adjust values here
+		$file_id = $name; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls
 
-        if ($value != '') {
+		if ($value != '') {
 
-            $file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.
+			$file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.
 
-        } else
-            $file_value = '';
+		} else
+			$file_value = '';
 
-        if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])
-            $file_multiple = true; // allow multiple files upload
-        else
-            $file_multiple = false;
+		if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])
+			$file_multiple = true; // allow multiple files upload
+		else
+			$file_multiple = false;
 
-        if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])
-            $file_image_limit = $extra_fields['image_limit'];
-        else
-            $file_image_limit = 1;
+		if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])
+			$file_image_limit = $extra_fields['image_limit'];
+		else
+			$file_image_limit = 1;
 
-        $file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)
+		$file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)
 
-        $file_height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)
+		$file_height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)
 
-        if (!empty($file_value)) {
-            $curImages = explode(',', $file_value);
-            if (!empty($curImages))
-                $file_totImg = count($curImages);
-        }
+		if (!empty($file_value)) {
+			$curImages = explode(',', $file_value);
+			if (!empty($curImages))
+				$file_totImg = count($curImages);
+		}
 
-        $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';
-        $display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';
+		$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';
+		$display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';
 
-        ?>
+		?>
         <?php /*?> <h5 class="geodir-form_title"> <?php echo $site_title; ?>
 				 <?php if($file_image_limit!=0 && $file_image_limit==1 ){echo '<br /><small>('.__('You can upload').' '.$file_image_limit.' '.__('image with this package').')</small>';} ?>
 				 <?php if($file_image_limit!=0 && $file_image_limit>1 ){echo '<br /><small>('.__('You can upload').' '.$file_image_limit.' '.__('images with this package').')</small>';} ?>
 				 <?php if($file_image_limit==0){echo '<br /><small>('.__('You can upload unlimited images with this package').')</small>';} ?>
 			</h5>   <?php */
-        ?>
+		?>
 
         <div id="<?php echo $name;?>_row"
              class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
@@ -1455,7 +1455,7 @@ 
             <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">
                 <label
                     style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');
-                    echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>
+					echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>
                 <input class="geodir-custom-file-upload" field_type="file" type="hidden"
                        name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"
                        value="<?php echo esc_attr($file_value); ?>"/>
@@ -1467,17 +1467,17 @@ 
                 <?php } ?>
                 <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"
                        value="<?php if (isset($file_totImg)) {
-                           echo esc_attr($file_totImg);
-                       } else {
-                           echo '0';
-                       } ?>"/>
+						   echo esc_attr($file_totImg);
+					   } else {
+						   echo '0';
+					   } ?>"/>
 
                 <div style="float:left; width:55%;">
                     <div
                         class="plupload-upload-uic hide-if-no-js <?php if ($file_multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"
                         id="<?php echo $file_id; ?>plupload-upload-ui" style="float:left; width:30%;">
                         <?php /*?><h4><?php _e('Drop files to upload');?></h4><br/><?php */
-                        ?>
+						?>
                         <input id="<?php echo $file_id; ?>plupload-browse-button" type="button"
                                value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory') ); ?>"
                                class="geodir_button" style="margin-top:10px;"/>
@@ -1496,7 +1496,7 @@ 
                         style=" clear:inherit; margin-top:0; margin-left:15px; padding-top:10px; float:left; width:50%;">
                     </div>
                     <?php /*?><span id="upload-msg" ><?php _e('Please drag &amp; drop the images to rearrange the order');?></span><?php */
-                    ?>
+					?>
 
                     <span id="<?php echo $file_id; ?>upload-error" style="display:none"></span>
 
@@ -1510,9 +1510,9 @@ 
 
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_file','geodir_cfi_file',10,2);
\ No newline at end of file

Braces +191 added lines, -68 removed lines

@@ -86,26 +86,31 @@ 
         $value = geodir_get_cf_value($cf);
         $type = $cf['type'];
         //number and float validation $validation_pattern
-        if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';}
-        elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
+        if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';} elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
 
         //validation
         if(isset($cf['validation_pattern']) && $cf['validation_pattern']){
             $validation = 'pattern="'.$cf['validation_pattern'].'"';
-        }else{$validation='';}
+        } else{$validation='';}
 
         // validation message
         if(isset($cf['validation_msg']) && $cf['validation_msg']){
             $validation_msg = 'title="'.$cf['validation_msg'].'"';
-        }else{$validation_msg='';}
+        } else{$validation_msg='';}
         ?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input field_type="<?php echo $type;?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
                    value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />
@@ -160,11 +165,17 @@ 
         }?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
                    value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>
@@ -220,11 +231,17 @@ 
         }?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
                    value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>
@@ -280,11 +297,17 @@ 
         }?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
                    value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"
@@ -339,11 +362,17 @@ 
 
         ?>
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <?php if ($cf['option_values']) {
                 $option_values = geodir_string_values_to_options($cf['option_values'], true);
@@ -412,11 +441,17 @@ 
         ?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <?php if ($value != '1') {
                 $value = '0';
@@ -476,11 +511,17 @@ 
         ?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label><?php
 
 
@@ -548,11 +589,17 @@ 
 
         ?>
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <?php
             $option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
@@ -629,11 +676,17 @@ 
         }
         ?>
         <div id="<?php echo $cf['name']; ?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input type="hidden" name="gd_field_<?php echo $cf['name']; ?>" value="1"/>
             <?php if ($multi_display == 'select') { ?>
@@ -748,11 +801,17 @@ 
         ?>
 
         <div id="<?php echo $cf['name']; ?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
 
             <?php $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>
@@ -812,8 +871,9 @@ 
         $extra_fields = unserialize($cf['extra_fields']);
         $name = $cf['name'];
 
-        if ($extra_fields['date_format'] == '')
-            $extra_fields['date_format'] = 'yy-mm-dd';
+        if ($extra_fields['date_format'] == '') {
+                    $extra_fields['date_format'] = 'yy-mm-dd';
+        }
 
         $date_format = $extra_fields['date_format'];
         $jquery_date_format  = $date_format;
@@ -827,7 +887,7 @@ 
             $replace = array('d','j','l','m','n','F','Y');//PHP date format
 
             $date_format = str_replace($search, $replace, $date_format);
-        }else{
+        } else{
             $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );
         }
 
@@ -862,12 +922,18 @@ 
 
         </script>
         <div id="<?php echo $name;?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
 
             <input field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>" id="<?php echo $name;?>"
@@ -921,8 +987,9 @@ 
 
         $name = $cf['name'];
 
-        if ($value != '')
-            $value = date('H:i', strtotime($value));
+        if ($value != '') {
+                    $value = date('H:i', strtotime($value));
+        }
         ?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
@@ -935,12 +1002,18 @@ 
             });
         </script>
         <div id="<?php echo $name;?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input readonly="readonly" field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>"
                    id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>
@@ -1032,17 +1105,27 @@ 
         }
 
         $location = geodir_get_default_location();
-        if (empty($city)) $city = isset($location->city) ? $location->city : '';
-        if (empty($region)) $region = isset($location->region) ? $location->region : '';
-        if (empty($country)) $country = isset($location->country) ? $location->country : '';
+        if (empty($city)) {
+        	$city = isset($location->city) ? $location->city : '';
+        }
+        if (empty($region)) {
+        	$region = isset($location->region) ? $location->region : '';
+        }
+        if (empty($country)) {
+        	$country = isset($location->country) ? $location->country : '';
+        }
 
         $lat_lng_blank = false;
         if (empty($lat) && empty($lng)) {
             $lat_lng_blank = true;
         }
 
-        if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';
-        if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';
+        if (empty($lat)) {
+        	$lat = isset($location->city_latitude) ? $location->city_latitude : '';
+        }
+        if (empty($lng)) {
+        	$lng = isset($location->city_longitude) ? $location->city_longitude : '';
+        }
 
         /**
          * Filter the default latitude.
@@ -1067,8 +1150,14 @@ 
         $locate_me_class = $locate_me ? ' gd-form-control' : '';
         ?>
         <div id="geodir_<?php echo $prefix . 'address';?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
-            <label><?php _e($address_title, 'geodirectory'); ?> <?php if ($is_required) echo '<span>*</span>';?></label>
+             class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
+            <label><?php _e($address_title, 'geodirectory'); ?> <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?></label>
             <?php if ($locate_me) { ?>
             <div class="gd-input-group gd-locate-me">
             <?php } ?>
@@ -1132,10 +1221,16 @@ 
             /* show lat lng */
             $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>
             <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"
-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
                     <?php echo PLACE_ADDRESS_LAT; ?>
-                    <?php if ($is_required) echo '<span>*</span>'; ?>
+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>
                 </label>
                 <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'latitude'; ?>"
                        id="<?php echo $prefix . 'latitude'; ?>" class="geodir_textfield"
@@ -1147,10 +1242,16 @@ 
             </div>
 
             <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"
-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
                     <?php echo PLACE_ADDRESS_LNG; ?>
-                    <?php if ($is_required) echo '<span>*</span>'; ?>
+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>
                 </label>
                 <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'longitude'; ?>"
                        id="<?php echo $prefix . 'longitude'; ?>" class="geodir_textfield"
@@ -1254,11 +1355,17 @@ 
             $value = '';
         } ?>
         <div id="<?php echo $name;?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($site_title, 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($is_required) echo '<span>*</span>';?>
+                <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>
             </label>
 
             <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">
@@ -1290,8 +1397,9 @@ 
                 if (isset($_REQUEST['backandedit']) && !empty($post_cat[$name]) && is_array($post_cat[$name])) {
                     $post_cat = implode(",", $post_cat[$name]);
                 } else {
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
-                        $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
+                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                                            $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
+                    }
                 }
 
 
@@ -1329,21 +1437,24 @@ 
 
                         $cat_display == '';
                         $multiple = '';
-                        if ($cat_display == 'multiselect')
-                            $multiple = 'multiple="multiple"';
+                        if ($cat_display == 'multiselect') {
+                                                    $multiple = 'multiple="multiple"';
+                        }
 
                         echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';
 
 
-                        if ($cat_display == 'select')
-                            echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+                        if ($cat_display == 'select') {
+                                                    echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+                        }
 
                     }
 
                     echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);
 
-                    if ($cat_display == 'select' || $cat_display == 'multiselect')
-                        echo '</select>';
+                    if ($cat_display == 'select' || $cat_display == 'multiselect') {
+                                            echo '</select>';
+                    }
 
                 } else {
 
@@ -1415,18 +1526,23 @@ 
 
             $file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.
 
-        } else
-            $file_value = '';
+        } else {
+                    $file_value = '';
+        }
 
-        if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])
-            $file_multiple = true; // allow multiple files upload
-        else
-            $file_multiple = false;
+        if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple']) {
+                    $file_multiple = true;
+        }
+        // allow multiple files upload
+        else {
+                    $file_multiple = false;
+        }
 
-        if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])
-            $file_image_limit = $extra_fields['image_limit'];
-        else
-            $file_image_limit = 1;
+        if (isset($extra_fields['image_limit']) && $extra_fields['image_limit']) {
+                    $file_image_limit = $extra_fields['image_limit'];
+        } else {
+                    $file_image_limit = 1;
+        }
 
         $file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)
 
@@ -1434,8 +1550,9 @@ 
 
         if (!empty($file_value)) {
             $curImages = explode(',', $file_value);
-            if (!empty($curImages))
-                $file_totImg = count($curImages);
+            if (!empty($curImages)) {
+                            $file_totImg = count($curImages);
+            }
         }
 
         $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';
@@ -1450,12 +1567,18 @@ 
         ?>
 
         <div id="<?php echo $name;?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
 
             <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">
                 <label
                     style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');
-                    echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>
+                    echo $site_title; ?><?php if ($is_required) {
+                    	echo '<span>*</span>';
+                    }
+                    ?></label>
                 <input class="geodir-custom-file-upload" field_type="file" type="hidden"
                        name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"
                        value="<?php echo esc_attr($file_value); ?>"/>

geodirectory-functions/cat-meta-functions/Tax-meta-class.php

Braces +106 added lines, -69 removed lines

@@ -102,8 +102,9 @@ 
         {
 
             // If we are not in admin area exit.
-            if (!is_admin())
-                return;
+            if (!is_admin()) {
+                            return;
+            }
 
             // Assign meta box values to local variables and add it's missed values.
             $this->_meta_box = $meta_box;
@@ -111,15 +112,15 @@ 
             $this->_fields = &$this->_meta_box['fields'];
             $this->_Local_images = (isset($meta_box['local_images'])) ? true : false;
             $this->add_missed_values();
-            if (isset($meta_box['use_with_theme']))
-                if ($meta_box['use_with_theme'] === true) {
+            if (isset($meta_box['use_with_theme'])) {
+                            if ($meta_box['use_with_theme'] === true) {
                     $this->SelfPath = get_stylesheet_directory_uri() . '/library/cat-meta';
+            }
                 } elseif ($meta_box['use_with_theme'] === false) {
                     $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
                 } else {
                     $this->SelfPath = $meta_box['use_with_theme'];
-                }
-            else {
+                } else {
                 $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
             }
 
@@ -190,8 +191,9 @@ 
         {
 
             // Check if the field is an image or file. If not, return.
-            if (!$this->has_field('image') && !$this->has_field('file'))
-                return;
+            if (!$this->has_field('image') && !$this->has_field('file')) {
+                            return;
+            }
 
 
             add_action('wp_enqueue_scripts', array(&$this, 'enqueue_tax_meta_scripts'), 100);
@@ -235,8 +237,9 @@ 
         {
 
             // If post variables are empty, return.
-            if (!isset($_POST['at-insert']) || empty($_POST['attachments']))
-                return;
+            if (!isset($_POST['at-insert']) || empty($_POST['attachments'])) {
+                            return;
+            }
 
             // Security Check
             check_admin_referer('media-form');
@@ -256,8 +259,9 @@ 
                 $attachment = stripslashes_deep($attachment);
 
                 // If not selected or url is empty, continue in loop.
-                if (empty($attachment['selected']) || empty($attachment['url']))
-                    continue;
+                if (empty($attachment['selected']) || empty($attachment['url'])) {
+                                    continue;
+                }
 
                 $li = "<li id='item_{$attachment_id}'>";
                 $li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />";
@@ -308,13 +312,15 @@ 
 
 
             // If data is not set, die.
-            if (!isset($_POST['data']))
-                die();
+            if (!isset($_POST['data'])) {
+                            die();
+            }
 
             list($nonce, $term_id, $key, $attach_id) = explode('|', $_POST['data']);
 
-            if (!wp_verify_nonce($nonce, 'at_ajax_delete'))
-                die('1');
+            if (!wp_verify_nonce($nonce, 'at_ajax_delete')) {
+                            die('1');
+            }
 
             $this->delete_tax_meta($term_id, $key, $attach_id);
 
@@ -336,8 +342,9 @@ 
             $ok = false;
             if (strpos($field_id, '[') === false) {
                 check_admin_referer("at-delete-mupload_" . urldecode($field_id));
-                if ($term_id > 0)
-                    $this->delete_tax_meta($term_id, $field_id);
+                if ($term_id > 0) {
+                                    $this->delete_tax_meta($term_id, $field_id);
+                }
                 //$ok = wp_delete_attachment( $attachment_id );
                 $ok = 1;
             } else {
@@ -349,8 +356,9 @@ 
                 $saved = $this->get_tax_meta($term_id, $f[0], true);
                 if (isset($saved[$f[1]][$f[2]])) {
                     unset($saved[$f[1]][$f[2]]);
-                    if ($term_id > 0)
-                        update_post_meta($term_id, $f[0], $saved);
+                    if ($term_id > 0) {
+                                            update_post_meta($term_id, $f[0], $saved);
+                    }
                     //$ok = wp_delete_attachment( $attachment_id );
                     $ok = 1;
                 }
@@ -375,13 +383,15 @@ 
         public function reorder_images()
         {
 
-            if (!isset($_POST['data']))
-                die();
+            if (!isset($_POST['data'])) {
+                            die();
+            }
 
             list($order, $term_id, $key, $nonce) = explode('|', $_POST['data']);
 
-            if (!wp_verify_nonce($nonce, 'at_ajax_reorder'))
-                die('1');
+            if (!wp_verify_nonce($nonce, 'at_ajax_reorder')) {
+                            die('1');
+            }
 
             parse_str($order, $items);
             $items = $items['item'];
@@ -513,8 +523,9 @@ 
             foreach ($this->_fields as $field) {
                 $meta = $this->get_tax_meta($term_id, $field['id'], !$field['multiple']);
                 $meta = ($meta !== '') ? $meta : $field['std'];
-                if ('image' != $field['type'] && $field['type'] != 'repeater')
-                    $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
+                if ('image' != $field['type'] && $field['type'] != 'repeater') {
+                                    $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
+                }
 
                 if ($field['validate_func']) {
                     echo '<tr class="form-field form-required ' . $field['style'] . '">';
@@ -560,8 +571,9 @@ 
                         $id = $field['id'] . '[' . $c . '][' . $f['id'] . ']';
                         $m = $me[$f['id']];
                         $m = ($m !== '') ? $m : $f['std'];
-                        if ('image' != $f['type'] && $f['type'] != 'repeater')
-                            $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
+                        if ('image' != $f['type'] && $f['type'] != 'repeater') {
+                                                    $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
+                        }
                         //set new id for field in array format
                         $f['id'] = $id;
                         if (!$field['inline']) {
@@ -802,8 +814,9 @@ 
         public function show_field_select($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
             echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">";
@@ -826,8 +839,9 @@ 
         public function show_field_radio($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
             foreach ($field['options'] as $key => $value) {
@@ -889,8 +903,9 @@ 
 
             global $post;
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
             echo "{$field['desc']}<br />";
@@ -934,16 +949,18 @@ 
             $this->show_field_begin($field, $meta);
             $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_" . $field['id'], false, false);
             if (is_array($meta)) {
-                if (isset($meta[0]) && is_array($meta[0]))
-                    $meta = $meta[0];
+                if (isset($meta[0]) && is_array($meta[0])) {
+                                    $meta = $meta[0];
+                }
             }
 
             $uploads = wp_upload_dir();
             if (is_array($meta) && isset($meta['src']) && $meta['src'] != '') {
                 $file_info = pathinfo($meta['src']);
 
-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
-                    $sub_dir = $file_info['dirname'];
+                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                                    $sub_dir = $file_info['dirname'];
+                }
 
                 $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
                 $uploads_baseurl = $uploads['baseurl'];
@@ -987,8 +1004,9 @@ 
         public function show_field_color($field, $meta)
         {
 
-            if (empty($meta))
-                $meta = '#';
+            if (empty($meta)) {
+                            $meta = '#';
+            }
 
             $this->show_field_begin($field, $meta);
 
@@ -1011,8 +1029,9 @@ 
         public function show_field_checkbox_list($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
 
@@ -1072,7 +1091,9 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) {
+            	$meta = (array)$meta;
+            }
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $posts = get_posts($options['args']);
@@ -1110,7 +1131,9 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) {
+            	$meta = (array)$meta;
+            }
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $terms = get_terms($options['taxonomy'], $options['args']);
@@ -1144,17 +1167,20 @@ 
         {
 
             $taxnow = '';
-            if (isset($_POST['taxonomy']))
-                $taxnow = $_POST['taxonomy'];
+            if (isset($_POST['taxonomy'])) {
+                            $taxnow = $_POST['taxonomy'];
+            }
 
             if (!isset($term_id)                                                        // Check Revision
                 || (!in_array($taxnow, $this->_meta_box['pages']))                            // Check if current taxonomy type is supported.
                 || (!check_admin_referer(basename(__FILE__), 'tax_meta_class_nonce'))        // Check nonce - Security
                 || (!current_user_can('manage_categories'))
-            )                                // Check permission
+            ) {
+            	// Check permission
             {
                 return $term_id;
             }
+            }
 
 
             foreach ($this->_fields as $field) {
@@ -1248,8 +1274,9 @@ 
         {
             $name = $field['id'];
             $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array())
-                return;
+            if ($new === '' || $new === array()) {
+                            return;
+            }
 
             $this->update_tax_meta($term_id, $name, $new);
         }
@@ -1269,8 +1296,9 @@ 
             $name = $field['id'];
 
             $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '')
-                return;
+            if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '') {
+                            return;
+            }
 
             $this->update_tax_meta($term_id, $name, $new);
         }
@@ -1317,8 +1345,9 @@ 
                                 break;
                         }
                     }
-                    if (!$this->is_array_empty($n))
-                        $temp[] = $n;
+                    if (!$this->is_array_empty($n)) {
+                                            $temp[] = $n;
+                    }
                 }
                 if (isset($temp) && count($temp) > 0 && !$this->is_array_empty($temp)) {
                     $this->update_tax_meta($term_id, $field['id'], $temp);
@@ -1346,14 +1375,16 @@ 
         {
 
             $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
+            if (empty($_FILES[$name])) {
+                            return;
+            }
             $this->fix_file_array($_FILES[$name]);
             foreach ($_FILES[$name] as $position => $fileitem) {
 
                 $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
+                if (empty($file['file'])) {
+                                    continue;
+                }
                 $filename = $file['file'];
 
                 $attachment = array(
@@ -1391,14 +1422,16 @@ 
         {
 
             $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
+            if (empty($_FILES[$name])) {
+                            return;
+            }
             $this->fix_file_array($_FILES[$name]);
             foreach ($_FILES[$name] as $position => $fileitem) {
 
                 $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
+                if (empty($file['file'])) {
+                                    continue;
+                }
                 $filename = $file['file'];
 
                 $attachment = array(
@@ -1453,8 +1486,9 @@ 
         {
             if(is_array($this->_fields)) {
                 foreach ($this->_fields as $field) {
-                    if ($type == $field['type'])
-                        return true;
+                    if ($type == $field['type']) {
+                                            return true;
+                    }
                 }
             }
             return false;
@@ -1992,18 +2026,21 @@ 
          */
         public function is_array_empty($array)
         {
-            if (!is_array($array))
-                return true;
+            if (!is_array($array)) {
+                            return true;
+            }
 
             foreach ($array as $a) {
                 if (is_array($a)) {
                     foreach ($a as $sub_a) {
-                        if (!empty($sub_a) && $sub_a != '')
-                            return false;
+                        if (!empty($sub_a) && $sub_a != '') {
+                                                    return false;
+                        }
                     }
                 } else {
-                    if (!empty($a) && $a != '')
-                        return false;
+                    if (!empty($a) && $a != '') {
+                                            return false;
+                    }
                 }
             }
             return true;

Indentation +2046 added lines, -2046 removed lines

@@ -28,260 +28,260 @@ 
 
 if (!class_exists('Geodir_Tax_Meta_Class')) :
 
-    /**
-     * All Types Meta Box class.
-     *
-     * @package All Types Meta Box
-     * @since 1.0
-     *
-     * @todo Nothing.
-     */
-
-
-    class Geodir_Tax_Meta_Class
-    {
-
-        /**
-         * Holds meta box object
-         *
-         * @var object
-         * @access protected
-         */
-        protected $_meta_box;
-
-        /**
-         * Holds meta box fields.
-         *
-         * @var array
-         * @access protected
-         */
-        protected $_prefix;
-
-        /**
-         * Holds Prefix for meta box fields.
-         *
-         * @var array
-         * @access protected
-         */
-        protected $_fields;
-
-        /**
-         * Use local images.
-         *
-         * @var bool
-         * @access protected
-         */
-        protected $_Local_images;
-
-        /**
-         * What form is this? edit or new term.
-         *
-         * @var string
-         * @access protected
-         * $since 1.0
-         */
-        protected $_form_type;
-        /**
-         * SelfPath to allow themes as well as plugins.
-         *
-         * @var string
-         * @access protected
-         * $since 1.0
-         */
-        protected $SelfPath;
-
-        /**
-         * Constructor
-         *
-         * @since 1.0
-         * @access public
-         *
-         * @param array $meta_box
-         */
-        public function __construct($meta_box)
-        {
-
-            // If we are not in admin area exit.
-            if (!is_admin())
-                return;
-
-            // Assign meta box values to local variables and add it's missed values.
-            $this->_meta_box = $meta_box;
-            $this->_prefix = (isset($meta_box['prefix'])) ? $meta_box['prefix'] : '';
-            $this->_fields = &$this->_meta_box['fields'];
-            $this->_Local_images = (isset($meta_box['local_images'])) ? true : false;
-            $this->add_missed_values();
-            if (isset($meta_box['use_with_theme']))
-                if ($meta_box['use_with_theme'] === true) {
-                    $this->SelfPath = get_stylesheet_directory_uri() . '/library/cat-meta';
-                } elseif ($meta_box['use_with_theme'] === false) {
-                    $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
-                } else {
-                    $this->SelfPath = $meta_box['use_with_theme'];
-                }
-            else {
-                $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
-            }
-
-
-            // Add Actions
-            add_action('admin_init', array(&$this, 'add'));
-
-            // Check for special fields and add needed actions for them.
-            $this->check_field_upload();
-            $this->check_field_color();
-            $this->check_field_date();
-            $this->check_field_time();
-
-            // Load common js, css files
-            // Must enqueue for all pages as we need js for the media upload, too.
-            add_action('admin_print_styles', array(&$this, 'load_scripts_styles'));
-
-        }
-
-        /**
-         * Load all Javascript and CSS
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function load_scripts_styles()
-        {
-
-            // Get Plugin Path
-            $plugin_path = $this->SelfPath;
-            //only load styles and js when needed
-            /* 
+	/**
+	 * All Types Meta Box class.
+	 *
+	 * @package All Types Meta Box
+	 * @since 1.0
+	 *
+	 * @todo Nothing.
+	 */
+
+
+	class Geodir_Tax_Meta_Class
+	{
+
+		/**
+		 * Holds meta box object
+		 *
+		 * @var object
+		 * @access protected
+		 */
+		protected $_meta_box;
+
+		/**
+		 * Holds meta box fields.
+		 *
+		 * @var array
+		 * @access protected
+		 */
+		protected $_prefix;
+
+		/**
+		 * Holds Prefix for meta box fields.
+		 *
+		 * @var array
+		 * @access protected
+		 */
+		protected $_fields;
+
+		/**
+		 * Use local images.
+		 *
+		 * @var bool
+		 * @access protected
+		 */
+		protected $_Local_images;
+
+		/**
+		 * What form is this? edit or new term.
+		 *
+		 * @var string
+		 * @access protected
+		 * $since 1.0
+		 */
+		protected $_form_type;
+		/**
+		 * SelfPath to allow themes as well as plugins.
+		 *
+		 * @var string
+		 * @access protected
+		 * $since 1.0
+		 */
+		protected $SelfPath;
+
+		/**
+		 * Constructor
+		 *
+		 * @since 1.0
+		 * @access public
+		 *
+		 * @param array $meta_box
+		 */
+		public function __construct($meta_box)
+		{
+
+			// If we are not in admin area exit.
+			if (!is_admin())
+				return;
+
+			// Assign meta box values to local variables and add it's missed values.
+			$this->_meta_box = $meta_box;
+			$this->_prefix = (isset($meta_box['prefix'])) ? $meta_box['prefix'] : '';
+			$this->_fields = &$this->_meta_box['fields'];
+			$this->_Local_images = (isset($meta_box['local_images'])) ? true : false;
+			$this->add_missed_values();
+			if (isset($meta_box['use_with_theme']))
+				if ($meta_box['use_with_theme'] === true) {
+					$this->SelfPath = get_stylesheet_directory_uri() . '/library/cat-meta';
+				} elseif ($meta_box['use_with_theme'] === false) {
+					$this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
+				} else {
+					$this->SelfPath = $meta_box['use_with_theme'];
+				}
+			else {
+				$this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
+			}
+
+
+			// Add Actions
+			add_action('admin_init', array(&$this, 'add'));
+
+			// Check for special fields and add needed actions for them.
+			$this->check_field_upload();
+			$this->check_field_color();
+			$this->check_field_date();
+			$this->check_field_time();
+
+			// Load common js, css files
+			// Must enqueue for all pages as we need js for the media upload, too.
+			add_action('admin_print_styles', array(&$this, 'load_scripts_styles'));
+
+		}
+
+		/**
+		 * Load all Javascript and CSS
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function load_scripts_styles()
+		{
+
+			// Get Plugin Path
+			$plugin_path = $this->SelfPath;
+			//only load styles and js when needed
+			/* 
 		 * since 1.0
 		 */
-            $taxnow = isset($_REQUEST['taxonomy']) ? $_REQUEST['taxonomy'] : '';
-
-            if (!empty($this->_meta_box['pages'])) {
-                if (in_array($taxnow, $this->_meta_box['pages'])) {
-                    // Enqueue Meta Box Style
-                    //wp_enqueue_style( 'tax-meta-clss', $plugin_path . '/css/Tax-meta-class.css' );
-                    // Enqueue Meta Box Scripts
-                    //wp_enqueue_script( 'tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array( 'jquery' ), null, true );
-
-                }
-            }
-
-        }
-
-        /**
-         * Check the Field Upload, Add needed Actions
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function enqueue_tax_meta_scripts()
-        {
-            // Make upload feature work event when custom post type doesn't support 'editor'
-            wp_enqueue_script('media-upload');
-            wp_enqueue_script('thickbox');
-            add_thickbox();
-            wp_enqueue_script('jquery-ui-core');
-            wp_enqueue_script('jquery-ui-sortable');
-
-
-        }
-
-        public function check_field_upload()
-        {
-
-            // Check if the field is an image or file. If not, return.
-            if (!$this->has_field('image') && !$this->has_field('file'))
-                return;
-
-
-            add_action('wp_enqueue_scripts', array(&$this, 'enqueue_tax_meta_scripts'), 100);
-
-            // Add data encoding type for file uploading.	
-            add_action('post_edit_form_tag', array(&$this, 'add_enctype'));
-
-
-            // Add filters for media upload.
-            add_filter('media_upload_gallery', array(&$this, 'insert_images'));
-            add_filter('media_upload_library', array(&$this, 'insert_images'));
-            add_filter('media_upload_image', array(&$this, 'insert_images'));
-
-            // Delete all attachments when delete custom post type.
-            add_action('wp_ajax_at_delete_file', array(&$this, 'delete_file'));
-            add_action('wp_ajax_at_reorder_images', array(&$this, 'reorder_images'));
-            // Delete file via Ajax
-            add_action('wp_ajax_at_delete_mupload', array($this, 'wp_ajax_delete_image'));
-        }
-
-        /**
-         * Add data encoding type for file uploading
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function add_enctype()
-        {
-            echo ' enctype="multipart/form-data"';
-        }
-
-        /**
-         * Process images added to meta field.
-         *
-         * Modified from Faster Image Insert plugin.
-         *
-         * @return void
-         * @author Cory Crowley
-         */
-        public function insert_images()
-        {
-
-            // If post variables are empty, return.
-            if (!isset($_POST['at-insert']) || empty($_POST['attachments']))
-                return;
-
-            // Security Check
-            check_admin_referer('media-form');
-
-            // Create Security Nonce
-            $nonce = wp_create_nonce('at_ajax_delete');
-
-            // Get Post Id and Field Id
-            $term_id = $_POST['post_id'];
-            $id = $_POST['field_id'];
-
-            // Modify the insertion string
-            $html = '';
-            foreach ($_POST['attachments'] as $attachment_id => $attachment) {
-
-                // Strip Slashes
-                $attachment = stripslashes_deep($attachment);
-
-                // If not selected or url is empty, continue in loop.
-                if (empty($attachment['selected']) || empty($attachment['url']))
-                    continue;
-
-                $li = "<li id='item_{$attachment_id}'>";
-                $li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />";
-                //$li 	.= "<a title='" . __( 'Delete this image' ) . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'>" . __( 'Delete' ) . "</a>";
-                $li .= "<a title='" . __('Remove this image', 'geodirectory') . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'><img src='" . $this->SelfPath . "/images/delete-16.png' alt='" . __('Remove', 'geodirectory') . "' /></a>";
-                $li .= "<input type='hidden' name='{$id}[]' value='{$attachment_id}' />";
-                $li .= "</li>";
-                $html .= $li;
-
-            } // End For Each
-
-            return media_send_to_editor($html);
-
-        }
-
-        /**
-         * Delete attachments associated with the post.
-         *
-         * @since 1.0
-         * @access public
-         *
-         * @param int|string $term_id The term ID.
-         */
-        /*public function delete_attachments( $term_id ) {
+			$taxnow = isset($_REQUEST['taxonomy']) ? $_REQUEST['taxonomy'] : '';
+
+			if (!empty($this->_meta_box['pages'])) {
+				if (in_array($taxnow, $this->_meta_box['pages'])) {
+					// Enqueue Meta Box Style
+					//wp_enqueue_style( 'tax-meta-clss', $plugin_path . '/css/Tax-meta-class.css' );
+					// Enqueue Meta Box Scripts
+					//wp_enqueue_script( 'tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array( 'jquery' ), null, true );
+
+				}
+			}
+
+		}
+
+		/**
+		 * Check the Field Upload, Add needed Actions
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function enqueue_tax_meta_scripts()
+		{
+			// Make upload feature work event when custom post type doesn't support 'editor'
+			wp_enqueue_script('media-upload');
+			wp_enqueue_script('thickbox');
+			add_thickbox();
+			wp_enqueue_script('jquery-ui-core');
+			wp_enqueue_script('jquery-ui-sortable');
+
+
+		}
+
+		public function check_field_upload()
+		{
+
+			// Check if the field is an image or file. If not, return.
+			if (!$this->has_field('image') && !$this->has_field('file'))
+				return;
+
+
+			add_action('wp_enqueue_scripts', array(&$this, 'enqueue_tax_meta_scripts'), 100);
+
+			// Add data encoding type for file uploading.	
+			add_action('post_edit_form_tag', array(&$this, 'add_enctype'));
+
+
+			// Add filters for media upload.
+			add_filter('media_upload_gallery', array(&$this, 'insert_images'));
+			add_filter('media_upload_library', array(&$this, 'insert_images'));
+			add_filter('media_upload_image', array(&$this, 'insert_images'));
+
+			// Delete all attachments when delete custom post type.
+			add_action('wp_ajax_at_delete_file', array(&$this, 'delete_file'));
+			add_action('wp_ajax_at_reorder_images', array(&$this, 'reorder_images'));
+			// Delete file via Ajax
+			add_action('wp_ajax_at_delete_mupload', array($this, 'wp_ajax_delete_image'));
+		}
+
+		/**
+		 * Add data encoding type for file uploading
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function add_enctype()
+		{
+			echo ' enctype="multipart/form-data"';
+		}
+
+		/**
+		 * Process images added to meta field.
+		 *
+		 * Modified from Faster Image Insert plugin.
+		 *
+		 * @return void
+		 * @author Cory Crowley
+		 */
+		public function insert_images()
+		{
+
+			// If post variables are empty, return.
+			if (!isset($_POST['at-insert']) || empty($_POST['attachments']))
+				return;
+
+			// Security Check
+			check_admin_referer('media-form');
+
+			// Create Security Nonce
+			$nonce = wp_create_nonce('at_ajax_delete');
+
+			// Get Post Id and Field Id
+			$term_id = $_POST['post_id'];
+			$id = $_POST['field_id'];
+
+			// Modify the insertion string
+			$html = '';
+			foreach ($_POST['attachments'] as $attachment_id => $attachment) {
+
+				// Strip Slashes
+				$attachment = stripslashes_deep($attachment);
+
+				// If not selected or url is empty, continue in loop.
+				if (empty($attachment['selected']) || empty($attachment['url']))
+					continue;
+
+				$li = "<li id='item_{$attachment_id}'>";
+				$li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />";
+				//$li 	.= "<a title='" . __( 'Delete this image' ) . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'>" . __( 'Delete' ) . "</a>";
+				$li .= "<a title='" . __('Remove this image', 'geodirectory') . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'><img src='" . $this->SelfPath . "/images/delete-16.png' alt='" . __('Remove', 'geodirectory') . "' /></a>";
+				$li .= "<input type='hidden' name='{$id}[]' value='{$attachment_id}' />";
+				$li .= "</li>";
+				$html .= $li;
+
+			} // End For Each
+
+			return media_send_to_editor($html);
+
+		}
+
+		/**
+		 * Delete attachments associated with the post.
+		 *
+		 * @since 1.0
+		 * @access public
+		 *
+		 * @param int|string $term_id The term ID.
+		 */
+		/*public function delete_attachments( $term_id ) {
 		
 		// Get Attachments
 		$attachments = get_posts( array( 'numberposts' => -1, 'post_type' => 'attachment', 'post_parent' => $term_id ) );
@@ -295,349 +295,349 @@ 
 		
 	}*/
 
-        /**
-         * Ajax callback for deleting files.
-         *
-         * Modified from a function used by "Verve Meta Boxes" plugin ( http://goo.gl/aw64H )
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function delete_file()
-        {
-
-
-            // If data is not set, die.
-            if (!isset($_POST['data']))
-                die();
-
-            list($nonce, $term_id, $key, $attach_id) = explode('|', $_POST['data']);
-
-            if (!wp_verify_nonce($nonce, 'at_ajax_delete'))
-                die('1');
-
-            $this->delete_tax_meta($term_id, $key, $attach_id);
-
-            die('0');
-
-        }
-
-        /**
-         * Ajax callback for deleting files.
-         * Modified from a function used by "Verve Meta Boxes" plugin (http://goo.gl/LzYSq)
-         * @since 1.0
-         * @access public
-         */
-        public function wp_ajax_delete_image()
-        {
-            $term_id = isset($_GET['post_id']) ? intval($_GET['post_id']) : 0;
-            $field_id = isset($_GET['field_id']) ? $_GET['field_id'] : 0;
-            $attachment_id = isset($_GET['attachment_id']) ? intval($_GET['attachment_id']) : 0;
-            $ok = false;
-            if (strpos($field_id, '[') === false) {
-                check_admin_referer("at-delete-mupload_" . urldecode($field_id));
-                if ($term_id > 0)
-                    $this->delete_tax_meta($term_id, $field_id);
-                //$ok = wp_delete_attachment( $attachment_id );
-                $ok = 1;
-            } else {
-                $f = explode('[', urldecode($field_id));
-                $f_fiexed = array();
-                foreach ($f as $k => $v) {
-                    $f[$k] = str_replace(']', '', $v);
-                }
-                $saved = $this->get_tax_meta($term_id, $f[0], true);
-                if (isset($saved[$f[1]][$f[2]])) {
-                    unset($saved[$f[1]][$f[2]]);
-                    if ($term_id > 0)
-                        update_post_meta($term_id, $f[0], $saved);
-                    //$ok = wp_delete_attachment( $attachment_id );
-                    $ok = 1;
-                }
-            }
-
-
-            if ($ok) {
-                echo json_encode(array('status' => 'success'));
-                die();
-            } else {
-                echo json_encode(array('message' => __('Cannot delete file. Something\'s wrong.', 'geodirectory')));
-                die();
-            }
-        }
-
-        /**
-         * Ajax callback for reordering Images.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function reorder_images()
-        {
-
-            if (!isset($_POST['data']))
-                die();
-
-            list($order, $term_id, $key, $nonce) = explode('|', $_POST['data']);
-
-            if (!wp_verify_nonce($nonce, 'at_ajax_reorder'))
-                die('1');
-
-            parse_str($order, $items);
-            $items = $items['item'];
-            $order = 1;
-            foreach ($items as $item) {
-                wp_update_post(array('ID' => $item, 'post_parent' => $term_id, 'menu_order' => $order));
-                $order++;
-            }
-
-            die('0');
-
-        }
-
-        /**
-         * Check Field Color
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function check_field_color()
-        {
-
-            if ($this->has_field('color') && $this->is_edit_page()) {
-                // Enqueu built-in script and style for color picker.
-                wp_enqueue_style('farbtastic');
-                wp_enqueue_script('farbtastic');
-            }
-
-        }
-
-        /**
-         * Check Field Date
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function check_field_date()
-        {
-
-            if ($this->has_field('date') && $this->is_edit_page()) {
-                // Enqueu JQuery UI, use proper version.
-                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css');
-                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'));
-            }
-
-        }
-
-        /**
-         * Check Field Time
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function check_field_time()
-        {
-
-            if ($this->has_field('time') && $this->is_edit_page()) {
-
-                // Enqueu JQuery UI, use proper version.
-                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css', array(), false, true);
-                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'), false, true);
-                wp_enqueue_script('at-timepicker', 'https://github.com/trentrichardson/jQuery-Timepicker-Addon/raw/master/jquery-ui-timepicker-addon.js', array('tmc-jquery-ui'), false, true);
-
-            }
-
-        }
-
-        /**
-         * Add Meta Box for multiple post types.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function add()
-        {
-
-            // Loop through array
-            if (!empty($this->_meta_box['pages'])) {
-                foreach ($this->_meta_box['pages'] as $page) {
-                    //add fields to edit form
-                    add_action($page . '_edit_form_fields', array(&$this, 'show_edit_form'));
-                    //add fields to add new form
-                    add_action($page . '_add_form_fields', array(&$this, 'show_new_form'));
-                    // this saves the edit fields
-                    add_action('edited_' . $page, array(&$this, 'save'), 10, 2);
-                    // this saves the add fields
-                    add_action('created_' . $page, array(&$this, 'save'), 10, 2);
-                }
-            }
-
-        }
-
-        /**
-         * Callback function to show fields on add new taxonomy term form.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function show_new_form($term_id)
-        {
-            $this->_form_type = 'new';
-            $this->show($term_id);
-        }
-
-        /**
-         * Callback function to show fields on term edit form.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function show_edit_form($term_id)
-        {
-            $this->_form_type = 'edit';
-            $this->show($term_id);
-        }
-
-
-        /**
-         * Callback function to show fields in meta box.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function show($term_id)
-        {
-
-            wp_nonce_field(basename(__FILE__), 'tax_meta_class_nonce');
-
-            foreach ($this->_fields as $field) {
-                $meta = $this->get_tax_meta($term_id, $field['id'], !$field['multiple']);
-                $meta = ($meta !== '') ? $meta : $field['std'];
-                if ('image' != $field['type'] && $field['type'] != 'repeater')
-                    $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
-
-                if ($field['validate_func']) {
-                    echo '<tr class="form-field form-required ' . $field['style'] . '">';
-                } else {
-                    echo '<tr class="form-field ' . $field['style'] . '">';
-                }
-
-                // Call Separated methods for displaying each type of field.
-                call_user_func(array(&$this, 'show_field_' . $field['type']), $field, $meta);
-                echo '</tr>';
-            }
-            echo '</table>';
-        }
-
-        /**
-         * Show Repeater Fields.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_repeater($field, $meta)
-        {
-            // Get Plugin Path
-            $plugin_path = $this->SelfPath;
-            $this->show_field_begin($field, $meta);
-            echo "<div class='at-repeat' id='{$field['id']}'>";
-
-            $c = 0;
-
-            if (count($meta) > 0 && is_array($meta)) {
-                foreach ($meta as $me) {
-                    //for labling toggles
-                    $mmm = $me[$field['fields'][0]['id']];
-                    echo '<div class="at-repater-block">' . $mmm . '<br/><table class="repeater-table" style="display: none;">';
-                    if ($field['inline']) {
-                        echo '<tr class="at-inline" VALIGN="top">';
-                    }
-                    foreach ($field['fields'] as $f) {
-                        //reset var $id for repeater
-                        $id = '';
-                        $id = $field['id'] . '[' . $c . '][' . $f['id'] . ']';
-                        $m = $me[$f['id']];
-                        $m = ($m !== '') ? $m : $f['std'];
-                        if ('image' != $f['type'] && $f['type'] != 'repeater')
-                            $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
-                        //set new id for field in array format
-                        $f['id'] = $id;
-                        if (!$field['inline']) {
-                            echo '<tr>';
-                        }
-                        call_user_func(array(&$this, 'show_field_' . $f['type']), $f, $m);
-                        if (!$field['inline']) {
-                            echo '</tr>';
-                        }
-                    }
-                    if ($field['inline']) {
-                        echo '</tr>';
-                    }
-                    echo '</table>
+		/**
+		 * Ajax callback for deleting files.
+		 *
+		 * Modified from a function used by "Verve Meta Boxes" plugin ( http://goo.gl/aw64H )
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function delete_file()
+		{
+
+
+			// If data is not set, die.
+			if (!isset($_POST['data']))
+				die();
+
+			list($nonce, $term_id, $key, $attach_id) = explode('|', $_POST['data']);
+
+			if (!wp_verify_nonce($nonce, 'at_ajax_delete'))
+				die('1');
+
+			$this->delete_tax_meta($term_id, $key, $attach_id);
+
+			die('0');
+
+		}
+
+		/**
+		 * Ajax callback for deleting files.
+		 * Modified from a function used by "Verve Meta Boxes" plugin (http://goo.gl/LzYSq)
+		 * @since 1.0
+		 * @access public
+		 */
+		public function wp_ajax_delete_image()
+		{
+			$term_id = isset($_GET['post_id']) ? intval($_GET['post_id']) : 0;
+			$field_id = isset($_GET['field_id']) ? $_GET['field_id'] : 0;
+			$attachment_id = isset($_GET['attachment_id']) ? intval($_GET['attachment_id']) : 0;
+			$ok = false;
+			if (strpos($field_id, '[') === false) {
+				check_admin_referer("at-delete-mupload_" . urldecode($field_id));
+				if ($term_id > 0)
+					$this->delete_tax_meta($term_id, $field_id);
+				//$ok = wp_delete_attachment( $attachment_id );
+				$ok = 1;
+			} else {
+				$f = explode('[', urldecode($field_id));
+				$f_fiexed = array();
+				foreach ($f as $k => $v) {
+					$f[$k] = str_replace(']', '', $v);
+				}
+				$saved = $this->get_tax_meta($term_id, $f[0], true);
+				if (isset($saved[$f[1]][$f[2]])) {
+					unset($saved[$f[1]][$f[2]]);
+					if ($term_id > 0)
+						update_post_meta($term_id, $f[0], $saved);
+					//$ok = wp_delete_attachment( $attachment_id );
+					$ok = 1;
+				}
+			}
+
+
+			if ($ok) {
+				echo json_encode(array('status' => 'success'));
+				die();
+			} else {
+				echo json_encode(array('message' => __('Cannot delete file. Something\'s wrong.', 'geodirectory')));
+				die();
+			}
+		}
+
+		/**
+		 * Ajax callback for reordering Images.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function reorder_images()
+		{
+
+			if (!isset($_POST['data']))
+				die();
+
+			list($order, $term_id, $key, $nonce) = explode('|', $_POST['data']);
+
+			if (!wp_verify_nonce($nonce, 'at_ajax_reorder'))
+				die('1');
+
+			parse_str($order, $items);
+			$items = $items['item'];
+			$order = 1;
+			foreach ($items as $item) {
+				wp_update_post(array('ID' => $item, 'post_parent' => $term_id, 'menu_order' => $order));
+				$order++;
+			}
+
+			die('0');
+
+		}
+
+		/**
+		 * Check Field Color
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function check_field_color()
+		{
+
+			if ($this->has_field('color') && $this->is_edit_page()) {
+				// Enqueu built-in script and style for color picker.
+				wp_enqueue_style('farbtastic');
+				wp_enqueue_script('farbtastic');
+			}
+
+		}
+
+		/**
+		 * Check Field Date
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function check_field_date()
+		{
+
+			if ($this->has_field('date') && $this->is_edit_page()) {
+				// Enqueu JQuery UI, use proper version.
+				wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css');
+				wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'));
+			}
+
+		}
+
+		/**
+		 * Check Field Time
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function check_field_time()
+		{
+
+			if ($this->has_field('time') && $this->is_edit_page()) {
+
+				// Enqueu JQuery UI, use proper version.
+				wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css', array(), false, true);
+				wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'), false, true);
+				wp_enqueue_script('at-timepicker', 'https://github.com/trentrichardson/jQuery-Timepicker-Addon/raw/master/jquery-ui-timepicker-addon.js', array('tmc-jquery-ui'), false, true);
+
+			}
+
+		}
+
+		/**
+		 * Add Meta Box for multiple post types.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function add()
+		{
+
+			// Loop through array
+			if (!empty($this->_meta_box['pages'])) {
+				foreach ($this->_meta_box['pages'] as $page) {
+					//add fields to edit form
+					add_action($page . '_edit_form_fields', array(&$this, 'show_edit_form'));
+					//add fields to add new form
+					add_action($page . '_add_form_fields', array(&$this, 'show_new_form'));
+					// this saves the edit fields
+					add_action('edited_' . $page, array(&$this, 'save'), 10, 2);
+					// this saves the add fields
+					add_action('created_' . $page, array(&$this, 'save'), 10, 2);
+				}
+			}
+
+		}
+
+		/**
+		 * Callback function to show fields on add new taxonomy term form.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_new_form($term_id)
+		{
+			$this->_form_type = 'new';
+			$this->show($term_id);
+		}
+
+		/**
+		 * Callback function to show fields on term edit form.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_edit_form($term_id)
+		{
+			$this->_form_type = 'edit';
+			$this->show($term_id);
+		}
+
+
+		/**
+		 * Callback function to show fields in meta box.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show($term_id)
+		{
+
+			wp_nonce_field(basename(__FILE__), 'tax_meta_class_nonce');
+
+			foreach ($this->_fields as $field) {
+				$meta = $this->get_tax_meta($term_id, $field['id'], !$field['multiple']);
+				$meta = ($meta !== '') ? $meta : $field['std'];
+				if ('image' != $field['type'] && $field['type'] != 'repeater')
+					$meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
+
+				if ($field['validate_func']) {
+					echo '<tr class="form-field form-required ' . $field['style'] . '">';
+				} else {
+					echo '<tr class="form-field ' . $field['style'] . '">';
+				}
+
+				// Call Separated methods for displaying each type of field.
+				call_user_func(array(&$this, 'show_field_' . $field['type']), $field, $meta);
+				echo '</tr>';
+			}
+			echo '</table>';
+		}
+
+		/**
+		 * Show Repeater Fields.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_repeater($field, $meta)
+		{
+			// Get Plugin Path
+			$plugin_path = $this->SelfPath;
+			$this->show_field_begin($field, $meta);
+			echo "<div class='at-repeat' id='{$field['id']}'>";
+
+			$c = 0;
+
+			if (count($meta) > 0 && is_array($meta)) {
+				foreach ($meta as $me) {
+					//for labling toggles
+					$mmm = $me[$field['fields'][0]['id']];
+					echo '<div class="at-repater-block">' . $mmm . '<br/><table class="repeater-table" style="display: none;">';
+					if ($field['inline']) {
+						echo '<tr class="at-inline" VALIGN="top">';
+					}
+					foreach ($field['fields'] as $f) {
+						//reset var $id for repeater
+						$id = '';
+						$id = $field['id'] . '[' . $c . '][' . $f['id'] . ']';
+						$m = $me[$f['id']];
+						$m = ($m !== '') ? $m : $f['std'];
+						if ('image' != $f['type'] && $f['type'] != 'repeater')
+							$m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
+						//set new id for field in array format
+						$f['id'] = $id;
+						if (!$field['inline']) {
+							echo '<tr>';
+						}
+						call_user_func(array(&$this, 'show_field_' . $f['type']), $f, $m);
+						if (!$field['inline']) {
+							echo '</tr>';
+						}
+					}
+					if ($field['inline']) {
+						echo '</tr>';
+					}
+					echo '</table>
 				<span class="at-re-toggle"><img src="';
-                    if ($this->_Local_images) {
-                        echo $plugin_path . '/images/edit.png';
-                    } else {
-                        echo 'http://i.imgur.com/ka0E2.png';
-                    }
-                    echo '" alt="Edit" title="Edit"/></span> 
+					if ($this->_Local_images) {
+						echo $plugin_path . '/images/edit.png';
+					} else {
+						echo 'http://i.imgur.com/ka0E2.png';
+					}
+					echo '" alt="Edit" title="Edit"/></span> 
 				<img src="';
-                    if ($this->_Local_images) {
-                        echo $plugin_path . '/images/remove.png';
-                    } else {
-                        echo 'http://i.imgur.com/g8Duj.png';
-                    }
-                    echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
-                    $c = $c + 1;
-
-                }
-                $this->show_field_end($field, $meta);
-            }
-
-            echo '<img src="';
-            if ($this->_Local_images) {
-                echo $plugin_path . '/images/add.png';
-            } else {
-                echo 'http://i.imgur.com/w5Tuc.png';
-            }
-            echo '" alt="' . __('Add', 'geodirectory') . '" title="' . __('Add', 'geodirectory') . '" id="add-' . $field['id'] . '"><br/></div>';
-
-            //create all fields once more for js function and catch with object buffer
-            ob_start();
-            echo '<div class="at-repater-block"><table class="repeater-table">';
-            if ($field['inline']) {
-                echo '<tr class="at-inline" VALIGN="top">';
-            }
-            foreach ($field['fields'] as $f) {
-                //reset var $id for repeater
-                $id = '';
-                $id = $field['id'] . '[CurrentCounter][' . $f['id'] . ']';
-                $f['id'] = $id;
-                if (!$field['inline']) {
-                    echo '<tr>';
-                }
-                call_user_func(array(&$this, 'show_field_' . $f['type']), $f, '');
-                if (!$field['inline']) {
-                    echo '</tr>';
-                }
-            }
-            if ($field['inline']) {
-                echo '</tr>';
-            }
-            echo '</table><img src="';
-            if ($this->_Local_images) {
-                echo $plugin_path . '/images/remove.png';
-            } else {
-                echo 'http://i.imgur.com/g8Duj.png';
-            }
-            echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
-            $counter = 'countadd_' . $field['id'];
-            $js_code = ob_get_clean();
-            $js_code = str_replace("'", "\"", $js_code);
-            $js_code = str_replace("CurrentCounter", "' + " . $counter . " + '", $js_code);
-            echo '<script>
+					if ($this->_Local_images) {
+						echo $plugin_path . '/images/remove.png';
+					} else {
+						echo 'http://i.imgur.com/g8Duj.png';
+					}
+					echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
+					$c = $c + 1;
+
+				}
+				$this->show_field_end($field, $meta);
+			}
+
+			echo '<img src="';
+			if ($this->_Local_images) {
+				echo $plugin_path . '/images/add.png';
+			} else {
+				echo 'http://i.imgur.com/w5Tuc.png';
+			}
+			echo '" alt="' . __('Add', 'geodirectory') . '" title="' . __('Add', 'geodirectory') . '" id="add-' . $field['id'] . '"><br/></div>';
+
+			//create all fields once more for js function and catch with object buffer
+			ob_start();
+			echo '<div class="at-repater-block"><table class="repeater-table">';
+			if ($field['inline']) {
+				echo '<tr class="at-inline" VALIGN="top">';
+			}
+			foreach ($field['fields'] as $f) {
+				//reset var $id for repeater
+				$id = '';
+				$id = $field['id'] . '[CurrentCounter][' . $f['id'] . ']';
+				$f['id'] = $id;
+				if (!$field['inline']) {
+					echo '<tr>';
+				}
+				call_user_func(array(&$this, 'show_field_' . $f['type']), $f, '');
+				if (!$field['inline']) {
+					echo '</tr>';
+				}
+			}
+			if ($field['inline']) {
+				echo '</tr>';
+			}
+			echo '</table><img src="';
+			if ($this->_Local_images) {
+				echo $plugin_path . '/images/remove.png';
+			} else {
+				echo 'http://i.imgur.com/g8Duj.png';
+			}
+			echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
+			$counter = 'countadd_' . $field['id'];
+			$js_code = ob_get_clean();
+			$js_code = str_replace("'", "\"", $js_code);
+			$js_code = str_replace("CurrentCounter", "' + " . $counter . " + '", $js_code);
+			echo '<script>
 				jQuery(document).ready(function() {
 					var ' . $counter . ' = ' . $c . ';
 					jQuery("#add-' . $field['id'] . '").live(\'click\', function() {
@@ -650,7 +650,7 @@ 
         			});
     			});
     		</script>';
-            echo '<br/><style>
+			echo '<br/><style>
 .at-inline{line-height: 1 !important;}
 .at-inline .at-field{border: 0px !important;}
 .at-inline .at-label{margin: 0 0 1px !important;}
@@ -658,531 +658,531 @@ 
 .at-inline .at-textarea{width: 100px; height: 75px;}
 .at-repater-block{background-color: #FFFFFF;border: 1px solid;margin: 2px;}
 </style>';
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Begin Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_begin($field, $meta)
-        {
-            if (isset($field['group'])) {
-                if ($field['group'] == "start") {
-                    echo "<td class='at-field'>";
-                }
-            } else {
-                if ($this->_form_type == 'edit') {
-                    echo '<th valign="top" scope="row">';
-                } else {
-                    if ($field['validate_func']) {
-                        echo '<td><div class="form-field form-required">';
-                    } else {
-                        echo '<td><div class="form-field">';
-                    }
-                }
-            }
-            if ($field['name'] != '' || $field['name'] != FALSE) {
-                //echo "<div class='at-label'>";
-                echo "<label for='{$field['id']}'>{$field['name']}</label>";
-                //echo "</div>";
-            }
-            if ($this->_form_type == 'edit') {
-                echo '</th><td>';
-            }
-        }
-
-        /**
-         * End Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_end($field, $meta = NULL, $group = false)
-        {
-            if (isset($field['group'])) {
-                if ($group == 'end') {
-                    if ($field['desc'] != '') {
-                        echo "<p class='desc-field'>{$field['desc']}</p></td>";
-                    } else {
-                        echo "</td>";
-                    }
-                } else {
-                    if ($field['desc'] != '') {
-                        echo "<p class='desc-field'>{$field['desc']}</p><br/>";
-                    } else {
-                        echo '<br/>';
-                    }
-                }
-            } else {
-                if ($field['desc'] != '') {
-                    echo "<p class='desc-field'>{$field['desc']}</p>";
-                }
-                if ($this->_form_type == 'edit') {
-                    echo '</td>';
-                } else {
-                    echo '</td></div>';
-                }
-            }
-        }
-
-        /**
-         * Show Field Text.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_text($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<input type='text' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='30' />";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Field hidden.
-         *
-         * @param string $field
-         * @param string|mixed $meta
-         * @since 0.1.3
-         * @access public
-         */
-        public function show_field_hidden($field, $meta)
-        {
-            //$this->show_field_begin( $field, $meta );
-            echo "<input type='hidden' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}'/>";
-            //$this->show_field_end( $field, $meta );
-        }
-
-        /**
-         * Show Field Paragraph.
-         *
-         * @param string $field
-         * @since 0.1.3
-         * @access public
-         */
-        public function show_field_paragraph($field)
-        {
-            //$this->show_field_begin( $field, $meta );
-            echo '<p>' . $field['value'] . '</p>';
-            //$this->show_field_end( $field, $meta );
-        }
-
-        /**
-         * Show Field Textarea.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_textarea($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<textarea class='at-textarea large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Field Select.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_select($field, $meta)
-        {
-
-            if (!is_array($meta))
-                $meta = (array)$meta;
-
-            $this->show_field_begin($field, $meta);
-            echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">";
-            foreach ($field['options'] as $key => $value) {
-                echo "<option value='{$key}'" . selected(in_array($key, $meta), true, false) . ">{$value}</option>";
-            }
-            echo "</select>";
-            $this->show_field_end($field, $meta);
-
-        }
-
-        /**
-         * Show Radio Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_radio($field, $meta)
-        {
-
-            if (!is_array($meta))
-                $meta = (array)$meta;
-
-            $this->show_field_begin($field, $meta);
-            foreach ($field['options'] as $key => $value) {
-                echo "<input type='radio' class='at-radio' name='{$field['id']}' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> <span class='at-radio-label'>{$value}</span>";
-            }
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Checkbox Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_checkbox($field, $meta)
-        {
-
-            $this->show_field_begin($field, $meta);
-            echo "<input type='checkbox' class='rw-checkbox' name='{$field['id']}' id='{$field['id']}'" . checked(!empty($meta), true, false) . " /> {$field['desc']}";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Wysiwig Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_wysiwyg($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            // Add TinyMCE script for WP version < 3.3
-            global $wp_version;
-
-            if (version_compare($wp_version, '3.2.1') < 1) {
-                echo "<textarea class='at-wysiwyg theEditor large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
-            } else {
-                // Use new wp_editor() since WP 3.3
-                wp_editor(stripslashes(html_entity_decode($meta)), $field['id'], array('editor_class' => 'at-wysiwyg'));
-            }
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show File Field.
-         *
-         * @global object $post The current post object.
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_file($field, $meta)
-        {
-
-            global $post;
-
-            if (!is_array($meta))
-                $meta = (array)$meta;
-
-            $this->show_field_begin($field, $meta);
-            echo "{$field['desc']}<br />";
-
-            if (!empty($meta)) {
-                $nonce = wp_create_nonce('at_ajax_delete');
-                echo '<div style="margin-bottom: 10px"><strong>' . __('Uploaded files', 'geodirectory') . '</strong></div>';
-                echo '<ol class="at-upload">';
-                foreach ($meta as $att) {
-                    // if (wp_attachment_is_image($att)) continue; // what's image uploader for?
-                    echo "<li>" . wp_get_attachment_link($att, '', false, false, ' ') . " (<a class='at-delete-file' href='#' rel='{$nonce}|{$post->ID}|{$field['id']}|{$att}'>" . __('Remove', 'geodirectory') . "</a>)</li>";
-                }
-                echo '</ol>';
-            }
-
-            // show form upload
-
-            echo "<div class='at-file-upload-label'>";
-            echo "<strong>" . __('Upload new files', 'geodirectory') . "</strong>";
-            echo "</div>";
-            echo "<div class='new-files'>";
-            echo "<div class='file-input'>";
-            echo "<input type='file' name='{$field['id']}[]' />";
-            echo "</div><!-- End .file-input -->";
-            echo "<a class='at-add-file button' href='#'>" . __('Add more files', 'geodirectory') . "</a>";
-            echo "</div><!-- End .new-files -->";
-            echo "</td>";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Image Field.
-         *
-         * @param array $field
-         * @param array $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_image($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_" . $field['id'], false, false);
-            if (is_array($meta)) {
-                if (isset($meta[0]) && is_array($meta[0]))
-                    $meta = $meta[0];
-            }
-
-            $uploads = wp_upload_dir();
-            if (is_array($meta) && isset($meta['src']) && $meta['src'] != '') {
-                $file_info = pathinfo($meta['src']);
-
-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
-                    $sub_dir = $file_info['dirname'];
-
-                $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
-                $uploads_baseurl = $uploads['baseurl'];
-                $uploads_path = $uploads['path'];
-
-                $file_name = $file_info['basename'];
-
-                if (strpos($sub_dir, 'https://') !== false) {
-                    $uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
-                } else {
-                    $uploads['baseurl'] = str_replace('https://', 'http://', $uploads['baseurl']);
-                }
-                $sub_dir = str_replace($uploads['baseurl'], '', $sub_dir);
-
-                $uploads_url = $uploads_baseurl . $sub_dir;
-
-                $meta['src'] = $uploads_url . '/' . $file_name;
-
-                $html .= "<span class='mupload_img_holder'><img src='" . $meta['src'] . "' style='max-height: 150px;max-width: 150px;' /></span>";
-                $html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='" . $meta['id'] . "' />";
-                $html .= "<input type='hidden' class='" . $field['id'] . "[src]' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='" . $meta['src'] . "' />";
-                $html .= "<input class='at-delete_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Remove Image', 'geodirectory') . "' />";
-            } else {
-                $html .= "<span class='mupload_img_holder'></span>";
-                $html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='' />";
-                $html .= "<input class='" . $field['id'] . "[src]' style='position:absolute;left:-500px;width:50px;' type='text' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='' />";
-                $html .= "<input class='at-upload_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Upload Image', 'geodirectory') . "' />";
-            }
-            echo $html;
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Color Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_color($field, $meta)
-        {
-
-            if (empty($meta))
-                $meta = '#';
-
-            $this->show_field_begin($field, $meta);
-
-            echo "<input class='at-color' type='text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='8' />";
-            //	echo "<a href='#' class='at-color-select button' rel='{$field['id']}'>" . __( 'Select a color' ) . "</a>";
-            echo "<input type='button' class='at-color-select button' rel='{$field['id']}' value='" . __('Select a color', 'geodirectory') . "'/>";
-            echo "<div style='display:none' class='at-color-picker' rel='{$field['id']}'></div>";
-            $this->show_field_end($field, $meta);
-
-        }
-
-        /**
-         * Show Checkbox List Field
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_checkbox_list($field, $meta)
-        {
-
-            if (!is_array($meta))
-                $meta = (array)$meta;
-
-            $this->show_field_begin($field, $meta);
-
-            $html = array();
-
-            foreach ($field['options'] as $key => $value) {
-                $html[] = "<input type='checkbox' class='at-checkbox_list' name='{$field['id']}[]' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> {$value}";
-            }
-
-            echo implode('<br />', $html);
-
-            $this->show_field_end($field, $meta);
-
-        }
-
-        /**
-         * Show Date Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_date($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<input type='text' class='at-date' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show time field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_time($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<input type='text' class='at-time' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Posts field.
-         * used creating a posts/pages/custom types checkboxlist or a select dropdown
-         *
-         * @global object $post The current post object.
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_posts($field, $meta)
-        {
-            global $post;
-
-            if (!is_array($meta)) $meta = (array)$meta;
-            $this->show_field_begin($field, $meta);
-            $options = $field['options'];
-            $posts = get_posts($options['args']);
-
-            // checkbox_list
-            if ('checkbox_list' == $options['type']) {
-                foreach ($posts as $p) {
-                    echo "<input type='checkbox' name='{$field['id']}[]' value='$p->ID'" . checked(in_array($p->ID, $meta), true, false) . " /> $p->post_title<br/>";
-                }
-            } // select
-            else {
-                echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
-                foreach ($posts as $p) {
-                    echo "<option value='$p->ID'" . selected(in_array($p->ID, $meta), true, false) . ">$p->post_title</option>";
-                }
-                echo "</select>";
-            }
-
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Taxonomy field.
-         * used creating a category/tags/custom taxonomy checkboxlist or a select dropdown
-         *
-         * @global object $post The current post object.
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         *
-         * @uses get_terms()
-         */
-        public function show_field_taxonomy($field, $meta)
-        {
-            global $post;
-
-            if (!is_array($meta)) $meta = (array)$meta;
-            $this->show_field_begin($field, $meta);
-            $options = $field['options'];
-            $terms = get_terms($options['taxonomy'], $options['args']);
-
-            // checkbox_list
-            if ('checkbox_list' == $options['type']) {
-                foreach ($terms as $term) {
-                    echo "<input type='checkbox' name='{$field['id']}[]' value='$term->slug'" . checked(in_array($term->slug, $meta), true, false) . " /> $term->name<br/>";
-                }
-            } // select
-            else {
-                echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
-                foreach ($terms as $term) {
-                    echo "<option value='$term->slug'" . selected(in_array($term->slug, $meta), true, false) . ">$term->name</option>";
-                }
-                echo "</select>";
-            }
-
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Save Data from Metabox
-         *
-         * @param string $term_id The term ID.
-         * @since 1.0
-         * @access public
-         * @return string
-         */
-        public function save($term_id)
-        {
-
-            $taxnow = '';
-            if (isset($_POST['taxonomy']))
-                $taxnow = $_POST['taxonomy'];
-
-            if (!isset($term_id)                                                        // Check Revision
-                || (!in_array($taxnow, $this->_meta_box['pages']))                            // Check if current taxonomy type is supported.
-                || (!check_admin_referer(basename(__FILE__), 'tax_meta_class_nonce'))        // Check nonce - Security
-                || (!current_user_can('manage_categories'))
-            )                                // Check permission
-            {
-                return $term_id;
-            }
-
-
-            foreach ($this->_fields as $field) {
-
-                $name = $field['id'];
-                $type = $field['type'];
-                $old = $this->get_tax_meta($term_id, $name, !$field['multiple']);
-                $new = (isset($_POST[$name])) ? $_POST[$name] : (($field['multiple']) ? array() : '');
-
-                // Validate meta value
-                if (class_exists('Tax_Meta_Validate') && method_exists('Tax_Meta_Validate', $field['validate_func'])) {
-                    $new = call_user_func(array('Tax_Meta_Validate', $field['validate_func']), $new);
-                }
-
-
-                if ($name == 'ct_cat_icon') {
-
-                    $upload_dir = wp_upload_dir();
-
-                    $image_name_arr = explode('/', $new['src']);
-                    //$old_filename = end($image_name_arr);
-                    //$img_name_arr = explode('.',$old_filename);
-
-                    //$old_filename = $upload_dir['path'].'/'.$old_filename;
-
-                    $new_filename = $upload_dir['path'] . '/' . 'cat_icon_' . $term_id . '.png';
-
-                    /*rename($old_filename, $new_filename);
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Begin Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_begin($field, $meta)
+		{
+			if (isset($field['group'])) {
+				if ($field['group'] == "start") {
+					echo "<td class='at-field'>";
+				}
+			} else {
+				if ($this->_form_type == 'edit') {
+					echo '<th valign="top" scope="row">';
+				} else {
+					if ($field['validate_func']) {
+						echo '<td><div class="form-field form-required">';
+					} else {
+						echo '<td><div class="form-field">';
+					}
+				}
+			}
+			if ($field['name'] != '' || $field['name'] != FALSE) {
+				//echo "<div class='at-label'>";
+				echo "<label for='{$field['id']}'>{$field['name']}</label>";
+				//echo "</div>";
+			}
+			if ($this->_form_type == 'edit') {
+				echo '</th><td>';
+			}
+		}
+
+		/**
+		 * End Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_end($field, $meta = NULL, $group = false)
+		{
+			if (isset($field['group'])) {
+				if ($group == 'end') {
+					if ($field['desc'] != '') {
+						echo "<p class='desc-field'>{$field['desc']}</p></td>";
+					} else {
+						echo "</td>";
+					}
+				} else {
+					if ($field['desc'] != '') {
+						echo "<p class='desc-field'>{$field['desc']}</p><br/>";
+					} else {
+						echo '<br/>';
+					}
+				}
+			} else {
+				if ($field['desc'] != '') {
+					echo "<p class='desc-field'>{$field['desc']}</p>";
+				}
+				if ($this->_form_type == 'edit') {
+					echo '</td>';
+				} else {
+					echo '</td></div>';
+				}
+			}
+		}
+
+		/**
+		 * Show Field Text.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_text($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<input type='text' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='30' />";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Field hidden.
+		 *
+		 * @param string $field
+		 * @param string|mixed $meta
+		 * @since 0.1.3
+		 * @access public
+		 */
+		public function show_field_hidden($field, $meta)
+		{
+			//$this->show_field_begin( $field, $meta );
+			echo "<input type='hidden' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}'/>";
+			//$this->show_field_end( $field, $meta );
+		}
+
+		/**
+		 * Show Field Paragraph.
+		 *
+		 * @param string $field
+		 * @since 0.1.3
+		 * @access public
+		 */
+		public function show_field_paragraph($field)
+		{
+			//$this->show_field_begin( $field, $meta );
+			echo '<p>' . $field['value'] . '</p>';
+			//$this->show_field_end( $field, $meta );
+		}
+
+		/**
+		 * Show Field Textarea.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_textarea($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<textarea class='at-textarea large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Field Select.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_select($field, $meta)
+		{
+
+			if (!is_array($meta))
+				$meta = (array)$meta;
+
+			$this->show_field_begin($field, $meta);
+			echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">";
+			foreach ($field['options'] as $key => $value) {
+				echo "<option value='{$key}'" . selected(in_array($key, $meta), true, false) . ">{$value}</option>";
+			}
+			echo "</select>";
+			$this->show_field_end($field, $meta);
+
+		}
+
+		/**
+		 * Show Radio Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_radio($field, $meta)
+		{
+
+			if (!is_array($meta))
+				$meta = (array)$meta;
+
+			$this->show_field_begin($field, $meta);
+			foreach ($field['options'] as $key => $value) {
+				echo "<input type='radio' class='at-radio' name='{$field['id']}' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> <span class='at-radio-label'>{$value}</span>";
+			}
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Checkbox Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_checkbox($field, $meta)
+		{
+
+			$this->show_field_begin($field, $meta);
+			echo "<input type='checkbox' class='rw-checkbox' name='{$field['id']}' id='{$field['id']}'" . checked(!empty($meta), true, false) . " /> {$field['desc']}";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Wysiwig Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_wysiwyg($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			// Add TinyMCE script for WP version < 3.3
+			global $wp_version;
+
+			if (version_compare($wp_version, '3.2.1') < 1) {
+				echo "<textarea class='at-wysiwyg theEditor large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
+			} else {
+				// Use new wp_editor() since WP 3.3
+				wp_editor(stripslashes(html_entity_decode($meta)), $field['id'], array('editor_class' => 'at-wysiwyg'));
+			}
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show File Field.
+		 *
+		 * @global object $post The current post object.
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_file($field, $meta)
+		{
+
+			global $post;
+
+			if (!is_array($meta))
+				$meta = (array)$meta;
+
+			$this->show_field_begin($field, $meta);
+			echo "{$field['desc']}<br />";
+
+			if (!empty($meta)) {
+				$nonce = wp_create_nonce('at_ajax_delete');
+				echo '<div style="margin-bottom: 10px"><strong>' . __('Uploaded files', 'geodirectory') . '</strong></div>';
+				echo '<ol class="at-upload">';
+				foreach ($meta as $att) {
+					// if (wp_attachment_is_image($att)) continue; // what's image uploader for?
+					echo "<li>" . wp_get_attachment_link($att, '', false, false, ' ') . " (<a class='at-delete-file' href='#' rel='{$nonce}|{$post->ID}|{$field['id']}|{$att}'>" . __('Remove', 'geodirectory') . "</a>)</li>";
+				}
+				echo '</ol>';
+			}
+
+			// show form upload
+
+			echo "<div class='at-file-upload-label'>";
+			echo "<strong>" . __('Upload new files', 'geodirectory') . "</strong>";
+			echo "</div>";
+			echo "<div class='new-files'>";
+			echo "<div class='file-input'>";
+			echo "<input type='file' name='{$field['id']}[]' />";
+			echo "</div><!-- End .file-input -->";
+			echo "<a class='at-add-file button' href='#'>" . __('Add more files', 'geodirectory') . "</a>";
+			echo "</div><!-- End .new-files -->";
+			echo "</td>";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Image Field.
+		 *
+		 * @param array $field
+		 * @param array $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_image($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			$html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_" . $field['id'], false, false);
+			if (is_array($meta)) {
+				if (isset($meta[0]) && is_array($meta[0]))
+					$meta = $meta[0];
+			}
+
+			$uploads = wp_upload_dir();
+			if (is_array($meta) && isset($meta['src']) && $meta['src'] != '') {
+				$file_info = pathinfo($meta['src']);
+
+				if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
+					$sub_dir = $file_info['dirname'];
+
+				$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
+				$uploads_baseurl = $uploads['baseurl'];
+				$uploads_path = $uploads['path'];
+
+				$file_name = $file_info['basename'];
+
+				if (strpos($sub_dir, 'https://') !== false) {
+					$uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
+				} else {
+					$uploads['baseurl'] = str_replace('https://', 'http://', $uploads['baseurl']);
+				}
+				$sub_dir = str_replace($uploads['baseurl'], '', $sub_dir);
+
+				$uploads_url = $uploads_baseurl . $sub_dir;
+
+				$meta['src'] = $uploads_url . '/' . $file_name;
+
+				$html .= "<span class='mupload_img_holder'><img src='" . $meta['src'] . "' style='max-height: 150px;max-width: 150px;' /></span>";
+				$html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='" . $meta['id'] . "' />";
+				$html .= "<input type='hidden' class='" . $field['id'] . "[src]' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='" . $meta['src'] . "' />";
+				$html .= "<input class='at-delete_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Remove Image', 'geodirectory') . "' />";
+			} else {
+				$html .= "<span class='mupload_img_holder'></span>";
+				$html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='' />";
+				$html .= "<input class='" . $field['id'] . "[src]' style='position:absolute;left:-500px;width:50px;' type='text' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='' />";
+				$html .= "<input class='at-upload_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Upload Image', 'geodirectory') . "' />";
+			}
+			echo $html;
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Color Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_color($field, $meta)
+		{
+
+			if (empty($meta))
+				$meta = '#';
+
+			$this->show_field_begin($field, $meta);
+
+			echo "<input class='at-color' type='text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='8' />";
+			//	echo "<a href='#' class='at-color-select button' rel='{$field['id']}'>" . __( 'Select a color' ) . "</a>";
+			echo "<input type='button' class='at-color-select button' rel='{$field['id']}' value='" . __('Select a color', 'geodirectory') . "'/>";
+			echo "<div style='display:none' class='at-color-picker' rel='{$field['id']}'></div>";
+			$this->show_field_end($field, $meta);
+
+		}
+
+		/**
+		 * Show Checkbox List Field
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_checkbox_list($field, $meta)
+		{
+
+			if (!is_array($meta))
+				$meta = (array)$meta;
+
+			$this->show_field_begin($field, $meta);
+
+			$html = array();
+
+			foreach ($field['options'] as $key => $value) {
+				$html[] = "<input type='checkbox' class='at-checkbox_list' name='{$field['id']}[]' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> {$value}";
+			}
+
+			echo implode('<br />', $html);
+
+			$this->show_field_end($field, $meta);
+
+		}
+
+		/**
+		 * Show Date Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_date($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<input type='text' class='at-date' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show time field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_time($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<input type='text' class='at-time' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Posts field.
+		 * used creating a posts/pages/custom types checkboxlist or a select dropdown
+		 *
+		 * @global object $post The current post object.
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_posts($field, $meta)
+		{
+			global $post;
+
+			if (!is_array($meta)) $meta = (array)$meta;
+			$this->show_field_begin($field, $meta);
+			$options = $field['options'];
+			$posts = get_posts($options['args']);
+
+			// checkbox_list
+			if ('checkbox_list' == $options['type']) {
+				foreach ($posts as $p) {
+					echo "<input type='checkbox' name='{$field['id']}[]' value='$p->ID'" . checked(in_array($p->ID, $meta), true, false) . " /> $p->post_title<br/>";
+				}
+			} // select
+			else {
+				echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
+				foreach ($posts as $p) {
+					echo "<option value='$p->ID'" . selected(in_array($p->ID, $meta), true, false) . ">$p->post_title</option>";
+				}
+				echo "</select>";
+			}
+
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Taxonomy field.
+		 * used creating a category/tags/custom taxonomy checkboxlist or a select dropdown
+		 *
+		 * @global object $post The current post object.
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 *
+		 * @uses get_terms()
+		 */
+		public function show_field_taxonomy($field, $meta)
+		{
+			global $post;
+
+			if (!is_array($meta)) $meta = (array)$meta;
+			$this->show_field_begin($field, $meta);
+			$options = $field['options'];
+			$terms = get_terms($options['taxonomy'], $options['args']);
+
+			// checkbox_list
+			if ('checkbox_list' == $options['type']) {
+				foreach ($terms as $term) {
+					echo "<input type='checkbox' name='{$field['id']}[]' value='$term->slug'" . checked(in_array($term->slug, $meta), true, false) . " /> $term->name<br/>";
+				}
+			} // select
+			else {
+				echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
+				foreach ($terms as $term) {
+					echo "<option value='$term->slug'" . selected(in_array($term->slug, $meta), true, false) . ">$term->name</option>";
+				}
+				echo "</select>";
+			}
+
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Save Data from Metabox
+		 *
+		 * @param string $term_id The term ID.
+		 * @since 1.0
+		 * @access public
+		 * @return string
+		 */
+		public function save($term_id)
+		{
+
+			$taxnow = '';
+			if (isset($_POST['taxonomy']))
+				$taxnow = $_POST['taxonomy'];
+
+			if (!isset($term_id)                                                        // Check Revision
+				|| (!in_array($taxnow, $this->_meta_box['pages']))                            // Check if current taxonomy type is supported.
+				|| (!check_admin_referer(basename(__FILE__), 'tax_meta_class_nonce'))        // Check nonce - Security
+				|| (!current_user_can('manage_categories'))
+			)                                // Check permission
+			{
+				return $term_id;
+			}
+
+
+			foreach ($this->_fields as $field) {
+
+				$name = $field['id'];
+				$type = $field['type'];
+				$old = $this->get_tax_meta($term_id, $name, !$field['multiple']);
+				$new = (isset($_POST[$name])) ? $_POST[$name] : (($field['multiple']) ? array() : '');
+
+				// Validate meta value
+				if (class_exists('Tax_Meta_Validate') && method_exists('Tax_Meta_Validate', $field['validate_func'])) {
+					$new = call_user_func(array('Tax_Meta_Validate', $field['validate_func']), $new);
+				}
+
+
+				if ($name == 'ct_cat_icon') {
+
+					$upload_dir = wp_upload_dir();
+
+					$image_name_arr = explode('/', $new['src']);
+					//$old_filename = end($image_name_arr);
+					//$img_name_arr = explode('.',$old_filename);
+
+					//$old_filename = $upload_dir['path'].'/'.$old_filename;
+
+					$new_filename = $upload_dir['path'] . '/' . 'cat_icon_' . $term_id . '.png';
+
+					/*rename($old_filename, $new_filename);
 				
 				//subdir
 				$new['src'] = $upload_dir['url'].'/'.'cat_icon_'.$term_id.'.png';
@@ -1190,7 +1190,7 @@ 
 				update_attached_file( $new['id'], $new['src'] );*/
 
 
-                    /*	
+					/*	
 		
 		$new['src'] = $upload_dir['url'].'/'.'cat_icon_'.$term_id.'.png';
 		
@@ -1215,67 +1215,67 @@ 
 		$attach_id = wp_insert_attachment( $attachment, $filename);*/
 
 
-                }
-
-
-                //skip on Paragraph field
-                if ($type != "paragraph") {
-
-                    // Call defined method to save meta value, if there's no methods, call common one.
-                    $save_func = 'save_field_' . $type;
-                    if (method_exists($this, $save_func)) {
-                        call_user_func(array(&$this, 'save_field_' . $type), $term_id, $field, $old, $new);
-                    } else {
-                        $this->save_field($term_id, $field, $old, $new);
-                    }
-                }
-
-            } // End foreach
-
-        }
-
-        /**
-         * Common function for saving fields.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string|mixed $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field($term_id, $field, $old, $new)
-        {
-            $name = $field['id'];
-            $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array())
-                return;
-
-            $this->update_tax_meta($term_id, $name, $new);
-        }
-
-        /**
-         * function for saving image field.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string|mixed $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field_image($term_id, $field, $old, $new)
-        {
-            $name = $field['id'];
-
-            $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '')
-                return;
-
-            $this->update_tax_meta($term_id, $name, $new);
-        }
-
-        /*
+				}
+
+
+				//skip on Paragraph field
+				if ($type != "paragraph") {
+
+					// Call defined method to save meta value, if there's no methods, call common one.
+					$save_func = 'save_field_' . $type;
+					if (method_exists($this, $save_func)) {
+						call_user_func(array(&$this, 'save_field_' . $type), $term_id, $field, $old, $new);
+					} else {
+						$this->save_field($term_id, $field, $old, $new);
+					}
+				}
+
+			} // End foreach
+
+		}
+
+		/**
+		 * Common function for saving fields.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string|mixed $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field($term_id, $field, $old, $new)
+		{
+			$name = $field['id'];
+			$this->delete_tax_meta($term_id, $name);
+			if ($new === '' || $new === array())
+				return;
+
+			$this->update_tax_meta($term_id, $name, $new);
+		}
+
+		/**
+		 * function for saving image field.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string|mixed $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field_image($term_id, $field, $old, $new)
+		{
+			$name = $field['id'];
+
+			$this->delete_tax_meta($term_id, $name);
+			if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '')
+				return;
+
+			$this->update_tax_meta($term_id, $name, $new);
+		}
+
+		/*
 	 * Save Wysiwyg Field.
 	 *
 	 * @param string $term_id The term ID. 
@@ -1285,806 +1285,806 @@ 
 	 * @since 1.0
 	 * @access public 
 	 */
-        public function save_field_wysiwyg($term_id, $field, $old, $new)
-        {
-            $this->save_field($term_id, $field, $old, $new);
-        }
-
-        /**
-         * Save repeater Fields.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string|mixed $old
-         * @param string|mixed $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field_repeater($term_id, $field, $old, $new)
-        {
-            if (is_array($new) && count($new) > 0) {
-                foreach ($new as $n) {
-                    foreach ($field['fields'] as $f) {
-                        $type = $f['type'];
-                        switch ($type) {
-                            case 'wysiwyg':
-                                $n[$f['id']] = wpautop($n[$f['id']]);
-                                break;
-                            case 'file':
-                                $n[$f['id']] = $this->save_field_file_repeater($term_id, $f, '', $n[$f['id']]);
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                    if (!$this->is_array_empty($n))
-                        $temp[] = $n;
-                }
-                if (isset($temp) && count($temp) > 0 && !$this->is_array_empty($temp)) {
-                    $this->update_tax_meta($term_id, $field['id'], $temp);
-                } else {
-                    //	remove old meta if exists
-                    delete_post_meta($term_id, $field['id']);
-                }
-            } else {
-                //	remove old meta if exists
-                delete_post_meta($term_id, $field['id']);
-            }
-        }
-
-        /**
-         * Save File Field.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field_file($term_id, $field, $old, $new)
-        {
-
-            $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
-            $this->fix_file_array($_FILES[$name]);
-            foreach ($_FILES[$name] as $position => $fileitem) {
-
-                $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
-                $filename = $file['file'];
-
-                $attachment = array(
-                    'post_mime_type' => $file['type'],
-                    'guid' => $file['url'],
-                    'post_parent' => $term_id,
-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
-                    'post_content' => ''
-                );
-
-                $id = wp_insert_attachment($attachment, $filename, $term_id);
-
-                if (!is_wp_error($id)) {
-
-                    wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
-                    add_post_meta($term_id, $name, $id, false);    // save file's url in meta fields
-
-                } // End if
-
-            } // End foreach
-
-        }
-
-        /**
-         * Save repeater File Field.
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string $new
-         * @since 1.0
-         * @access public
-         * @return int|void
-         */
-        public function save_field_file_repeater($term_id, $field, $old, $new)
-        {
-
-            $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
-            $this->fix_file_array($_FILES[$name]);
-            foreach ($_FILES[$name] as $position => $fileitem) {
-
-                $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
-                $filename = $file['file'];
-
-                $attachment = array(
-                    'post_mime_type' => $file['type'],
-                    'guid' => $file['url'],
-                    'post_parent' => $term_id,
-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
-                    'post_content' => ''
-                );
-
-                $id = wp_insert_attachment($attachment, $filename);
-
-                if (!is_wp_error($id)) {
-
-                    wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
-                    return $id;    // return file's url in meta fields
-                } // End if
-            } // End foreach
-        }
-
-        /**
-         * Add missed values for meta box.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function add_missed_values()
-        {
-
-            // Default values for meta box
-            $this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array)$this->_meta_box);
-
-            if(is_array($this->_fields)) {
-                // Default values for fields
-                foreach ($this->_fields as &$field) {
-                    $multiple = in_array($field['type'], array('checkbox_list', 'file', 'image'));
-                    $std = $multiple ? array() : '';
-                    $format = 'date' == $field['type'] ? 'yy-mm-dd' : ('time' == $field['type'] ? 'hh:mm' : '');
-                    $field = array_merge(array('multiple' => $multiple, 'std' => $std, 'desc' => '', 'format' => $format, 'validate_func' => ''), $field);
-                } // End foreach
-            }
-        }
-
-        /**
-         * Check if field with $type exists.
-         *
-         * @param string $type
-         * @since 1.0
-         * @access public
-         */
-        public function has_field($type)
-        {
-            if(is_array($this->_fields)) {
-                foreach ($this->_fields as $field) {
-                    if ($type == $field['type'])
-                        return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Check if current page is edit page.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function is_edit_page()
-        {
-            global $pagenow;
-            return ($pagenow == 'edit-tags.php' || $pagenow == 'term.php');
-        }
-
-        /**
-         * Fixes the odd indexing of multiple file uploads.
-         *
-         * Goes from the format:
-         * $_FILES['field']['key']['index']
-         * to
-         * The More standard and appropriate:
-         * $_FILES['field']['index']['key']
-         *
-         * @param string $files
-         * @since 1.0
-         * @access public
-         */
-        public function fix_file_array(&$files)
-        {
-
-            $output = array();
-
-            foreach ($files as $key => $list) {
-                foreach ($list as $index => $value) {
-                    $output[$index][$key] = $value;
-                }
-            }
-
-            return $files = $output;
-
-        }
-
-        /**
-         * Get proper JQuery UI version.
-         *
-         * Used in order to not conflict with WP Admin Scripts.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function get_jqueryui_ver()
-        {
-
-            global $wp_version;
-
-            if (version_compare($wp_version, '3.1', '>=')) {
-                return '1.8.10';
-            }
-
-            return '1.7.3';
-
-        }
-
-        /**
-         *  Add Field to meta box (generic function)
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         */
-        public function addField($id, $args)
-        {
-            $new_field = array('id' => $id, 'std' => '', 'desc' => '', 'style' => '');
-            $new_field = array_merge($new_field, $args);
-            $this->_fields[] = $new_field;
-        }
-
-
-        /**
-         *  Add Text Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addText($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'text', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Hidden Field to meta box
-         * @author Ohad Raz
-         * @since 0.1.3
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addHidden($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'hidden', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Paragraph to meta box
-         * @author Ohad Raz
-         * @since 0.1.3
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $value  paragraph html
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addParagraph($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'paragraph', 'id' => $id, 'value' => '', 'style' => '');
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Checkbox Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addCheckbox($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'checkbox', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add CheckboxList Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $options (array)  array of key => value pairs for select options
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         *
-         * @return : remember to call: $checkbox_list = $this->get_tax_meta(get_the_ID(), 'meta_name', false);
-         *   which means the last param as false to get the values in an array
-         */
-        public function addCheckboxList($id, $options, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'checkbox_list', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox List Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Textarea Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addTextarea($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'textarea', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Textarea Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Select Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string field id, i.e. the meta key
-         * @param $options (array)  array of key => value pairs for select options
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, (array) optional
-         *    'multiple' => // select multiple values, optional. Default is false.
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addSelect($id, $options, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'select', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Select Field', 'geodirectory'), 'multiple' => false, 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-
-        /**
-         *  Add Radio Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string field id, i.e. the meta key
-         * @param $options (array)  array of key => value pairs for radio options
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addRadio($id, $options, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'radio', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Radio Field', 'geodirectory'), 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Date Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         *    'format' => // date format, default yy-mm-dd. Optional. Default "'d MM, yy'"  See more formats here: http://goo.gl/Wcwxn
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addDate($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'date', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'yy-mm-dd', 'name' => __('Date Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Time Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string- field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         *    'format' => // time format, default hh:mm. Optional. See more formats here: http://goo.gl/83woX
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addTime($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'time', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'hh:mm', 'name' => __('Time Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Color Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addColor($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'color', 'id' => $id, 'std' => '', 'desc' => '', 'name' => __('ColorPicker Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Image Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addImage($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'image', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('Image Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add File Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addFile($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'file', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('File Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add WYSIWYG Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional Default 'width: 300px; height: 400px'
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addWysiwyg($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'wysiwyg', 'id' => $id, 'std' => '', 'desc' => '', 'style' => 'width: 300px; height: 400px', 'name' => __('WYSIWYG Editor Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Taxonomy Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $options mixed|array options of taxonomy field
-         *    'taxonomy' =>    // taxonomy name can be category,post_tag or any custom taxonomy default is category
-         * 'type' =>  // how to show taxonomy? 'select' (default) or 'checkbox_list'
-         * 'args' =>  // arguments to query taxonomy, see http://goo.gl/uAANN default ('hide_empty' => false)
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addTaxonomy($id, $options, $args, $repeater = false)
-        {
-            $q = array('hide_empty' => 0);
-            $tax = 'category';
-            $type = 'select';
-            $temp = array($tax, $type, $q);
-            $options = array_merge($temp, $options);
-            $new_field = array('type' => 'taxonomy', 'id' => $id, 'desc' => '', 'name' => __('Taxonomy Field', 'geodirectory'), 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add posts Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $options mixed|array options of taxonomy field
-         *    'post_type' =>    // post type name, 'post' (default) 'page' or any custom post type
-         * 'type' =>  // how to show posts? 'select' (default) or 'checkbox_list'
-         * 'args' =>  // arguments to query posts, see http://goo.gl/is0yK default ('posts_per_page' => -1)
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addPosts($id, $options, $args, $repeater = false)
-        {
-            $q = array('posts_per_page' => -1);
-            $temp = array('post_type' => 'post', 'type' => 'select', 'args' => $q);
-            $options = array_merge($temp, $options);
-            $new_field = array('type' => 'posts', 'id' => $id, 'desc' => '', 'name' => __('Posts Field', 'geodirectory'), 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add repeater Field Block to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         *    'fields' => //fields to repeater
-         */
-        public function addRepeaterBlock($id, $args)
-        {
-            $new_field = array('type' => 'repeater', 'id' => $id, 'name' => __('Reapeater Field', 'geodirectory'), 'fields' => array(), 'inline' => false);
-            $new_field = array_merge($new_field, $args);
-            $this->_fields[] = $new_field;
-        }
-
-
-        /**
-         * Finish Declaration of Meta Box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         */
-        public function Finish()
-        {
-            $this->add_missed_values();
-            $this->check_field_upload();
-            $this->check_field_color();
-            $this->check_field_date();
-            $this->check_field_time();
-        }
-
-        /**
-         * Helper function to check for empty arrays
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $args mixed|array
-         */
-        public function is_array_empty($array)
-        {
-            if (!is_array($array))
-                return true;
-
-            foreach ($array as $a) {
-                if (is_array($a)) {
-                    foreach ($a as $sub_a) {
-                        if (!empty($sub_a) && $sub_a != '')
-                            return false;
-                    }
-                } else {
-                    if (!empty($a) && $a != '')
-                        return false;
-                }
-            }
-            return true;
-        }
-
-
-        //get term meta field
-        public function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
-        {
-
-            if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-                $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-                $post_type = $taxObject->object_type[0];
-            }
-
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
-
-            $t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
-
-            $m = get_option('tax_meta_' . $post_type  . $t_id);
-            if (isset($m[$key])) {
-                return $m[$key];
-            } else {
-                return '';
-            }
-        }
-
-        //delete meta
-        public function delete_tax_meta($term_id, $key, $post_type = '')
-        {
-
-            if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-                $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-                $post_type = $taxObject->object_type[0];
-            }
-
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
-
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
-
-            if (isset($m[$key])) {
-                unset($m[$key]);
-            }
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
-        }
-
-        //update meta
-        public function update_tax_meta($term_id, $key, $value, $post_type = '')
-        {
-
-            if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-                $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-                $post_type = $taxObject->object_type[0];
-            }
-
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
-
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
-
-            $m[$key] = $value;
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
-
-            /**
-             * Called after the tax meta is updated.
-             *
-             * Used to update things after a GD category is saved.
-             *
-             * @since 1.0.0
-             * @param bool $false False.
-             * @param bool $true True.
-             * @param int $term_id The term id being updated.
-             * @param string $post_type The post type of the cat being updated.
-             */
-            do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);
-        }
-
-
-    } // End Class
+		public function save_field_wysiwyg($term_id, $field, $old, $new)
+		{
+			$this->save_field($term_id, $field, $old, $new);
+		}
+
+		/**
+		 * Save repeater Fields.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string|mixed $old
+		 * @param string|mixed $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field_repeater($term_id, $field, $old, $new)
+		{
+			if (is_array($new) && count($new) > 0) {
+				foreach ($new as $n) {
+					foreach ($field['fields'] as $f) {
+						$type = $f['type'];
+						switch ($type) {
+							case 'wysiwyg':
+								$n[$f['id']] = wpautop($n[$f['id']]);
+								break;
+							case 'file':
+								$n[$f['id']] = $this->save_field_file_repeater($term_id, $f, '', $n[$f['id']]);
+								break;
+							default:
+								break;
+						}
+					}
+					if (!$this->is_array_empty($n))
+						$temp[] = $n;
+				}
+				if (isset($temp) && count($temp) > 0 && !$this->is_array_empty($temp)) {
+					$this->update_tax_meta($term_id, $field['id'], $temp);
+				} else {
+					//	remove old meta if exists
+					delete_post_meta($term_id, $field['id']);
+				}
+			} else {
+				//	remove old meta if exists
+				delete_post_meta($term_id, $field['id']);
+			}
+		}
+
+		/**
+		 * Save File Field.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field_file($term_id, $field, $old, $new)
+		{
+
+			$name = $field['id'];
+			if (empty($_FILES[$name]))
+				return;
+			$this->fix_file_array($_FILES[$name]);
+			foreach ($_FILES[$name] as $position => $fileitem) {
+
+				$file = wp_handle_upload($fileitem, array('test_form' => false));
+				if (empty($file['file']))
+					continue;
+				$filename = $file['file'];
+
+				$attachment = array(
+					'post_mime_type' => $file['type'],
+					'guid' => $file['url'],
+					'post_parent' => $term_id,
+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
+					'post_content' => ''
+				);
+
+				$id = wp_insert_attachment($attachment, $filename, $term_id);
+
+				if (!is_wp_error($id)) {
+
+					wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
+					add_post_meta($term_id, $name, $id, false);    // save file's url in meta fields
+
+				} // End if
+
+			} // End foreach
+
+		}
+
+		/**
+		 * Save repeater File Field.
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string $new
+		 * @since 1.0
+		 * @access public
+		 * @return int|void
+		 */
+		public function save_field_file_repeater($term_id, $field, $old, $new)
+		{
+
+			$name = $field['id'];
+			if (empty($_FILES[$name]))
+				return;
+			$this->fix_file_array($_FILES[$name]);
+			foreach ($_FILES[$name] as $position => $fileitem) {
+
+				$file = wp_handle_upload($fileitem, array('test_form' => false));
+				if (empty($file['file']))
+					continue;
+				$filename = $file['file'];
+
+				$attachment = array(
+					'post_mime_type' => $file['type'],
+					'guid' => $file['url'],
+					'post_parent' => $term_id,
+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
+					'post_content' => ''
+				);
+
+				$id = wp_insert_attachment($attachment, $filename);
+
+				if (!is_wp_error($id)) {
+
+					wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
+					return $id;    // return file's url in meta fields
+				} // End if
+			} // End foreach
+		}
+
+		/**
+		 * Add missed values for meta box.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function add_missed_values()
+		{
+
+			// Default values for meta box
+			$this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array)$this->_meta_box);
+
+			if(is_array($this->_fields)) {
+				// Default values for fields
+				foreach ($this->_fields as &$field) {
+					$multiple = in_array($field['type'], array('checkbox_list', 'file', 'image'));
+					$std = $multiple ? array() : '';
+					$format = 'date' == $field['type'] ? 'yy-mm-dd' : ('time' == $field['type'] ? 'hh:mm' : '');
+					$field = array_merge(array('multiple' => $multiple, 'std' => $std, 'desc' => '', 'format' => $format, 'validate_func' => ''), $field);
+				} // End foreach
+			}
+		}
+
+		/**
+		 * Check if field with $type exists.
+		 *
+		 * @param string $type
+		 * @since 1.0
+		 * @access public
+		 */
+		public function has_field($type)
+		{
+			if(is_array($this->_fields)) {
+				foreach ($this->_fields as $field) {
+					if ($type == $field['type'])
+						return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Check if current page is edit page.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function is_edit_page()
+		{
+			global $pagenow;
+			return ($pagenow == 'edit-tags.php' || $pagenow == 'term.php');
+		}
+
+		/**
+		 * Fixes the odd indexing of multiple file uploads.
+		 *
+		 * Goes from the format:
+		 * $_FILES['field']['key']['index']
+		 * to
+		 * The More standard and appropriate:
+		 * $_FILES['field']['index']['key']
+		 *
+		 * @param string $files
+		 * @since 1.0
+		 * @access public
+		 */
+		public function fix_file_array(&$files)
+		{
+
+			$output = array();
+
+			foreach ($files as $key => $list) {
+				foreach ($list as $index => $value) {
+					$output[$index][$key] = $value;
+				}
+			}
+
+			return $files = $output;
+
+		}
+
+		/**
+		 * Get proper JQuery UI version.
+		 *
+		 * Used in order to not conflict with WP Admin Scripts.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function get_jqueryui_ver()
+		{
+
+			global $wp_version;
+
+			if (version_compare($wp_version, '3.1', '>=')) {
+				return '1.8.10';
+			}
+
+			return '1.7.3';
+
+		}
+
+		/**
+		 *  Add Field to meta box (generic function)
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 */
+		public function addField($id, $args)
+		{
+			$new_field = array('id' => $id, 'std' => '', 'desc' => '', 'style' => '');
+			$new_field = array_merge($new_field, $args);
+			$this->_fields[] = $new_field;
+		}
+
+
+		/**
+		 *  Add Text Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addText($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'text', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Hidden Field to meta box
+		 * @author Ohad Raz
+		 * @since 0.1.3
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addHidden($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'hidden', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Paragraph to meta box
+		 * @author Ohad Raz
+		 * @since 0.1.3
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $value  paragraph html
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addParagraph($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'paragraph', 'id' => $id, 'value' => '', 'style' => '');
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Checkbox Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addCheckbox($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'checkbox', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add CheckboxList Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $options (array)  array of key => value pairs for select options
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 *
+		 * @return : remember to call: $checkbox_list = $this->get_tax_meta(get_the_ID(), 'meta_name', false);
+		 *   which means the last param as false to get the values in an array
+		 */
+		public function addCheckboxList($id, $options, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'checkbox_list', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox List Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Textarea Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addTextarea($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'textarea', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Textarea Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Select Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string field id, i.e. the meta key
+		 * @param $options (array)  array of key => value pairs for select options
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, (array) optional
+		 *    'multiple' => // select multiple values, optional. Default is false.
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addSelect($id, $options, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'select', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Select Field', 'geodirectory'), 'multiple' => false, 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+
+		/**
+		 *  Add Radio Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string field id, i.e. the meta key
+		 * @param $options (array)  array of key => value pairs for radio options
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addRadio($id, $options, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'radio', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Radio Field', 'geodirectory'), 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Date Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 *    'format' => // date format, default yy-mm-dd. Optional. Default "'d MM, yy'"  See more formats here: http://goo.gl/Wcwxn
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addDate($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'date', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'yy-mm-dd', 'name' => __('Date Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Time Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string- field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 *    'format' => // time format, default hh:mm. Optional. See more formats here: http://goo.gl/83woX
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addTime($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'time', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'hh:mm', 'name' => __('Time Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Color Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addColor($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'color', 'id' => $id, 'std' => '', 'desc' => '', 'name' => __('ColorPicker Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Image Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addImage($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'image', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('Image Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add File Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addFile($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'file', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('File Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add WYSIWYG Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional Default 'width: 300px; height: 400px'
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addWysiwyg($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'wysiwyg', 'id' => $id, 'std' => '', 'desc' => '', 'style' => 'width: 300px; height: 400px', 'name' => __('WYSIWYG Editor Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Taxonomy Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $options mixed|array options of taxonomy field
+		 *    'taxonomy' =>    // taxonomy name can be category,post_tag or any custom taxonomy default is category
+		 * 'type' =>  // how to show taxonomy? 'select' (default) or 'checkbox_list'
+		 * 'args' =>  // arguments to query taxonomy, see http://goo.gl/uAANN default ('hide_empty' => false)
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addTaxonomy($id, $options, $args, $repeater = false)
+		{
+			$q = array('hide_empty' => 0);
+			$tax = 'category';
+			$type = 'select';
+			$temp = array($tax, $type, $q);
+			$options = array_merge($temp, $options);
+			$new_field = array('type' => 'taxonomy', 'id' => $id, 'desc' => '', 'name' => __('Taxonomy Field', 'geodirectory'), 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add posts Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $options mixed|array options of taxonomy field
+		 *    'post_type' =>    // post type name, 'post' (default) 'page' or any custom post type
+		 * 'type' =>  // how to show posts? 'select' (default) or 'checkbox_list'
+		 * 'args' =>  // arguments to query posts, see http://goo.gl/is0yK default ('posts_per_page' => -1)
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addPosts($id, $options, $args, $repeater = false)
+		{
+			$q = array('posts_per_page' => -1);
+			$temp = array('post_type' => 'post', 'type' => 'select', 'args' => $q);
+			$options = array_merge($temp, $options);
+			$new_field = array('type' => 'posts', 'id' => $id, 'desc' => '', 'name' => __('Posts Field', 'geodirectory'), 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add repeater Field Block to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 *    'fields' => //fields to repeater
+		 */
+		public function addRepeaterBlock($id, $args)
+		{
+			$new_field = array('type' => 'repeater', 'id' => $id, 'name' => __('Reapeater Field', 'geodirectory'), 'fields' => array(), 'inline' => false);
+			$new_field = array_merge($new_field, $args);
+			$this->_fields[] = $new_field;
+		}
+
+
+		/**
+		 * Finish Declaration of Meta Box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 */
+		public function Finish()
+		{
+			$this->add_missed_values();
+			$this->check_field_upload();
+			$this->check_field_color();
+			$this->check_field_date();
+			$this->check_field_time();
+		}
+
+		/**
+		 * Helper function to check for empty arrays
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $args mixed|array
+		 */
+		public function is_array_empty($array)
+		{
+			if (!is_array($array))
+				return true;
+
+			foreach ($array as $a) {
+				if (is_array($a)) {
+					foreach ($a as $sub_a) {
+						if (!empty($sub_a) && $sub_a != '')
+							return false;
+					}
+				} else {
+					if (!empty($a) && $a != '')
+						return false;
+				}
+			}
+			return true;
+		}
+
+
+		//get term meta field
+		public function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
+		{
+
+			if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+				$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+				$post_type = $taxObject->object_type[0];
+			}
+
+			if($post_type=='post'){$post_type='';}
+			if($post_type){$post_type = $post_type.'_';}
+
+			$t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
+
+			$m = get_option('tax_meta_' . $post_type  . $t_id);
+			if (isset($m[$key])) {
+				return $m[$key];
+			} else {
+				return '';
+			}
+		}
+
+		//delete meta
+		public function delete_tax_meta($term_id, $key, $post_type = '')
+		{
+
+			if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+				$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+				$post_type = $taxObject->object_type[0];
+			}
+
+			if($post_type=='post'){$post_type='';}
+			if($post_type){$post_type = $post_type.'_';}
+
+			$m = get_option('tax_meta_' . $post_type  . $term_id);
+
+			if (isset($m[$key])) {
+				unset($m[$key]);
+			}
+			update_option('tax_meta_' . $post_type  . $term_id, $m);
+		}
+
+		//update meta
+		public function update_tax_meta($term_id, $key, $value, $post_type = '')
+		{
+
+			if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+				$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+				$post_type = $taxObject->object_type[0];
+			}
+
+			if($post_type=='post'){$post_type='';}
+			if($post_type){$post_type = $post_type.'_';}
+
+			$m = get_option('tax_meta_' . $post_type  . $term_id);
+
+			$m[$key] = $value;
+			update_option('tax_meta_' . $post_type  . $term_id, $m);
+
+			/**
+			 * Called after the tax meta is updated.
+			 *
+			 * Used to update things after a GD category is saved.
+			 *
+			 * @since 1.0.0
+			 * @param bool $false False.
+			 * @param bool $true True.
+			 * @param int $term_id The term id being updated.
+			 * @param string $post_type The post type of the cat being updated.
+			 */
+			do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);
+		}
+
+
+	} // End Class
 
 endif; // End Check Class Exists
 
@@ -2094,79 +2094,79 @@ 
 
 //get term meta field
 if (!function_exists('geodir_get_tax_meta')) {
-    function geodir_get_tax_meta($term_id, $key, $multi = false, $post_type = '') {
-        if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-            $taxObject = get_taxonomy($_REQUEST['taxonomy']);
+	function geodir_get_tax_meta($term_id, $key, $multi = false, $post_type = '') {
+		if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+			$taxObject = get_taxonomy($_REQUEST['taxonomy']);
             
-            if (!empty($taxObject->object_type)) {
-                $post_type = $taxObject->object_type[0];
-            }
-        }
-
-        if ($post_type == 'post') {
-            $post_type = '';
-        }
-        if ($post_type) {
-            $post_type = $post_type . '_';
-        }
-
-        $t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
-
-        $m = get_option('tax_meta_' . $post_type  . $t_id);
-        if (isset($m[$key])) {
-            return $m[$key];
-        } else {
-            return '';
-        }
-    }
+			if (!empty($taxObject->object_type)) {
+				$post_type = $taxObject->object_type[0];
+			}
+		}
+
+		if ($post_type == 'post') {
+			$post_type = '';
+		}
+		if ($post_type) {
+			$post_type = $post_type . '_';
+		}
+
+		$t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
+
+		$m = get_option('tax_meta_' . $post_type  . $t_id);
+		if (isset($m[$key])) {
+			return $m[$key];
+		} else {
+			return '';
+		}
+	}
 }
 
 //delete meta
 if (!function_exists('geodir_delete_tax_meta')) {
-    function geodir_delete_tax_meta($term_id, $key) {
-        $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-        $post_type = !empty($taxObject->object_type) ? $taxObject->object_type[0] : '';
-
-        if ($post_type == 'post') {
-            $post_type = '';
-        }
-        if ($post_type) {
-            $post_type = $post_type . '_';
-        }
-
-        $m = get_option('tax_meta_' . $post_type . $term_id);
-
-        if (isset($m[$key])) {
-            unset($m[$key]);
-        }
-        update_option('tax_meta_' . $post_type  . $term_id, $m);
-    }
+	function geodir_delete_tax_meta($term_id, $key) {
+		$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+		$post_type = !empty($taxObject->object_type) ? $taxObject->object_type[0] : '';
+
+		if ($post_type == 'post') {
+			$post_type = '';
+		}
+		if ($post_type) {
+			$post_type = $post_type . '_';
+		}
+
+		$m = get_option('tax_meta_' . $post_type . $term_id);
+
+		if (isset($m[$key])) {
+			unset($m[$key]);
+		}
+		update_option('tax_meta_' . $post_type  . $term_id, $m);
+	}
 }
 
 //update meta
 if (!function_exists('geodir_update_tax_meta')) {
-    function geodir_update_tax_meta($term_id, $key, $value, $post_type = '') {
-        if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-            $taxObject = get_taxonomy($_REQUEST['taxonomy']);
+	function geodir_update_tax_meta($term_id, $key, $value, $post_type = '') {
+		if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+			$taxObject = get_taxonomy($_REQUEST['taxonomy']);
             
-            if (!empty($taxObject->object_type)) {
-                $post_type = $taxObject->object_type[0];
-            }
-        }
-
-        if ($post_type == 'post') {
-            $post_type = '';
-        }
-        if ($post_type) {
-            $post_type = $post_type . '_';
-        }
-
-        $m = get_option('tax_meta_' . $post_type  . $term_id);
-
-        $m[$key] = $value;
-        update_option('tax_meta_' . $post_type . $term_id, $m);
-
-        /** This action is documented in geodirectory-functions/cat-meta-functions/Tax-meta-class.php */
-        do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);
-    }
+			if (!empty($taxObject->object_type)) {
+				$post_type = $taxObject->object_type[0];
+			}
+		}
+
+		if ($post_type == 'post') {
+			$post_type = '';
+		}
+		if ($post_type) {
+			$post_type = $post_type . '_';
+		}
+
+		$m = get_option('tax_meta_' . $post_type  . $term_id);
+
+		$m[$key] = $value;
+		update_option('tax_meta_' . $post_type . $term_id, $m);
+
+		/** This action is documented in geodirectory-functions/cat-meta-functions/Tax-meta-class.php */
+		do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);
+	}
 }
\ No newline at end of file

Spacing +93 added lines, -93 removed lines

@@ -113,7 +113,7 @@ 
             $this->add_missed_values();
             if (isset($meta_box['use_with_theme']))
                 if ($meta_box['use_with_theme'] === true) {
-                    $this->SelfPath = get_stylesheet_directory_uri() . '/library/cat-meta';
+                    $this->SelfPath = get_stylesheet_directory_uri().'/library/cat-meta';
                 } elseif ($meta_box['use_with_theme'] === false) {
                     $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
                 } else {
@@ -262,7 +262,7 @@ 
                 $li = "<li id='item_{$attachment_id}'>";
                 $li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />";
                 //$li 	.= "<a title='" . __( 'Delete this image' ) . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'>" . __( 'Delete' ) . "</a>";
-                $li .= "<a title='" . __('Remove this image', 'geodirectory') . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'><img src='" . $this->SelfPath . "/images/delete-16.png' alt='" . __('Remove', 'geodirectory') . "' /></a>";
+                $li .= "<a title='".__('Remove this image', 'geodirectory')."' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'><img src='".$this->SelfPath."/images/delete-16.png' alt='".__('Remove', 'geodirectory')."' /></a>";
                 $li .= "<input type='hidden' name='{$id}[]' value='{$attachment_id}' />";
                 $li .= "</li>";
                 $html .= $li;
@@ -335,7 +335,7 @@ 
             $attachment_id = isset($_GET['attachment_id']) ? intval($_GET['attachment_id']) : 0;
             $ok = false;
             if (strpos($field_id, '[') === false) {
-                check_admin_referer("at-delete-mupload_" . urldecode($field_id));
+                check_admin_referer("at-delete-mupload_".urldecode($field_id));
                 if ($term_id > 0)
                     $this->delete_tax_meta($term_id, $field_id);
                 //$ok = wp_delete_attachment( $attachment_id );
@@ -423,8 +423,8 @@ 
 
             if ($this->has_field('date') && $this->is_edit_page()) {
                 // Enqueu JQuery UI, use proper version.
-                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css');
-                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'));
+                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/themes/base/jquery-ui.css');
+                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/jquery-ui.min.js', array('jquery'));
             }
 
         }
@@ -441,8 +441,8 @@ 
             if ($this->has_field('time') && $this->is_edit_page()) {
 
                 // Enqueu JQuery UI, use proper version.
-                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css', array(), false, true);
-                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'), false, true);
+                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/themes/base/jquery-ui.css', array(), false, true);
+                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/jquery-ui.min.js', array('jquery'), false, true);
                 wp_enqueue_script('at-timepicker', 'https://github.com/trentrichardson/jQuery-Timepicker-Addon/raw/master/jquery-ui-timepicker-addon.js', array('tmc-jquery-ui'), false, true);
 
             }
@@ -462,13 +462,13 @@ 
             if (!empty($this->_meta_box['pages'])) {
                 foreach ($this->_meta_box['pages'] as $page) {
                     //add fields to edit form
-                    add_action($page . '_edit_form_fields', array(&$this, 'show_edit_form'));
+                    add_action($page.'_edit_form_fields', array(&$this, 'show_edit_form'));
                     //add fields to add new form
-                    add_action($page . '_add_form_fields', array(&$this, 'show_new_form'));
+                    add_action($page.'_add_form_fields', array(&$this, 'show_new_form'));
                     // this saves the edit fields
-                    add_action('edited_' . $page, array(&$this, 'save'), 10, 2);
+                    add_action('edited_'.$page, array(&$this, 'save'), 10, 2);
                     // this saves the add fields
-                    add_action('created_' . $page, array(&$this, 'save'), 10, 2);
+                    add_action('created_'.$page, array(&$this, 'save'), 10, 2);
                 }
             }
 
@@ -517,13 +517,13 @@ 
                     $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
 
                 if ($field['validate_func']) {
-                    echo '<tr class="form-field form-required ' . $field['style'] . '">';
+                    echo '<tr class="form-field form-required '.$field['style'].'">';
                 } else {
-                    echo '<tr class="form-field ' . $field['style'] . '">';
+                    echo '<tr class="form-field '.$field['style'].'">';
                 }
 
                 // Call Separated methods for displaying each type of field.
-                call_user_func(array(&$this, 'show_field_' . $field['type']), $field, $meta);
+                call_user_func(array(&$this, 'show_field_'.$field['type']), $field, $meta);
                 echo '</tr>';
             }
             echo '</table>';
@@ -550,14 +550,14 @@ 
                 foreach ($meta as $me) {
                     //for labling toggles
                     $mmm = $me[$field['fields'][0]['id']];
-                    echo '<div class="at-repater-block">' . $mmm . '<br/><table class="repeater-table" style="display: none;">';
+                    echo '<div class="at-repater-block">'.$mmm.'<br/><table class="repeater-table" style="display: none;">';
                     if ($field['inline']) {
                         echo '<tr class="at-inline" VALIGN="top">';
                     }
                     foreach ($field['fields'] as $f) {
                         //reset var $id for repeater
                         $id = '';
-                        $id = $field['id'] . '[' . $c . '][' . $f['id'] . ']';
+                        $id = $field['id'].'['.$c.']['.$f['id'].']';
                         $m = $me[$f['id']];
                         $m = ($m !== '') ? $m : $f['std'];
                         if ('image' != $f['type'] && $f['type'] != 'repeater')
@@ -567,7 +567,7 @@ 
                         if (!$field['inline']) {
                             echo '<tr>';
                         }
-                        call_user_func(array(&$this, 'show_field_' . $f['type']), $f, $m);
+                        call_user_func(array(&$this, 'show_field_'.$f['type']), $f, $m);
                         if (!$field['inline']) {
                             echo '</tr>';
                         }
@@ -578,18 +578,18 @@ 
                     echo '</table>
 				<span class="at-re-toggle"><img src="';
                     if ($this->_Local_images) {
-                        echo $plugin_path . '/images/edit.png';
+                        echo $plugin_path.'/images/edit.png';
                     } else {
                         echo 'http://i.imgur.com/ka0E2.png';
                     }
                     echo '" alt="Edit" title="Edit"/></span> 
 				<img src="';
                     if ($this->_Local_images) {
-                        echo $plugin_path . '/images/remove.png';
+                        echo $plugin_path.'/images/remove.png';
                     } else {
                         echo 'http://i.imgur.com/g8Duj.png';
                     }
-                    echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
+                    echo '" alt="'.__('Remove', 'geodirectory').'" title="'.__('Remove', 'geodirectory').'" id="remove-'.$field['id'].'"></div>';
                     $c = $c + 1;
 
                 }
@@ -598,11 +598,11 @@ 
 
             echo '<img src="';
             if ($this->_Local_images) {
-                echo $plugin_path . '/images/add.png';
+                echo $plugin_path.'/images/add.png';
             } else {
                 echo 'http://i.imgur.com/w5Tuc.png';
             }
-            echo '" alt="' . __('Add', 'geodirectory') . '" title="' . __('Add', 'geodirectory') . '" id="add-' . $field['id'] . '"><br/></div>';
+            echo '" alt="'.__('Add', 'geodirectory').'" title="'.__('Add', 'geodirectory').'" id="add-'.$field['id'].'"><br/></div>';
 
             //create all fields once more for js function and catch with object buffer
             ob_start();
@@ -613,12 +613,12 @@ 
             foreach ($field['fields'] as $f) {
                 //reset var $id for repeater
                 $id = '';
-                $id = $field['id'] . '[CurrentCounter][' . $f['id'] . ']';
+                $id = $field['id'].'[CurrentCounter]['.$f['id'].']';
                 $f['id'] = $id;
                 if (!$field['inline']) {
                     echo '<tr>';
                 }
-                call_user_func(array(&$this, 'show_field_' . $f['type']), $f, '');
+                call_user_func(array(&$this, 'show_field_'.$f['type']), $f, '');
                 if (!$field['inline']) {
                     echo '</tr>';
                 }
@@ -628,24 +628,24 @@ 
             }
             echo '</table><img src="';
             if ($this->_Local_images) {
-                echo $plugin_path . '/images/remove.png';
+                echo $plugin_path.'/images/remove.png';
             } else {
                 echo 'http://i.imgur.com/g8Duj.png';
             }
-            echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
-            $counter = 'countadd_' . $field['id'];
+            echo '" alt="'.__('Remove', 'geodirectory').'" title="'.__('Remove', 'geodirectory').'" id="remove-'.$field['id'].'"></div>';
+            $counter = 'countadd_'.$field['id'];
             $js_code = ob_get_clean();
             $js_code = str_replace("'", "\"", $js_code);
-            $js_code = str_replace("CurrentCounter", "' + " . $counter . " + '", $js_code);
+            $js_code = str_replace("CurrentCounter", "' + ".$counter." + '", $js_code);
             echo '<script>
 				jQuery(document).ready(function() {
-					var ' . $counter . ' = ' . $c . ';
-					jQuery("#add-' . $field['id'] . '").live(\'click\', function() {
-						' . $counter . ' = ' . $counter . ' + 1;
-						jQuery(this).before(\'' . $js_code . '\');						
+					var ' . $counter.' = '.$c.';
+					jQuery("#add-' . $field['id'].'").live(\'click\', function() {
+						' . $counter.' = '.$counter.' + 1;
+						jQuery(this).before(\'' . $js_code.'\');						
 						update_repeater_fields();
 					});
-        			jQuery("#remove-' . $field['id'] . '").live(\'click\', function() {
+        			jQuery("#remove-' . $field['id'].'").live(\'click\', function() {
             			jQuery(this).parent().remove();
         			});
     			});
@@ -772,7 +772,7 @@ 
         public function show_field_paragraph($field)
         {
             //$this->show_field_begin( $field, $meta );
-            echo '<p>' . $field['value'] . '</p>';
+            echo '<p>'.$field['value'].'</p>';
             //$this->show_field_end( $field, $meta );
         }
 
@@ -803,12 +803,12 @@ 
         {
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
-            echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">";
+            echo "<select class='at-select' name='{$field['id']}".($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'").">";
             foreach ($field['options'] as $key => $value) {
-                echo "<option value='{$key}'" . selected(in_array($key, $meta), true, false) . ">{$value}</option>";
+                echo "<option value='{$key}'".selected(in_array($key, $meta), true, false).">{$value}</option>";
             }
             echo "</select>";
             $this->show_field_end($field, $meta);
@@ -827,11 +827,11 @@ 
         {
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
             foreach ($field['options'] as $key => $value) {
-                echo "<input type='radio' class='at-radio' name='{$field['id']}' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> <span class='at-radio-label'>{$value}</span>";
+                echo "<input type='radio' class='at-radio' name='{$field['id']}' value='{$key}'".checked(in_array($key, $meta), true, false)." /> <span class='at-radio-label'>{$value}</span>";
             }
             $this->show_field_end($field, $meta);
         }
@@ -848,7 +848,7 @@ 
         {
 
             $this->show_field_begin($field, $meta);
-            echo "<input type='checkbox' class='rw-checkbox' name='{$field['id']}' id='{$field['id']}'" . checked(!empty($meta), true, false) . " /> {$field['desc']}";
+            echo "<input type='checkbox' class='rw-checkbox' name='{$field['id']}' id='{$field['id']}'".checked(!empty($meta), true, false)." /> {$field['desc']}";
             $this->show_field_end($field, $meta);
         }
 
@@ -890,18 +890,18 @@ 
             global $post;
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
             echo "{$field['desc']}<br />";
 
             if (!empty($meta)) {
                 $nonce = wp_create_nonce('at_ajax_delete');
-                echo '<div style="margin-bottom: 10px"><strong>' . __('Uploaded files', 'geodirectory') . '</strong></div>';
+                echo '<div style="margin-bottom: 10px"><strong>'.__('Uploaded files', 'geodirectory').'</strong></div>';
                 echo '<ol class="at-upload">';
                 foreach ($meta as $att) {
                     // if (wp_attachment_is_image($att)) continue; // what's image uploader for?
-                    echo "<li>" . wp_get_attachment_link($att, '', false, false, ' ') . " (<a class='at-delete-file' href='#' rel='{$nonce}|{$post->ID}|{$field['id']}|{$att}'>" . __('Remove', 'geodirectory') . "</a>)</li>";
+                    echo "<li>".wp_get_attachment_link($att, '', false, false, ' ')." (<a class='at-delete-file' href='#' rel='{$nonce}|{$post->ID}|{$field['id']}|{$att}'>".__('Remove', 'geodirectory')."</a>)</li>";
                 }
                 echo '</ol>';
             }
@@ -909,13 +909,13 @@ 
             // show form upload
 
             echo "<div class='at-file-upload-label'>";
-            echo "<strong>" . __('Upload new files', 'geodirectory') . "</strong>";
+            echo "<strong>".__('Upload new files', 'geodirectory')."</strong>";
             echo "</div>";
             echo "<div class='new-files'>";
             echo "<div class='file-input'>";
             echo "<input type='file' name='{$field['id']}[]' />";
             echo "</div><!-- End .file-input -->";
-            echo "<a class='at-add-file button' href='#'>" . __('Add more files', 'geodirectory') . "</a>";
+            echo "<a class='at-add-file button' href='#'>".__('Add more files', 'geodirectory')."</a>";
             echo "</div><!-- End .new-files -->";
             echo "</td>";
             $this->show_field_end($field, $meta);
@@ -932,7 +932,7 @@ 
         public function show_field_image($field, $meta)
         {
             $this->show_field_begin($field, $meta);
-            $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_" . $field['id'], false, false);
+            $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_".$field['id'], false, false);
             if (is_array($meta)) {
                 if (isset($meta[0]) && is_array($meta[0]))
                     $meta = $meta[0];
@@ -958,19 +958,19 @@ 
                 }
                 $sub_dir = str_replace($uploads['baseurl'], '', $sub_dir);
 
-                $uploads_url = $uploads_baseurl . $sub_dir;
+                $uploads_url = $uploads_baseurl.$sub_dir;
 
-                $meta['src'] = $uploads_url . '/' . $file_name;
+                $meta['src'] = $uploads_url.'/'.$file_name;
 
-                $html .= "<span class='mupload_img_holder'><img src='" . $meta['src'] . "' style='max-height: 150px;max-width: 150px;' /></span>";
-                $html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='" . $meta['id'] . "' />";
-                $html .= "<input type='hidden' class='" . $field['id'] . "[src]' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='" . $meta['src'] . "' />";
-                $html .= "<input class='at-delete_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Remove Image', 'geodirectory') . "' />";
+                $html .= "<span class='mupload_img_holder'><img src='".$meta['src']."' style='max-height: 150px;max-width: 150px;' /></span>";
+                $html .= "<input type='hidden' name='".$field['id']."[id]' id='".$field['id']."[id]' value='".$meta['id']."' />";
+                $html .= "<input type='hidden' class='".$field['id']."[src]' name='".$field['id']."[src]' id='".$field['id']."[src]' value='".$meta['src']."' />";
+                $html .= "<input class='at-delete_image_button' type='button' rel='".$field['id']."' value='".__('Remove Image', 'geodirectory')."' />";
             } else {
                 $html .= "<span class='mupload_img_holder'></span>";
-                $html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='' />";
-                $html .= "<input class='" . $field['id'] . "[src]' style='position:absolute;left:-500px;width:50px;' type='text' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='' />";
-                $html .= "<input class='at-upload_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Upload Image', 'geodirectory') . "' />";
+                $html .= "<input type='hidden' name='".$field['id']."[id]' id='".$field['id']."[id]' value='' />";
+                $html .= "<input class='".$field['id']."[src]' style='position:absolute;left:-500px;width:50px;' type='text' name='".$field['id']."[src]' id='".$field['id']."[src]' value='' />";
+                $html .= "<input class='at-upload_image_button' type='button' rel='".$field['id']."' value='".__('Upload Image', 'geodirectory')."' />";
             }
             echo $html;
             $this->show_field_end($field, $meta);
@@ -994,7 +994,7 @@ 
 
             echo "<input class='at-color' type='text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='8' />";
             //	echo "<a href='#' class='at-color-select button' rel='{$field['id']}'>" . __( 'Select a color' ) . "</a>";
-            echo "<input type='button' class='at-color-select button' rel='{$field['id']}' value='" . __('Select a color', 'geodirectory') . "'/>";
+            echo "<input type='button' class='at-color-select button' rel='{$field['id']}' value='".__('Select a color', 'geodirectory')."'/>";
             echo "<div style='display:none' class='at-color-picker' rel='{$field['id']}'></div>";
             $this->show_field_end($field, $meta);
 
@@ -1012,14 +1012,14 @@ 
         {
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
 
             $html = array();
 
             foreach ($field['options'] as $key => $value) {
-                $html[] = "<input type='checkbox' class='at-checkbox_list' name='{$field['id']}[]' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> {$value}";
+                $html[] = "<input type='checkbox' class='at-checkbox_list' name='{$field['id']}[]' value='{$key}'".checked(in_array($key, $meta), true, false)." /> {$value}";
             }
 
             echo implode('<br />', $html);
@@ -1072,7 +1072,7 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) $meta = (array) $meta;
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $posts = get_posts($options['args']);
@@ -1080,13 +1080,13 @@ 
             // checkbox_list
             if ('checkbox_list' == $options['type']) {
                 foreach ($posts as $p) {
-                    echo "<input type='checkbox' name='{$field['id']}[]' value='$p->ID'" . checked(in_array($p->ID, $meta), true, false) . " /> $p->post_title<br/>";
+                    echo "<input type='checkbox' name='{$field['id']}[]' value='$p->ID'".checked(in_array($p->ID, $meta), true, false)." /> $p->post_title<br/>";
                 }
             } // select
             else {
-                echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
+                echo "<select name='{$field['id']}".($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'").">";
                 foreach ($posts as $p) {
-                    echo "<option value='$p->ID'" . selected(in_array($p->ID, $meta), true, false) . ">$p->post_title</option>";
+                    echo "<option value='$p->ID'".selected(in_array($p->ID, $meta), true, false).">$p->post_title</option>";
                 }
                 echo "</select>";
             }
@@ -1110,7 +1110,7 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) $meta = (array) $meta;
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $terms = get_terms($options['taxonomy'], $options['args']);
@@ -1118,13 +1118,13 @@ 
             // checkbox_list
             if ('checkbox_list' == $options['type']) {
                 foreach ($terms as $term) {
-                    echo "<input type='checkbox' name='{$field['id']}[]' value='$term->slug'" . checked(in_array($term->slug, $meta), true, false) . " /> $term->name<br/>";
+                    echo "<input type='checkbox' name='{$field['id']}[]' value='$term->slug'".checked(in_array($term->slug, $meta), true, false)." /> $term->name<br/>";
                 }
             } // select
             else {
-                echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
+                echo "<select name='{$field['id']}".($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'").">";
                 foreach ($terms as $term) {
-                    echo "<option value='$term->slug'" . selected(in_array($term->slug, $meta), true, false) . ">$term->name</option>";
+                    echo "<option value='$term->slug'".selected(in_array($term->slug, $meta), true, false).">$term->name</option>";
                 }
                 echo "</select>";
             }
@@ -1180,7 +1180,7 @@ 
 
                     //$old_filename = $upload_dir['path'].'/'.$old_filename;
 
-                    $new_filename = $upload_dir['path'] . '/' . 'cat_icon_' . $term_id . '.png';
+                    $new_filename = $upload_dir['path'].'/'.'cat_icon_'.$term_id.'.png';
 
                     /*rename($old_filename, $new_filename);
 				
@@ -1222,9 +1222,9 @@ 
                 if ($type != "paragraph") {
 
                     // Call defined method to save meta value, if there's no methods, call common one.
-                    $save_func = 'save_field_' . $type;
+                    $save_func = 'save_field_'.$type;
                     if (method_exists($this, $save_func)) {
-                        call_user_func(array(&$this, 'save_field_' . $type), $term_id, $field, $old, $new);
+                        call_user_func(array(&$this, 'save_field_'.$type), $term_id, $field, $old, $new);
                     } else {
                         $this->save_field($term_id, $field, $old, $new);
                     }
@@ -1369,7 +1369,7 @@ 
                 if (!is_wp_error($id)) {
 
                     wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
-                    add_post_meta($term_id, $name, $id, false);    // save file's url in meta fields
+                    add_post_meta($term_id, $name, $id, false); // save file's url in meta fields
 
                 } // End if
 
@@ -1414,7 +1414,7 @@ 
                 if (!is_wp_error($id)) {
 
                     wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
-                    return $id;    // return file's url in meta fields
+                    return $id; // return file's url in meta fields
                 } // End if
             } // End foreach
         }
@@ -1429,9 +1429,9 @@ 
         {
 
             // Default values for meta box
-            $this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array)$this->_meta_box);
+            $this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array) $this->_meta_box);
 
-            if(is_array($this->_fields)) {
+            if (is_array($this->_fields)) {
                 // Default values for fields
                 foreach ($this->_fields as &$field) {
                     $multiple = in_array($field['type'], array('checkbox_list', 'file', 'image'));
@@ -1451,7 +1451,7 @@ 
          */
         public function has_field($type)
         {
-            if(is_array($this->_fields)) {
+            if (is_array($this->_fields)) {
                 foreach ($this->_fields as $field) {
                     if ($type == $field['type'])
                         return true;
@@ -2019,12 +2019,12 @@ 
                 $post_type = $taxObject->object_type[0];
             }
 
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
+            if ($post_type == 'post') {$post_type = ''; }
+            if ($post_type) {$post_type = $post_type.'_'; }
 
             $t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
 
-            $m = get_option('tax_meta_' . $post_type  . $t_id);
+            $m = get_option('tax_meta_'.$post_type.$t_id);
             if (isset($m[$key])) {
                 return $m[$key];
             } else {
@@ -2041,15 +2041,15 @@ 
                 $post_type = $taxObject->object_type[0];
             }
 
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
+            if ($post_type == 'post') {$post_type = ''; }
+            if ($post_type) {$post_type = $post_type.'_'; }
 
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
+            $m = get_option('tax_meta_'.$post_type.$term_id);
 
             if (isset($m[$key])) {
                 unset($m[$key]);
             }
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
+            update_option('tax_meta_'.$post_type.$term_id, $m);
         }
 
         //update meta
@@ -2061,13 +2061,13 @@ 
                 $post_type = $taxObject->object_type[0];
             }
 
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
+            if ($post_type == 'post') {$post_type = ''; }
+            if ($post_type) {$post_type = $post_type.'_'; }
 
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
+            $m = get_option('tax_meta_'.$post_type.$term_id);
 
             $m[$key] = $value;
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
+            update_option('tax_meta_'.$post_type.$term_id, $m);
 
             /**
              * Called after the tax meta is updated.
@@ -2107,12 +2107,12 @@ 
             $post_type = '';
         }
         if ($post_type) {
-            $post_type = $post_type . '_';
+            $post_type = $post_type.'_';
         }
 
         $t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
 
-        $m = get_option('tax_meta_' . $post_type  . $t_id);
+        $m = get_option('tax_meta_'.$post_type.$t_id);
         if (isset($m[$key])) {
             return $m[$key];
         } else {
@@ -2131,15 +2131,15 @@ 
             $post_type = '';
         }
         if ($post_type) {
-            $post_type = $post_type . '_';
+            $post_type = $post_type.'_';
         }
 
-        $m = get_option('tax_meta_' . $post_type . $term_id);
+        $m = get_option('tax_meta_'.$post_type.$term_id);
 
         if (isset($m[$key])) {
             unset($m[$key]);
         }
-        update_option('tax_meta_' . $post_type  . $term_id, $m);
+        update_option('tax_meta_'.$post_type.$term_id, $m);
     }
 }
 
@@ -2158,13 +2158,13 @@ 
             $post_type = '';
         }
         if ($post_type) {
-            $post_type = $post_type . '_';
+            $post_type = $post_type.'_';
         }
 
-        $m = get_option('tax_meta_' . $post_type  . $term_id);
+        $m = get_option('tax_meta_'.$post_type.$term_id);
 
         $m[$key] = $value;
-        update_option('tax_meta_' . $post_type . $term_id, $m);
+        update_option('tax_meta_'.$post_type.$term_id, $m);
 
         /** This action is documented in geodirectory-functions/cat-meta-functions/Tax-meta-class.php */
         do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);

Doc Comments +18 added lines, -3 removed lines

@@ -1689,7 +1689,7 @@ 
          * @author Ohad Raz
          * @since 1.0
          * @access public
-         * @param $id string field id, i.e. the meta key
+         * @param string $id string field id, i.e. the meta key
          * @param $options (array)  array of key => value pairs for select options
          * @param $args mixed|array
          *    'name' => // field name/label string optional
@@ -1815,7 +1815,7 @@ 
          * @author Ohad Raz
          * @since 1.0
          * @access public
-         * @param $id string  field id, i.e. the meta key
+         * @param string $id string  field id, i.e. the meta key
          * @param $args mixed|array
          *    'name' => // field name/label string optional
          *    'desc' => // field description, string optional
@@ -1862,7 +1862,7 @@ 
          * @author Ohad Raz
          * @since 1.0
          * @access public
-         * @param $id string  field id, i.e. the meta key
+         * @param string $id string  field id, i.e. the meta key
          * @param $args mixed|array
          *    'name' => // field name/label string optional
          *    'desc' => // field description, string optional
@@ -2053,6 +2053,11 @@ 
         }
 
         //update meta
+
+        /**
+         * @param string $term_id
+         * @param string $key
+         */
         public function update_tax_meta($term_id, $key, $value, $post_type = '')
         {
 
@@ -2094,6 +2099,12 @@ 
 
 //get term meta field
 if (!function_exists('geodir_get_tax_meta')) {
+
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     function geodir_get_tax_meta($term_id, $key, $multi = false, $post_type = '') {
         if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
             $taxObject = get_taxonomy($_REQUEST['taxonomy']);
@@ -2145,6 +2156,10 @@ 
 
 //update meta
 if (!function_exists('geodir_update_tax_meta')) {
+
+    /**
+     * @param string $key
+     */
     function geodir_update_tax_meta($term_id, $key, $value, $post_type = '') {
         if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
             $taxObject = get_taxonomy($_REQUEST['taxonomy']);

geodirectory_template_actions.php

Braces +31 added lines, -24 removed lines

@@ -715,8 +715,9 @@ 
 

                         if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {

                             if ($term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {

-                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '')

-                                    $term_icon = $term_icon_url['src'];

+                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '') {
+                                                                    $term_icon = $term_icon_url['src'];
+                                }
                                 break;

                             }

                         }

@@ -1265,8 +1266,9 @@ 
         echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

     }

 

-    if (isset($taxonomies[$post_type . '_tags']))

-        echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

+    if (isset($taxonomies[$post_type . '_tags'])) {
+            echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';
+    }
 

     ?>

     </p><?php

@@ -1634,23 +1636,21 @@ 
     if(geodir_is_page('pt')){

         $gd_page = 'pt';

         $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

-    }

-    elseif(geodir_is_page('listing')){

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

         $gd_page = 'listing';

         global $wp_query;

         $current_term = $wp_query->get_queried_object();

         if (strpos($current_term->taxonomy,'_tags') !== false) {

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

-        }else{

+        } else{

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

         }

 

-    }

-    elseif(geodir_is_page('author')){

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

         $gd_page = 'author';

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -2074,8 +2074,9 @@ 
  */

 function geodir_action_add_listing_page_title()

 {

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

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

+    if (isset($_REQUEST['listing_type']) && $_REQUEST['listing_type'] != '') {
+            $listing_type = sanitize_text_field($_REQUEST['listing_type']);
+    }
     /** This action is documented in geodirectory_template_actions.php */

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

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

@@ -2087,7 +2088,7 @@ 
         $gd_page = 'add-listing';

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

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

-        }elseif(isset($listing_type)){

+        } elseif(isset($listing_type)){

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

         }

 

@@ -2406,8 +2407,9 @@ 
         $totImg = 0;

         if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

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

-            if (isset($post->post_images))

-                $curImages = trim($post->post_images, ",");

+            if (isset($post->post_images)) {
+                            $curImages = trim($post->post_images, ",");
+            }
 

 

             if ($curImages != '') {

@@ -2435,10 +2437,13 @@ 
             $totImg = count((array)$thumb_img_arr);

         }

 

-        if ($curImages != '')

-            $svalue = $curImages; // this will be initial value of the above form field. Image urls.

-        else

-            $svalue = '';

+        if ($curImages != '') {
+                    $svalue = $curImages;
+        }
+        // this will be initial value of the above form field. Image urls.

+        else {
+                    $svalue = '';
+        }
 

         $image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0';

         $show_image_input_box = ($image_limit != '0');

@@ -2650,8 +2655,9 @@ 
     </script><?php

 

     global $errors;

-    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim')

-        $errors->add('claim_login', LOGIN_CLAIM);

+    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim') {
+            $errors->add('claim_login', LOGIN_CLAIM);
+    }
 

     if (!empty($errors)) {

         foreach ($errors as $errorsObj) {

@@ -2758,8 +2764,9 @@ 
 

     if (!empty($term)) {

         $current_term = get_term_by('slug', $term, $taxonomy[0]);

-        if (!empty($current_term))

-            $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

+        if (!empty($current_term)) {
+                    $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";
+        }
     }

 

 

@@ -2777,7 +2784,7 @@ 
         $gd_page = 'author';

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

Indentation +1852 added lines, -1852 removed lines

@@ -17,10 +17,10 @@ 
  */

 function gd_compat_styles()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo "<style id='gd-compat-styles' type='text/css'>";

-    echo $tc['geodir_theme_compat_css'];

-    echo "</style>";

+	$tc = get_option('theme_compatibility_setting');

+	echo "<style id='gd-compat-styles' type='text/css'>";

+	echo $tc['geodir_theme_compat_css'];

+	echo "</style>";

 }

 

 /**

@@ -31,10 +31,10 @@ 
  */

 function gd_compat_script()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo "<script>";

-    echo $tc['geodir_theme_compat_js'];

-    echo " </script>";

+	$tc = get_option('theme_compatibility_setting');

+	echo "<script>";

+	echo $tc['geodir_theme_compat_js'];

+	echo " </script>";

 }

 

 /**

@@ -47,8 +47,8 @@ 
  */

 function geodir_top_content_add_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo $tc['geodir_top_content_add'];

+	$tc = get_option('theme_compatibility_setting');

+	echo $tc['geodir_top_content_add'];

 }

 

 /**

@@ -61,8 +61,8 @@ 
  */

 function geodir_before_main_content_add_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    echo $tc['geodir_before_main_content_add'];

+	$tc = get_option('theme_compatibility_setting');

+	echo $tc['geodir_before_main_content_add'];

 }

 

 /**

@@ -75,8 +75,8 @@ 
  */

 function geodir_full_page_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_full_page_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_full_page_class_filter'];

 }

 

 /**

@@ -89,8 +89,8 @@ 
  */

 function geodir_before_widget_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_before_widget_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_before_widget_filter'];

 }

 

 /**

@@ -103,8 +103,8 @@ 
  */

 function geodir_after_widget_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_after_widget_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_after_widget_filter'];

 }

 

 /**

@@ -117,8 +117,8 @@ 
  */

 function geodir_before_title_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_before_title_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_before_title_filter'];

 }

 

 /**

@@ -131,8 +131,8 @@ 
  */

 function geodir_after_title_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_after_title_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_after_title_filter'];

 }

 

 /**

@@ -145,8 +145,8 @@ 
  */

 function geodir_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_menu_li_class_filter'];

 }

 

 /**

@@ -159,8 +159,8 @@ 
  */

 function geodir_sub_menu_ul_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_ul_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_ul_class_filter'];

 }

 

 /**

@@ -173,8 +173,8 @@ 
  */

 function geodir_sub_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_li_class_filter'];

 }

 

 /**

@@ -187,8 +187,8 @@ 
  */

 function geodir_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_menu_a_class_filter'];

 }

 

 /**

@@ -201,8 +201,8 @@ 
  */

 function geodir_sub_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_sub_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_sub_menu_a_class_filter'];

 }

 

 /**

@@ -215,8 +215,8 @@ 
  */

 function geodir_location_switcher_menu_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_li_class_filter'];

 }

 

 /**

@@ -229,8 +229,8 @@ 
  */

 function geodir_location_switcher_menu_a_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_a_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_a_class_filter'];

 }

 

 /**

@@ -243,8 +243,8 @@ 
  */

 function geodir_location_switcher_menu_sub_ul_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

 }

 

 /**

@@ -257,8 +257,8 @@ 
  */

 function geodir_location_switcher_menu_sub_li_class_dynamic()

 {

-    $tc = get_option('theme_compatibility_setting');

-    return $tc['geodir_location_switcher_menu_sub_li_class_filter'];

+	$tc = get_option('theme_compatibility_setting');

+	return $tc['geodir_location_switcher_menu_sub_li_class_filter'];

 }

 

 

@@ -275,107 +275,107 @@ 
 function geodir_content_actions_dynamic()

 {

 

-    $tc = get_option('theme_compatibility_setting');

+	$tc = get_option('theme_compatibility_setting');

 //print_r($tc);

-    if (empty($tc)) {

-        return;

-    }

-

-    //php

-    if (!empty($tc['geodir_theme_compat_code'])) {

-        include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

-    }

-

-    //geodir_full_page_class

-    if (!empty($tc['geodir_full_page_class_filter'])) {

-        add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);

-    }

-

-    //widget before filter

-    if (!empty($tc['geodir_before_widget_filter'])) {

-        add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);

-    }

-

-    //widget after filter

-    if (!empty($tc['geodir_after_widget_filter'])) {

-        add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);

-    }

-

-    //widget before title filter

-    if (!empty($tc['geodir_before_title_filter'])) {

-        add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);

-    }

-

-    //widget before title filter

-    if (!empty($tc['geodir_after_title_filter'])) {

-        add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);

-    }

-

-    //menu li class

-    if (!empty($tc['geodir_menu_li_class_filter'])) {

-        add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);

-    }

-

-    //menu ul class

-    if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {

-        add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);

-    }

-

-    //menu sub li class

-    if (!empty($tc['geodir_sub_menu_li_class_filter'])) {

-        add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);

-    }

-

-    //menu a class

-    if (!empty($tc['geodir_menu_a_class_filter'])) {

-        add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);

-    }

-

-    //menu sub a class

-    if (!empty($tc['geodir_sub_menu_a_class_filter'])) {

-        add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);

-    }

-

-    //location menu li class

-    if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);

-    }

-

-    //location menu sub ul class

-    if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);

-    }

-

-    //location menu sub li class

-    if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);

-    }

-

-    //location menu a class

-    if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {

-        add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);

-    }

-

-    // compat styles

-    if (!empty($tc['geodir_theme_compat_css'])) {

-        add_action('wp_head', 'gd_compat_styles');

-    }

-

-    // compat js

-    if (!empty($tc['geodir_theme_compat_js'])) {

-        add_action('wp_footer', 'gd_compat_script');

-    }

-

-

-    // geodir_top_content_add

-    if (!empty($tc['geodir_top_content_add'])) {

-        add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);

-    }

-

-    // geodir_before_main_content_add

-    if (!empty($tc['geodir_before_main_content_add'])) {

-        add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);

-    }

+	if (empty($tc)) {

+		return;

+	}

+

+	//php

+	if (!empty($tc['geodir_theme_compat_code'])) {

+		include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

+	}

+

+	//geodir_full_page_class

+	if (!empty($tc['geodir_full_page_class_filter'])) {

+		add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);

+	}

+

+	//widget before filter

+	if (!empty($tc['geodir_before_widget_filter'])) {

+		add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);

+	}

+

+	//widget after filter

+	if (!empty($tc['geodir_after_widget_filter'])) {

+		add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);

+	}

+

+	//widget before title filter

+	if (!empty($tc['geodir_before_title_filter'])) {

+		add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);

+	}

+

+	//widget before title filter

+	if (!empty($tc['geodir_after_title_filter'])) {

+		add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);

+	}

+

+	//menu li class

+	if (!empty($tc['geodir_menu_li_class_filter'])) {

+		add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);

+	}

+

+	//menu ul class

+	if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {

+		add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);

+	}

+

+	//menu sub li class

+	if (!empty($tc['geodir_sub_menu_li_class_filter'])) {

+		add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);

+	}

+

+	//menu a class

+	if (!empty($tc['geodir_menu_a_class_filter'])) {

+		add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);

+	}

+

+	//menu sub a class

+	if (!empty($tc['geodir_sub_menu_a_class_filter'])) {

+		add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);

+	}

+

+	//location menu li class

+	if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);

+	}

+

+	//location menu sub ul class

+	if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);

+	}

+

+	//location menu sub li class

+	if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);

+	}

+

+	//location menu a class

+	if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {

+		add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);

+	}

+

+	// compat styles

+	if (!empty($tc['geodir_theme_compat_css'])) {

+		add_action('wp_head', 'gd_compat_styles');

+	}

+

+	// compat js

+	if (!empty($tc['geodir_theme_compat_js'])) {

+		add_action('wp_footer', 'gd_compat_script');

+	}

+

+

+	// geodir_top_content_add

+	if (!empty($tc['geodir_top_content_add'])) {

+		add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);

+	}

+

+	// geodir_before_main_content_add

+	if (!empty($tc['geodir_before_main_content_add'])) {

+		add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);

+	}

 

 

 }

@@ -398,23 +398,23 @@ 
  */

 function geodir_action_wrapper_open($type = '', $id = '', $class = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_open_replace'])) {

-        $text = $tc['geodir_wrapper_open_replace'];

-    } else {

-        $text = '<div id="[id]" class="[class]">';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_open_replace'])) {

+		$text = $tc['geodir_wrapper_open_replace'];

+	} else {

+		$text = '<div id="[id]" class="[class]">';

+	}

 

-    if (!empty($tc['geodir_wrapper_open_id'])) {

-        $id = $tc['geodir_wrapper_open_id'];

-    }

-    if (!empty($tc['geodir_wrapper_open_class'])) {

-        $class = $tc['geodir_wrapper_open_class'];

-    }

+	if (!empty($tc['geodir_wrapper_open_id'])) {

+		$id = $tc['geodir_wrapper_open_id'];

+	}

+	if (!empty($tc['geodir_wrapper_open_class'])) {

+		$class = $tc['geodir_wrapper_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

+	$text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the wrapperdiv closing tag

@@ -429,14 +429,14 @@ 
  */

 function geodir_action_wrapper_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_close_replace'])) {

-        $text = $tc['geodir_wrapper_close_replace'];

-    } else {

-        $text = '</div><!-- wrapper ends here-->';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_close_replace'])) {

+		$text = $tc['geodir_wrapper_close_replace'];

+	} else {

+		$text = '</div><!-- wrapper ends here-->';

+	}

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the content div opening tag

@@ -452,35 +452,35 @@ 
  */

 function geodir_action_wrapper_content_open($type = '', $id = '', $class = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_content_open_replace'])) {

-        $text = $tc['geodir_wrapper_content_open_replace'];

-    } else {

-        $text = '<div id="[id]" class="[class]" role="main" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_wrapper_content_open_id'])) {

-        $id = $tc['geodir_wrapper_content_open_id'];

-    }

-    if (!empty($tc['geodir_wrapper_content_open_class'])) {

-        $class = $tc['geodir_wrapper_content_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_content_open_replace'])) {

+		$text = $tc['geodir_wrapper_content_open_replace'];

+	} else {

+		$text = '<div id="[id]" class="[class]" role="main" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_wrapper_content_open_id'])) {

+		$id = $tc['geodir_wrapper_content_open_id'];

+	}

+	if (!empty($tc['geodir_wrapper_content_open_class'])) {

+		$class = $tc['geodir_wrapper_content_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -494,13 +494,13 @@ 
  */

 function geodir_action_wrapper_content_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_wrapper_content_close_replace'])) {

-        $text = $tc['geodir_wrapper_content_close_replace'];

-    } else {

-        $text = '</div><!-- content ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_wrapper_content_close_replace'])) {

+		$text = $tc['geodir_wrapper_content_close_replace'];

+	} else {

+		$text = '</div><!-- content ends here-->';

+	}

+	echo $text;

 }

 

 // action for adding the <article> opening tag

@@ -518,24 +518,24 @@ 
  */

 function geodir_action_article_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    $class = implode(" ", $class);

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_article_open_replace'])) {

-        $text = $tc['geodir_article_open_replace'];

-    } else {

-        $text = '<article  id="[id]" class="[class]" >';

-    }

+	$class = implode(" ", $class);

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_article_open_replace'])) {

+		$text = $tc['geodir_article_open_replace'];

+	} else {

+		$text = '<article  id="[id]" class="[class]" >';

+	}

 

-    if (!empty($tc['geodir_article_open_id'])) {

-        $id = $tc['geodir_article_open_id'];

-    }

-    if (!empty($tc['geodir_article_open_class'])) {

-        $class = $tc['geodir_article_open_class'];

-    }

+	if (!empty($tc['geodir_article_open_id'])) {

+		$id = $tc['geodir_article_open_id'];

+	}

+	if (!empty($tc['geodir_article_open_class'])) {

+		$class = $tc['geodir_article_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);

+	$text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -549,13 +549,13 @@ 
  */

 function geodir_action_article_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_article_close_replace'])) {

-        $text = $tc['geodir_article_close_replace'];

-    } else {

-        $text = '</article><!-- article ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_article_close_replace'])) {

+		$text = $tc['geodir_article_close_replace'];

+	} else {

+		$text = '</article><!-- article ends here-->';

+	}

+	echo $text;

 }

 

 // action for adding the sidebar opening tag

@@ -572,35 +572,35 @@ 
  */

 function geodir_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_right_open_replace'])) {

-        $text = $tc['geodir_sidebar_right_open_replace'];

-    } else {

-        $text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_sidebar_right_open_id'])) {

-        $id = $tc['geodir_sidebar_right_open_id'];

-    }

-    if (!empty($tc['geodir_sidebar_right_open_class'])) {

-        $class = $tc['geodir_sidebar_right_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_right_open_replace'])) {

+		$text = $tc['geodir_sidebar_right_open_replace'];

+	} else {

+		$text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_sidebar_right_open_id'])) {

+		$id = $tc['geodir_sidebar_right_open_id'];

+	}

+	if (!empty($tc['geodir_sidebar_right_open_class'])) {

+		$class = $tc['geodir_sidebar_right_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -614,13 +614,13 @@ 
  */

 function geodir_action_sidebar_right_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_right_close_replace'])) {

-        $text = $tc['geodir_sidebar_right_close_replace'];

-    } else {

-        $text = '</aside><!-- sidebar ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_right_close_replace'])) {

+		$text = $tc['geodir_sidebar_right_close_replace'];

+	} else {

+		$text = '</aside><!-- sidebar ends here-->';

+	}

+	echo $text;

 }

 

 

@@ -641,121 +641,121 @@ 
  */

 function geodir_action_geodir_set_preview_post()

 {

-    global $post, $preview, $gd_session;

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

-    if (!$preview || $is_backend_preview) {

-        return;

-    }// bail if not previewing

-

-    $listing_type = isset($_REQUEST['listing_type']) ? sanitize_text_field($_REQUEST['listing_type']) : '';

-

-    $fields_info = geodir_get_custom_fields_type($listing_type);

-

-    foreach ($_REQUEST as $pkey => $pval) {

-        if ($pkey == 'geodir_video') {

-            $tags = '<iframe>';

-        } else if ($pkey == 'post_desc') {

-            $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

-        } else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {

-            $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

-        } else if (is_array($_REQUEST[$pkey])) {

-            $tags = 'skip_field';

-        } else {

-            $tags = '';

-        }

-        /**

-         * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page.

-         *

-         * @since 1.0.0

-         * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'.

-         * @param string|array $pkey The field id/name. If array then value is set as "skip_field".

-         */

-        $tags = apply_filters('geodir_save_post_key', $tags, $pkey);

-

-        if ($tags != 'skip_field') {

-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);

-        }

-    }

-

-    $post = (object)$_REQUEST;

-

-

-    if (isset($post->video)) {

-        $post->video = stripslashes($post->video);

-    }

-

-    if (isset($post->Video2)) {

-        $post->Video2 = stripslashes($post->Video2);

-    }

-

-    $post_type = $post->listing_type;

-    $post_type_info = get_post_type_object($post_type);

-

-    $listing_label = $post_type_info->labels->singular_name;

-

-    $term_icon = '';

-

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

-        foreach ($post->post_category as $post_taxonomy => $post_term) {

-

-            if ($post_term != '' && !is_array($post_term)) {

-                $post_term = explode(',', trim($post_term, ','));

-            }

+	global $post, $preview, $gd_session;

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

+	if (!$preview || $is_backend_preview) {

+		return;

+	}// bail if not previewing

+

+	$listing_type = isset($_REQUEST['listing_type']) ? sanitize_text_field($_REQUEST['listing_type']) : '';

+

+	$fields_info = geodir_get_custom_fields_type($listing_type);

+

+	foreach ($_REQUEST as $pkey => $pval) {

+		if ($pkey == 'geodir_video') {

+			$tags = '<iframe>';

+		} else if ($pkey == 'post_desc') {

+			$tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

+		} else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {

+			$tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>';

+		} else if (is_array($_REQUEST[$pkey])) {

+			$tags = 'skip_field';

+		} else {

+			$tags = '';

+		}

+		/**

+		 * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page.

+		 *

+		 * @since 1.0.0

+		 * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'.

+		 * @param string|array $pkey The field id/name. If array then value is set as "skip_field".

+		 */

+		$tags = apply_filters('geodir_save_post_key', $tags, $pkey);

+

+		if ($tags != 'skip_field') {

+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);

+		}

+	}

+

+	$post = (object)$_REQUEST;

+

+

+	if (isset($post->video)) {

+		$post->video = stripslashes($post->video);

+	}

+

+	if (isset($post->Video2)) {

+		$post->Video2 = stripslashes($post->Video2);

+	}

+

+	$post_type = $post->listing_type;

+	$post_type_info = get_post_type_object($post_type);

+

+	$listing_label = $post_type_info->labels->singular_name;

+

+	$term_icon = '';

+

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

+		foreach ($post->post_category as $post_taxonomy => $post_term) {

+

+			if ($post_term != '' && !is_array($post_term)) {

+				$post_term = explode(',', trim($post_term, ','));

+			}

 

-            if (is_array($post_term)) {

-                $post_term = array_unique($post_term);

-            }

+			if (is_array($post_term)) {

+				$post_term = array_unique($post_term);

+			}

 

-            if (!empty($post_term)) {

-                foreach ($post_term as $cat_id) {

-                    $cat_id = trim($cat_id);

-

-                    if ($cat_id != '') {

-                        $term_icon = get_option('geodir_default_marker_icon');

-

-                        if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {

-                            if ($term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {

-                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '')

-                                    $term_icon = $term_icon_url['src'];

-                                break;

-                            }

-                        }

-                    }

-                }

-            }

-        }

-    }

+			if (!empty($post_term)) {

+				foreach ($post_term as $cat_id) {

+					$cat_id = trim($cat_id);

+

+					if ($cat_id != '') {

+						$term_icon = get_option('geodir_default_marker_icon');

+

+						if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {

+							if ($term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {

+								if (isset($term_icon_url['src']) && $term_icon_url['src'] != '')

+									$term_icon = $term_icon_url['src'];

+								break;

+							}

+						}

+					}

+				}

+			}

+		}

+	}

 

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

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

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

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

 

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

-    $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

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

+	$replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

 

-    $json_title = str_replace($srcharr, $replarr, $post->post_title);

+	$json_title = str_replace($srcharr, $replarr, $post->post_title);

 

-    $json = '{';

-    $json .= '"post_preview": "1",';

-    $json .= '"t": "' . $json_title . '",';

-    $json .= '"lt": "' . $post_latitude . '",';

-    $json .= '"ln": "' . $post_longitude . '",';

-    $json .= '"i":"' . $term_icon . '"';

-    $json .= '}';

+	$json = '{';

+	$json .= '"post_preview": "1",';

+	$json .= '"t": "' . $json_title . '",';

+	$json .= '"lt": "' . $post_latitude . '",';

+	$json .= '"ln": "' . $post_longitude . '",';

+	$json .= '"i":"' . $term_icon . '"';

+	$json .= '}';

 

-    $post->marker_json = $json;

+	$post->marker_json = $json;

 

-    $gd_session->set('listing', $_REQUEST);

+	$gd_session->set('listing', $_REQUEST);

 

-    // we need to define a few things to trick the setup_postdata

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

-        $post->ID = '';

-        $post->post_author = '';

-        $post->post_date = '';

-        $post->post_content = '';

-        $post->default_category = '';

-        $post->post_type = '';

-    }

-    setup_postdata($post);

+	// we need to define a few things to trick the setup_postdata

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

+		$post->ID = '';

+		$post->post_author = '';

+		$post->post_date = '';

+		$post->post_content = '';

+		$post->default_category = '';

+		$post->post_type = '';

+	}

+	setup_postdata($post);

 }

 

 /**

@@ -767,15 +767,15 @@ 
  */

 function geodir_action_geodir_preview_code()

 {

-    global $preview;

+	global $preview;

 

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

 

-    if (!$preview || $is_backend_preview) {

-        return;

-    }// bail if not previewing

+	if (!$preview || $is_backend_preview) {

+		return;

+	}// bail if not previewing

 

-    geodir_get_template_part('preview', 'buttons');

+	geodir_get_template_part('preview', 'buttons');

 }

 

 // action for adding the details page top widget area

@@ -791,20 +791,20 @@ 
  */

 function geodir_action_geodir_sidebar_detail_top($class = '')

 {

-    if (get_option('geodir_show_detail_top_section')) { ?>

+	if (get_option('geodir_show_detail_top_section')) { ?>

         <div

             class="<?php

-            /**

-             * Filter the div class for the wrapper of the full width widget areas.

-             *

-             * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas.

-             *

-             * @since 1.0.0

-             * @param string $class The class of the div.

-             * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section',

-             *               'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'.

-             */

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">

+			/**

+			 * Filter the div class for the wrapper of the full width widget areas.

+			 *

+			 * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas.

+			 *

+			 * @since 1.0.0

+			 * @param string $class The class of the div.

+			 * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section',

+			 *               'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'.

+			 */

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">

             <?php dynamic_sidebar('geodir_detail_top'); ?>

         </div>

     <?php }

@@ -828,11 +828,11 @@ 
  */

 function geodir_action_geodir_sidebar_detail_bottom_section($class = '')

 {

-    if (get_option('geodir_show_detail_bottom_section')) { ?>

+	if (get_option('geodir_show_detail_bottom_section')) { ?>

         <div

             class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">

             <?php dynamic_sidebar('geodir_detail_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -846,7 +846,7 @@ 
  */

 function geodir_details_sidebar_widget_area()

 {

-    dynamic_sidebar('geodir_detail_sidebar');

+	dynamic_sidebar('geodir_detail_sidebar');

 }

 

 /**

@@ -857,12 +857,12 @@ 
  */

 function geodir_details_sidebar_place_details()

 {

-    /**

-     * Used to add items to the details page sidebar.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_detail_page_sidebar');

+	/**

+	 * Used to add items to the details page sidebar.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_detail_page_sidebar');

 }

 

 add_action('geodir_detail_sidebar_inside', 'geodir_details_sidebar_place_details', 10);

@@ -877,68 +877,68 @@ 
  */

 function geodir_action_details_sidebar()

 {

-    // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

-    if (get_option('geodir_detail_sidebar_left_section')) {

-        /**

-         * Called before the details page left sidebar is opened.

-         *

-         * This is used to add opening wrapper HTML to the details page left sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'.

-         * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'.

-         * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

-         */

-        do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'https://schema.org/WPSideBar');

-        ?>

+	// this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

+	if (get_option('geodir_detail_sidebar_left_section')) {

+		/**

+		 * Called before the details page left sidebar is opened.

+		 *

+		 * This is used to add opening wrapper HTML to the details page left sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'.

+		 * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'.

+		 * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

+		 */

+		do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'https://schema.org/WPSideBar');

+		?>

         <div class="geodir-content-left geodir-sidebar-wrap"><?php

-        /**

-         * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar.

-         *

-         * This is used to add all info to the details page sidebars.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_detail_sidebar_inside');

-        ?></div><!-- end geodir-content-left --><?php

-        /**

-         * Called after the details page left sidebar.

-         *

-         * This is used to add closing wrapper HTML to the details page left sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         */

-        do_action('geodir_sidebar_left_close', 'details-page');

-    } else {

-        /**

-         * Called before the details page right sidebar is opened.

-         *

-         * This is used to add opening wrapper HTML to the details page right sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'.

-         * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'.

-         * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'.

-         * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

-         */

-        do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');

-        ?>

+		/**

+		 * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar.

+		 *

+		 * This is used to add all info to the details page sidebars.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_detail_sidebar_inside');

+		?></div><!-- end geodir-content-left --><?php

+		/**

+		 * Called after the details page left sidebar.

+		 *

+		 * This is used to add closing wrapper HTML to the details page left sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 */

+		do_action('geodir_sidebar_left_close', 'details-page');

+	} else {

+		/**

+		 * Called before the details page right sidebar is opened.

+		 *

+		 * This is used to add opening wrapper HTML to the details page right sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'.

+		 * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'.

+		 * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'.

+		 * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'.

+		 */

+		do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');

+		?>

         <div class="geodir-content-right geodir-sidebar-wrap"><?php

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

-        do_action('geodir_detail_sidebar_inside');

-        ?></div><!-- end geodir-content-right --><?php

-        /**

-         * Called after the details page right sidebar.

-         *

-         * This is used to add closing wrapper HTML to the details page right sidebar.

-         *

-         * @since 1.0.0

-         * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

-         */

-        do_action('geodir_sidebar_right_close', 'details-page');

-    }

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

+		do_action('geodir_detail_sidebar_inside');

+		?></div><!-- end geodir-content-right --><?php

+		/**

+		 * Called after the details page right sidebar.

+		 *

+		 * This is used to add closing wrapper HTML to the details page right sidebar.

+		 *

+		 * @since 1.0.0

+		 * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'.

+		 */

+		do_action('geodir_sidebar_right_close', 'details-page');

+	}

 }

 

 add_action('geodir_page_title', 'geodir_action_page_title', 10);

@@ -952,21 +952,21 @@ 
  */

 function geodir_action_page_title()

 {

-    /**

-     * Filter the page title HTML h1 class.

-     *

-     * @since 1.0.0

-     * @param string $class The class to use. Default is 'entry-title fn'.

-     */

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

-    /**

-     * Filter the page title HTML header wrapper class.

-     *

-     * @since 1.0.0

-     * @param string $class The class to use. Default is 'entry-header'.

-     */

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

+	/**

+	 * Filter the page title HTML h1 class.

+	 *

+	 * @since 1.0.0

+	 * @param string $class The class to use. Default is 'entry-title fn'.

+	 */

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

+	/**

+	 * Filter the page title HTML header wrapper class.

+	 *

+	 * @since 1.0.0

+	 * @param string $class The class to use. Default is 'entry-header'.

+	 */

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

 }

 

 

@@ -983,106 +983,106 @@ 
  */

 function geodir_action_details_slider()

 {

-    global $preview, $post;

+	global $preview, $post;

 

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend

 

-    if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {

-        $preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

+	if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {

+		$preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

 

-        $preview_post_images = array();

-        if ($preview_get_images) {

-            foreach ($preview_get_images as $row) {

-                $preview_post_images[] = $row->src;

-            }

-        }

-        if (!empty($preview_post_images)) {

-            $post->post_images = implode(',', $preview_post_images);

-        }

-    }

+		$preview_post_images = array();

+		if ($preview_get_images) {

+			foreach ($preview_get_images as $row) {

+				$preview_post_images[] = $row->src;

+			}

+		}

+		if (!empty($preview_post_images)) {

+			$post->post_images = implode(',', $preview_post_images);

+		}

+	}

     

-    $package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : ''));

-    $image_limit = '';

-    if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {

-        $image_limit = (int)$package_info->image_limit;

-    }

-

-    if ($preview) {

-        $post_images = array();

-        if (isset($post->post_images) && !empty($post->post_images)) {

-            $post->post_images = trim($post->post_images, ",");

-            $post_images = explode(",", $post->post_images);

-        }

-

-        $main_slides = '';

-        $nav_slides = '';

-        $slides = 0;

-

-        if (!empty($post_images)) {

-            foreach ($post_images as $image) {

-                if ($image_limit !== '' && ($slides+1) > $image_limit) {

-                     break;

-                }

-                if (!empty($image)) {

-                    $sizes = getimagesize(trim($image));

-                    $width = !empty($sizes) && isset($sizes[0]) ? $sizes[0] : 0;

-                    $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

-

-                    if ($image && $width && $height) {

-                        $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

-                    }

-

-                    if (isset($image->src)) {

-                        if ($image->height >= 400) {

-                            $spacer_height = 0;

-                        } else {

-                            $spacer_height = ((400 - $image->height) / 2);

-                        }

-

-                        $image_title = isset($image->title) ? $image->title : '';

-

-                        $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                        $main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>';

-                        $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>';

-                        $slides++;

-                    }

-                }

-            }// endfore

-        } //end if

-    } else {

-        $main_slides = '';

-        $nav_slides = '';

-        /**

-         * Filter if default images should show on the details page.

-         *

-         * @param bool $use_default_image Default false.

-         * @since 1.6.16

-         */

-        $use_default_image = apply_filters('geodir_details_default_image_show', false);

-        $post_images = geodir_get_images($post->ID, 'thumbnail', $use_default_image); // Hide default image on listing preview/detail page.

-        $slides = 0;

-

-        if (!empty($post_images)) {

-            foreach ($post_images as $image) {

-                if ($image_limit !== '' && ($slides+1) > $image_limit) {

-                     break;

-                }

-                if ($image->height >= 400) {

-                    $spacer_height = 0;

-                } else {

-                    $spacer_height = ((400 - $image->height) / 2);

-                }

-

-                $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

-                $main_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

-                $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

-                $slides++;

-            }

-        }// endfore

-    }

+	$package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : ''));

+	$image_limit = '';

+	if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {

+		$image_limit = (int)$package_info->image_limit;

+	}

+

+	if ($preview) {

+		$post_images = array();

+		if (isset($post->post_images) && !empty($post->post_images)) {

+			$post->post_images = trim($post->post_images, ",");

+			$post_images = explode(",", $post->post_images);

+		}

+

+		$main_slides = '';

+		$nav_slides = '';

+		$slides = 0;

+

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				if ($image_limit !== '' && ($slides+1) > $image_limit) {

+					 break;

+				}

+				if (!empty($image)) {

+					$sizes = getimagesize(trim($image));

+					$width = !empty($sizes) && isset($sizes[0]) ? $sizes[0] : 0;

+					$height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

+

+					if ($image && $width && $height) {

+						$image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

+					}

+

+					if (isset($image->src)) {

+						if ($image->height >= 400) {

+							$spacer_height = 0;

+						} else {

+							$spacer_height = ((400 - $image->height) / 2);

+						}

+

+						$image_title = isset($image->title) ? $image->title : '';

+

+						$main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

+						$main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>';

+						$nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>';

+						$slides++;

+					}

+				}

+			}// endfore

+		} //end if

+	} else {

+		$main_slides = '';

+		$nav_slides = '';

+		/**

+		 * Filter if default images should show on the details page.

+		 *

+		 * @param bool $use_default_image Default false.

+		 * @since 1.6.16

+		 */

+		$use_default_image = apply_filters('geodir_details_default_image_show', false);

+		$post_images = geodir_get_images($post->ID, 'thumbnail', $use_default_image); // Hide default image on listing preview/detail page.

+		$slides = 0;

+

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				if ($image_limit !== '' && ($slides+1) > $image_limit) {

+					 break;

+				}

+				if ($image->height >= 400) {

+					$spacer_height = 0;

+				} else {

+					$spacer_height = ((400 - $image->height) / 2);

+				}

+

+				$caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

+				$main_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

+				$nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

+				$slides++;

+			}

+		}// endfore

+	}

 

-    if (!empty($post_images)) {

-        ?>

+	if (!empty($post_images)) {

+		?>

         <div class="geodir_flex-container">

             <div class="geodir_flex-loader"><i class="fa fa-refresh fa-spin"></i></div>

             <div id="geodir_slider" class="geodir_flexslider ">

@@ -1095,7 +1095,7 @@ 
             <?php } ?>

         </div>

     <?php

-    }

+	}

 }

 

 add_action('geodir_details_taxonomies', 'geodir_action_details_taxonomies', 10);

@@ -1110,177 +1110,177 @@ 
  */

 function geodir_action_details_taxonomies()

 {

-    global $preview, $post;?>

+	global $preview, $post;?>

     <p class="geodir_post_taxomomies clearfix">

     <?php

-    $taxonomies = array();

-

-    $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

-

-    if ($preview && !$is_backend_preview) {

-        $post_type = $post->listing_type;

-        $post_taxonomy = $post_type . 'category';

-        $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

-    } else {

-        $post_type = $post->post_type;

-        $post_taxonomy = $post_type . 'category';

-    }

+	$taxonomies = array();

+

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

+

+	if ($preview && !$is_backend_preview) {

+		$post_type = $post->listing_type;

+		$post_taxonomy = $post_type . 'category';

+		$post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

+	} else {

+		$post_type = $post->post_type;

+		$post_taxonomy = $post_type . 'category';

+	}

 //{	

-    $post_type_info = get_post_type_object($post_type);

-    $listing_label = __($post_type_info->labels->singular_name, 'geodirectory');

-

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

-

-        if (taxonomy_exists($post_type . '_tags')):

-            $links = array();

-            $terms = array();

-            // to limit post tags

-            $post_tags = trim($post->post_tags, ",");

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

-            /**

-             * Filter the post tags.

-             *

-             * Allows you to filter the post tags output on the details page of a post.

-             *

-             * @since 1.0.0

-             * @param string $post_tags A comma seperated list of tags.

-             * @param int $post_id The current post id.

-             */

-            $post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);

-

-            $post->post_tags = $post_tags;

-            $post_tags = explode(",", trim($post->post_tags, ","));

-

-

-            foreach ($post_tags as $post_term) {

-

-                // fix slug creation order for tags & location

-                $post_term = trim($post_term);

-

-                $priority_location = false;

-                if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

-                    $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');

-                } else {

-                    $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

-                    $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

-                    $post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL;

-                    $match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false;

-                    $match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false;

-                    $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

-                    if ($match_country || $match_region || $match_city) {

-                        $priority_location = true;

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

-                    } else {

-                        $insert_term = wp_insert_term($post_term, $post_type . '_tags');

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

-                    }

-                }

-

-                if (!is_wp_error($term) && is_object($term)) {

-

-                    // fix tag link on detail page

-                    if ($priority_location) {

-

-                        $tag_link = "<a href=''>$post_term</a>";

-                        /**

-                         * Filter the tag name on the details page.

-                         *

-                         * @since 1.5.6

-                         * @param string $tag_link The tag link html.

-                         * @param object $term The tag term object.

-                         */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

-                        $links[] = $tag_link;

-                    } else {

-                        $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

-                        /** This action is documented in geodirectory-template_actions.php */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

-                        $links[] = $tag_link;

-                    }

-                    $terms[] = $term;

-                }

-                //

-            }

-            if (!isset($listing_label)) {

-                $listing_label = '';

-            }

-            $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

-        endif;

-

-    }

-

-    if (!empty($post->{$post_taxonomy})) {

-        $links = array();

-        $terms = array();

-        $termsOrdered = array();

-        if (!is_array($post->{$post_taxonomy})) {

-            $post_term = explode(",", trim($post->{$post_taxonomy}, ","));

-        } else {

-            $post_term = $post->{$post_taxonomy};

+	$post_type_info = get_post_type_object($post_type);

+	$listing_label = __($post_type_info->labels->singular_name, 'geodirectory');

+

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

+

+		if (taxonomy_exists($post_type . '_tags')):

+			$links = array();

+			$terms = array();

+			// to limit post tags

+			$post_tags = trim($post->post_tags, ",");

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

+			/**

+			 * Filter the post tags.

+			 *

+			 * Allows you to filter the post tags output on the details page of a post.

+			 *

+			 * @since 1.0.0

+			 * @param string $post_tags A comma seperated list of tags.

+			 * @param int $post_id The current post id.

+			 */

+			$post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);

+

+			$post->post_tags = $post_tags;

+			$post_tags = explode(",", trim($post->post_tags, ","));

+

+

+			foreach ($post_tags as $post_term) {

+

+				// fix slug creation order for tags & location

+				$post_term = trim($post_term);

+

+				$priority_location = false;

+				if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

+					$term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');

+				} else {

+					$post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

+					$post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

+					$post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL;

+					$match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false;

+					$match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false;

+					$match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

+					if ($match_country || $match_region || $match_city) {

+						$priority_location = true;

+						$term = get_term_by('name', $post_term, $post_type . '_tags');

+					} else {

+						$insert_term = wp_insert_term($post_term, $post_type . '_tags');

+						$term = get_term_by('name', $post_term, $post_type . '_tags');

+					}

+				}

+

+				if (!is_wp_error($term) && is_object($term)) {

+

+					// fix tag link on detail page

+					if ($priority_location) {

+

+						$tag_link = "<a href=''>$post_term</a>";

+						/**

+						 * Filter the tag name on the details page.

+						 *

+						 * @since 1.5.6

+						 * @param string $tag_link The tag link html.

+						 * @param object $term The tag term object.

+						 */

+						$tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+						$links[] = $tag_link;

+					} else {

+						$tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

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

+						$tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+						$links[] = $tag_link;

+					}

+					$terms[] = $term;

+				}

+				//

+			}

+			if (!isset($listing_label)) {

+				$listing_label = '';

+			}

+			$taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+		endif;

+

+	}

+

+	if (!empty($post->{$post_taxonomy})) {

+		$links = array();

+		$terms = array();

+		$termsOrdered = array();

+		if (!is_array($post->{$post_taxonomy})) {

+			$post_term = explode(",", trim($post->{$post_taxonomy}, ","));

+		} else {

+			$post_term = $post->{$post_taxonomy};

 			

 			if ($preview && !$is_backend_preview) {

 				$post_term = geodir_add_parent_terms($post_term, $post_taxonomy);

 			}

-        }

-

-        $post_term = array_unique($post_term);

-        if (!empty($post_term)) {

-            foreach ($post_term as $post_term) {

-                $post_term = trim($post_term);

-

-                if ($post_term != ''):

-                    $term = get_term_by('id', $post_term, $post_taxonomy);

-

-                    if (is_object($term)) {

-                        $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

-                        /**

-                         * Filter the category name on the details page.

-                         *

-                         * @since 1.5.6

-                         * @param string $term_link The link html to the category.

-                         * @param object $term The category term object.

-                         */

-                        $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

-                        $links[] = $term_link;

-                        $terms[] = $term;

-                    }

-                endif;

-            }

-            // order alphabetically

-            asort($links);

-            foreach (array_keys($links) as $key) {

-                $termsOrdered[$key] = $terms[$key];

-            }

-            $terms = $termsOrdered;

+		}

+

+		$post_term = array_unique($post_term);

+		if (!empty($post_term)) {

+			foreach ($post_term as $post_term) {

+				$post_term = trim($post_term);

+

+				if ($post_term != ''):

+					$term = get_term_by('id', $post_term, $post_taxonomy);

+

+					if (is_object($term)) {

+						$term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

+						/**

+						 * Filter the category name on the details page.

+						 *

+						 * @since 1.5.6

+						 * @param string $term_link The link html to the category.

+						 * @param object $term The category term object.

+						 */

+						$term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

+						$links[] = $term_link;

+						$terms[] = $term;

+					}

+				endif;

+			}

+			// order alphabetically

+			asort($links);

+			foreach (array_keys($links) as $key) {

+				$termsOrdered[$key] = $terms[$key];

+			}

+			$terms = $termsOrdered;

 

-        }

+		}

 

-        if (!isset($listing_label)) {

-            $listing_label = '';

-        }

-        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+		if (!isset($listing_label)) {

+			$listing_label = '';

+		}

+		$taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

 

-    }

+	}

 

-    /**

-     * Filter the taxonomies array before output.

-     *

-     * @since 1.5.9

-     * @param array $taxonomies The array of cats and tags.

-     * @param string $post_type The post type being output.

-     * @param string $listing_label The post type label.

-     * @param string $listing_label The post type label with ucwords function.

-     */

-    $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

+	/**

+	 * Filter the taxonomies array before output.

+	 *

+	 * @since 1.5.9

+	 * @param array $taxonomies The array of cats and tags.

+	 * @param string $post_type The post type being output.

+	 * @param string $listing_label The post type label.

+	 * @param string $listing_label The post type label with ucwords function.

+	 */

+	$taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

 

-    if (isset($taxonomies[$post_taxonomy])) {

-        echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

-    }

+	if (isset($taxonomies[$post_taxonomy])) {

+		echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

+	}

 

-    if (isset($taxonomies[$post_type . '_tags']))

-        echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

+	if (isset($taxonomies[$post_type . '_tags']))

+		echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

 

-    ?>

+	?>

     </p><?php

 }

 

@@ -1302,144 +1302,144 @@ 
 function geodir_action_details_micordata($post='')

 {

 

-    global $preview;

-    if(empty($post)){global $post;}

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

-        return;

-    }

-

-    // url

-    $c_url = geodir_curPageURL();

-

-    // post reviews

-    $post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));

-    if (empty($post_reviews)) {

-        $reviews = '';

-    } else {

-        foreach ($post_reviews as $review) {

-

-            if($rating_value = geodir_get_commentoverall($review->comment_ID)){

-                $reviews[] = array(

-                    "@type" => "Review",

-                    "author" => $review->comment_author,

-                    "datePublished" => $review->comment_date,

-                    "description" => $review->comment_content,

-                    "reviewRating" => array(

-                        "@type" => "Rating",

-                        "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

-                        "ratingValue" => $rating_value,

-                        "worstRating" => "1"

-                    )

-                );

-            }

-

-        }

-

-    }

-

-    // post images

-    $post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

-    if (empty($post_images)) {

-        $images = '';

-    } else {

-        $i_arr = array();

-        foreach ($post_images as $img) {

-            $i_arr[] = $img->src;

-        }

-

-        if (count($i_arr) == 1) {

-            $images = $i_arr[0];

-        } else {

-            $images = $i_arr;

-        }

+	global $preview;

+	if(empty($post)){global $post;}

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

+		return;

+	}

+

+	// url

+	$c_url = geodir_curPageURL();

+

+	// post reviews

+	$post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));

+	if (empty($post_reviews)) {

+		$reviews = '';

+	} else {

+		foreach ($post_reviews as $review) {

+

+			if($rating_value = geodir_get_commentoverall($review->comment_ID)){

+				$reviews[] = array(

+					"@type" => "Review",

+					"author" => $review->comment_author,

+					"datePublished" => $review->comment_date,

+					"description" => $review->comment_content,

+					"reviewRating" => array(

+						"@type" => "Rating",

+						"bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

+						"ratingValue" => $rating_value,

+						"worstRating" => "1"

+					)

+				);

+			}

 

-    }

-    //print_r($post);

-    // external links

-    $external_links =  array();

-    $external_links[] = $post->geodir_website;

-    $external_links[] = $post->geodir_twitter;

-    $external_links[] = $post->geodir_facebook;

-    $external_links = array_filter($external_links);

-

-    if(!empty($external_links)){

-        $external_links = array_values($external_links);

-    }

-

-    // reviews

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

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

-

-    // schema type

-    $schema_type = 'LocalBusiness';

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

-        $cat_schema = geodir_get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

-        if($cat_schema){$schema_type = $cat_schema;}

-        if(!$cat_schema && $schema_type=='LocalBusiness' && $post->post_type=='gd_event'){$schema_type = 'Event';}

-    }

-

-    $schema = array();

-    $schema['@context'] = "https://schema.org";

-    $schema['@type'] = $schema_type;

-    $schema['name'] = $post->post_title;

-    $schema['description'] = wp_strip_all_tags( $post->post_content, true );

-    $schema['telephone'] = $post->geodir_contact;

-    $schema['url'] = $c_url;

-    $schema['sameAs'] = $external_links;

-    $schema['image'] = $images;

-    $schema['address'] = array(

-        "@type" => "PostalAddress",

-        "streetAddress" => $post->post_address,

-        "addressLocality" => $post->post_city,

-        "addressRegion" => $post->post_region,

-        "addressCountry" => $post->post_country,

-        "postalCode" => $post->post_zip

-    );

-

-    if($post->post_latitude && $post->post_longitude) {

-        $schema['geo'] = array(

-            "@type" => "GeoCoordinates",

-            "latitude" => $post->post_latitude,

-            "longitude" => $post->post_longitude

-        );

-    }

-

-    if($post_avgratings) {

-        $schema['aggregateRating'] = array(

-            "@type" => "AggregateRating",

-            "ratingValue" => $post_avgratings,

-            "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

-            "worstRating" => "1",

-            "ratingCount" => $comment_count

-        );

-    }

-    $schema['review'] = $reviews;

-

-    /**

-     * Allow the schema JSON-LD info to be filtered.

-     *

-     * @since 1.5.4

-     * @since 1.5.7 Added $post variable.

-     * @param array $schema The array of schema data to be filtered.

-     * @param object $post The post object.

-     */

-    $schema = apply_filters('geodir_details_schema', $schema,$post);

-

-

-    echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

-

-

-    $uploads = wp_upload_dir();

-    $facebook_og = (isset($post->featured_image) && $post->featured_image) ? '<meta property="og:image" content="'.$uploads['baseurl'].$post->featured_image.'"/>' : '';

-

-    /**

-     * Show facebook open graph meta info

-     *

-     * @since 1.6.6

-     * @param string $facebook_og The open graph html to be filtered.

-     * @param object $post The post object.

-     */

-    echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);

+		}

+

+	}

+

+	// post images

+	$post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

+	if (empty($post_images)) {

+		$images = '';

+	} else {

+		$i_arr = array();

+		foreach ($post_images as $img) {

+			$i_arr[] = $img->src;

+		}

+

+		if (count($i_arr) == 1) {

+			$images = $i_arr[0];

+		} else {

+			$images = $i_arr;

+		}

+

+	}

+	//print_r($post);

+	// external links

+	$external_links =  array();

+	$external_links[] = $post->geodir_website;

+	$external_links[] = $post->geodir_twitter;

+	$external_links[] = $post->geodir_facebook;

+	$external_links = array_filter($external_links);

+

+	if(!empty($external_links)){

+		$external_links = array_values($external_links);

+	}

+

+	// reviews

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

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

+

+	// schema type

+	$schema_type = 'LocalBusiness';

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

+		$cat_schema = geodir_get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

+		if($cat_schema){$schema_type = $cat_schema;}

+		if(!$cat_schema && $schema_type=='LocalBusiness' && $post->post_type=='gd_event'){$schema_type = 'Event';}

+	}

+

+	$schema = array();

+	$schema['@context'] = "https://schema.org";

+	$schema['@type'] = $schema_type;

+	$schema['name'] = $post->post_title;

+	$schema['description'] = wp_strip_all_tags( $post->post_content, true );

+	$schema['telephone'] = $post->geodir_contact;

+	$schema['url'] = $c_url;

+	$schema['sameAs'] = $external_links;

+	$schema['image'] = $images;

+	$schema['address'] = array(

+		"@type" => "PostalAddress",

+		"streetAddress" => $post->post_address,

+		"addressLocality" => $post->post_city,

+		"addressRegion" => $post->post_region,

+		"addressCountry" => $post->post_country,

+		"postalCode" => $post->post_zip

+	);

+

+	if($post->post_latitude && $post->post_longitude) {

+		$schema['geo'] = array(

+			"@type" => "GeoCoordinates",

+			"latitude" => $post->post_latitude,

+			"longitude" => $post->post_longitude

+		);

+	}

+

+	if($post_avgratings) {

+		$schema['aggregateRating'] = array(

+			"@type" => "AggregateRating",

+			"ratingValue" => $post_avgratings,

+			"bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

+			"worstRating" => "1",

+			"ratingCount" => $comment_count

+		);

+	}

+	$schema['review'] = $reviews;

+

+	/**

+	 * Allow the schema JSON-LD info to be filtered.

+	 *

+	 * @since 1.5.4

+	 * @since 1.5.7 Added $post variable.

+	 * @param array $schema The array of schema data to be filtered.

+	 * @param object $post The post object.

+	 */

+	$schema = apply_filters('geodir_details_schema', $schema,$post);

+

+

+	echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

+

+

+	$uploads = wp_upload_dir();

+	$facebook_og = (isset($post->featured_image) && $post->featured_image) ? '<meta property="og:image" content="'.$uploads['baseurl'].$post->featured_image.'"/>' : '';

+

+	/**

+	 * Show facebook open graph meta info

+	 *

+	 * @since 1.6.6

+	 * @param string $facebook_og The open graph html to be filtered.

+	 * @param object $post The post object.

+	 */

+	echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);

 

 

 

@@ -1459,7 +1459,7 @@ 
  */

 function geodir_action_details_next_prev()

 {

-    ?>

+	?>

     <div class="geodir-pos_navigation clearfix">

     <div

         class="geodir-post_left"><?php previous_post_link('%link', '' . __('Previous', 'geodirectory'), false) ?></div>

@@ -1477,15 +1477,15 @@ 
  */

 function geodir_action_before_single_post()

 {

-    global $post;

-    /**

-     * Called at the very start of the details page output, before the title section.

-     *

-     * @since 1.0.0

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

-     * @global WP_Post|null $post The current post, if available.

-     */

-    do_action('geodir_before_single_post', $post); // extra action	

+	global $post;

+	/**

+	 * Called at the very start of the details page output, before the title section.

+	 *

+	 * @since 1.0.0

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

+	 * @global WP_Post|null $post The current post, if available.

+	 */

+	do_action('geodir_before_single_post', $post); // extra action	

 }

 

 /**

@@ -1496,13 +1496,13 @@ 
  */

 function geodir_action_after_single_post($post)

 {

-    /**

-     * Called on the details page after the details page tabs section and before the next/prev buttons.

-     *

-     * @since 1.0.0

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

-     */

-    do_action('geodir_after_single_post', $post); // extra action	

+	/**

+	 * Called on the details page after the details page tabs section and before the next/prev buttons.

+	 *

+	 * @since 1.0.0

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

+	 */

+	do_action('geodir_after_single_post', $post); // extra action	

 }

 

 add_action('geodir_details_main_content', 'geodir_action_before_single_post', 10);

@@ -1528,168 +1528,168 @@ 
  */

 function geodir_action_listings_title()

 {

-    global $wp, $term;

-

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

+	global $wp, $term;

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

-    }

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-    $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

-    $single_name = $post_type_info->labels->singular_name;

+	$add_string_in_title = __('All', 'geodirectory') . ' ';

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

+		$add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+	}

 

-    $taxonomy = geodir_get_taxonomies($gd_post_type, true);

+	$list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

+	$single_name = $post_type_info->labels->singular_name;

 

-    $gd_country = get_query_var('gd_country');

-    $gd_region = get_query_var('gd_region');

-    $gd_city = get_query_var('gd_city');

+	$taxonomy = geodir_get_taxonomies($gd_post_type, true);

 

-    if (!empty($term)) {

-        $location_name = '';

-        if ($gd_country != '' || $gd_region != '' || $gd_city != '') {

-            if ($gd_country != '') {

-                $location_name = geodir_sanitize_location_name('gd_country', $gd_country);

-            }

+	$gd_country = get_query_var('gd_country');

+	$gd_region = get_query_var('gd_region');

+	$gd_city = get_query_var('gd_city');

 

-            if ($gd_region != '') {

-                $location_name = geodir_sanitize_location_name('gd_region', $gd_region);

-            }

-

-            if ($gd_city != '') {

-                $location_name = geodir_sanitize_location_name('gd_city', $gd_city);

-            }

-        }

-

-        $current_term = get_term_by('slug', $term, $taxonomy[0]);

-        if (!empty($current_term)) {

-            $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

-            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

-                $location_last_char = substr($location_name, -1);

-                $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

-            } else {

-                $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

-            }

-        } else {

-            if (count($taxonomy) > 1) {

-                $current_term = get_term_by('slug', $term, $taxonomy[1]);

-

-                if (!empty($current_term)) {

-                    $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

-                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

-                        $location_last_char = substr($location_name, -1);

-                        $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                        $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

-                    } else {

-                        $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

-                    }

-                }

-            }

-        }

-

-    } else {

-        $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

-        $gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

-        $gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

-

-        $gd_country_actual = $gd_region_actual = $gd_city_actual = '';

-

-        if (function_exists('get_actual_location_name')) {

-            $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

-            $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

-            $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

-        }

-

-        if ($gd_city != '') {

-            if ($gd_city_actual != '') {

-                $gd_city = $gd_city_actual;

-            } else {

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

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

-                $gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

-            }

-

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

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

-            if ($gd_region_actual != '') {

-                $gd_region = $gd_region_actual;

-            } else {

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

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

-                $gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

-            }

-

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

-        } else if ($gd_country != '') {

-            if ($gd_country_actual != '') {

-                $gd_country = $gd_country_actual;

-            } else {

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

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

-                $gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

-            }

-

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

-        }

-    }

-

-    if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

-    }

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

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

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

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-

-

-    $title = $list_title;

-    $gd_page = '';

-    if(geodir_is_page('pt')){

-        $gd_page = 'pt';

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

-    }

-    elseif(geodir_is_page('listing')){

-        $gd_page = 'listing';

-        global $wp_query;

-        $current_term = $wp_query->get_queried_object();

-        if (strpos($current_term->taxonomy,'_tags') !== false) {

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

-        }else{

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

-        }

+	if (!empty($term)) {

+		$location_name = '';

+		if ($gd_country != '' || $gd_region != '' || $gd_city != '') {

+			if ($gd_country != '') {

+				$location_name = geodir_sanitize_location_name('gd_country', $gd_country);

+			}

 

-    }

-    elseif(geodir_is_page('author')){

-        $gd_page = 'author';

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

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

-        }else{

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

-        }

+			if ($gd_region != '') {

+				$location_name = geodir_sanitize_location_name('gd_region', $gd_region);

+			}

 

-    }

+			if ($gd_city != '') {

+				$location_name = geodir_sanitize_location_name('gd_city', $gd_city);

+			}

+		}

+

+		$current_term = get_term_by('slug', $term, $taxonomy[0]);

+		if (!empty($current_term)) {

+			$current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

+			if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+				$location_last_char = substr($location_name, -1);

+				$location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

+				$list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+			} else {

+				$list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+			}

+		} else {

+			if (count($taxonomy) > 1) {

+				$current_term = get_term_by('slug', $term, $taxonomy[1]);

+

+				if (!empty($current_term)) {

+					$current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

+					if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+						$location_last_char = substr($location_name, -1);

+						$location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

+						$list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+					} else {

+						$list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+					}

+				}

+			}

+		}

+

+	} else {

+		$gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

+		$gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

+		$gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

+

+		$gd_country_actual = $gd_region_actual = $gd_city_actual = '';

+

+		if (function_exists('get_actual_location_name')) {

+			$gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

+			$gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

+			$gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

+		}

+

+		if ($gd_city != '') {

+			if ($gd_city_actual != '') {

+				$gd_city = $gd_city_actual;

+			} else {

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

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

+				$gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

+			}

 

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

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

+			if ($gd_region_actual != '') {

+				$gd_region = $gd_region_actual;

+			} else {

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

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

+				$gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

+			}

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

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

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

-     */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

+		} else if ($gd_country != '') {

+			if ($gd_country_actual != '') {

+				$gd_country = $gd_country_actual;

+			} else {

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

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

+				$gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

+			}

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

-        /**

-         * Filter the listing page title.

-         *

-         * @since 1.0.0

-         * @param string $list_title The title for the category page.

-         */

-        apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

+			$list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

+		}

+	}

+

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+	}

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

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

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

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+

+

+	$title = $list_title;

+	$gd_page = '';

+	if(geodir_is_page('pt')){

+		$gd_page = 'pt';

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

+	}

+	elseif(geodir_is_page('listing')){

+		$gd_page = 'listing';

+		global $wp_query;

+		$current_term = $wp_query->get_queried_object();

+		if (strpos($current_term->taxonomy,'_tags') !== false) {

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

+		}else{

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

+		}

+

+	}

+	elseif(geodir_is_page('author')){

+		$gd_page = 'author';

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

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

+		}else{

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

+		}

+

+	}

+

+

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

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

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

+	 */

+	$title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+		/**

+		 * Filter the listing page title.

+		 *

+		 * @since 1.0.0

+		 * @param string $list_title The title for the category page.

+		 */

+		apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

 }

 

 add_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);

@@ -1702,46 +1702,46 @@ 
  */

 function geodir_action_listings_description()

 {

-    global $wp_query;

-    $current_term = $wp_query->get_queried_object();

+	global $wp_query;

+	$current_term = $wp_query->get_queried_object();

 

-    $gd_post_type = geodir_get_current_posttype();

-    if (isset($current_term->term_id) && $current_term->term_id != '') {

+	$gd_post_type = geodir_get_current_posttype();

+	if (isset($current_term->term_id) && $current_term->term_id != '') {

 

-        $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

-        $saved_data = stripslashes(geodir_get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

-        if ($term_desc && !$saved_data) {

-            $saved_data = $term_desc;

-        }

+		$term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

+		$saved_data = stripslashes(geodir_get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

+		if ($term_desc && !$saved_data) {

+			$saved_data = $term_desc;

+		}

 

-        // stop payment manager filtering content length

-        $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );

-        if ( false !== $filter_priority ) {

-            remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

-        }

+		// stop payment manager filtering content length

+		$filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );

+		if ( false !== $filter_priority ) {

+			remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+		}

 

-        /**

-         * Apply the core filter `the_content` filter to the variable string.

-         *

-         * This is a WordPress core filter that does many things.

-         *

-         * @since 1.0.0

-         * @param string $var The string to apply the filter to.

-         */

-        $cat_description = apply_filters('the_content', $saved_data);

+		/**

+		 * Apply the core filter `the_content` filter to the variable string.

+		 *

+		 * This is a WordPress core filter that does many things.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The string to apply the filter to.

+		 */

+		$cat_description = apply_filters('the_content', $saved_data);

 

 

-        if ( false !== $filter_priority ) {

-            add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

-        }

+		if ( false !== $filter_priority ) {

+			add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+		}

 

-        if ($cat_description) {

-            ?>

+		if ($cat_description) {

+			?>

 

             <div class="term_description"><?php echo $cat_description;?></div> <?php

-        }

+		}

 

-    }

+	}

 }

 

 // action for adding the listings page top widget area

@@ -1760,11 +1760,11 @@ 
  */

 function geodir_action_geodir_sidebar_listings_top()

 {

-    if (get_option('geodir_show_listing_top_section')) { ?>

+	if (get_option('geodir_show_listing_top_section')) { ?>

         <div

             class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">

             <?php dynamic_sidebar('geodir_listing_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -1787,35 +1787,35 @@ 
  */

 function geodir_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')

 {

-    if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

-    } else {

-        $width_css = '';

-    }

-

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_left_open_replace'])) {

-        $text = $tc['geodir_sidebar_left_open_replace'];

-    } else {

-        $text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

-    }

-

-    if (!empty($tc['geodir_sidebar_left_open_id'])) {

-        $id = $tc['geodir_sidebar_left_open_id'];

-    }

-    if (!empty($tc['geodir_sidebar_left_open_class'])) {

-        $class = $tc['geodir_sidebar_left_open_class'];

-    }

-

-    $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

-

-    echo $text;

+	if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

+		$width_css = 'style="width:' . $width . '%;"';

+	} else {

+		$width_css = '';

+	}

+

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_left_open_replace'])) {

+		$text = $tc['geodir_sidebar_left_open_replace'];

+	} else {

+		$text = '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>';

+	}

+

+	if (!empty($tc['geodir_sidebar_left_open_id'])) {

+		$id = $tc['geodir_sidebar_left_open_id'];

+	}

+	if (!empty($tc['geodir_sidebar_left_open_class'])) {

+		$class = $tc['geodir_sidebar_left_open_class'];

+	}

+

+	$text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);

+

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -1831,13 +1831,13 @@ 
  */

 function geodir_action_sidebar_left_close($type = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_sidebar_left_close_replace'])) {

-        $text = $tc['geodir_sidebar_left_close_replace'];

-    } else {

-        $text = '</aside><!-- sidebar ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_sidebar_left_close_replace'])) {

+		$text = $tc['geodir_sidebar_left_close_replace'];

+	} else {

+		$text = '</aside><!-- sidebar ends here-->';

+	}

+	echo $text;

 }

 

 /**

@@ -1850,7 +1850,7 @@ 
  */

 function geodir_listing_left_section()

 {

-    if (get_option('geodir_show_listing_left_section')) { ?>

+	if (get_option('geodir_show_listing_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_listing_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -1868,20 +1868,20 @@ 
  */

 function geodir_action_listings_sidebar_left()

 {

-    if (get_option('geodir_show_listing_left_section')) {

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

-        do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'https://schema.org/WPSideBar');

-        /**

-         * Calls the listings page (category) left sidebar content.

-         *

-         * All the content for the listings page left sidebar is added via this hook.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_listings_sidebar_left_inside');

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

-        do_action('geodir_sidebar_left_close', 'listings-page');

-    }

+	if (get_option('geodir_show_listing_left_section')) {

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

+		do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'https://schema.org/WPSideBar');

+		/**

+		 * Calls the listings page (category) left sidebar content.

+		 *

+		 * All the content for the listings page left sidebar is added via this hook.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_listings_sidebar_left_inside');

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

+		do_action('geodir_sidebar_left_close', 'listings-page');

+	}

 }

 

 /**

@@ -1894,7 +1894,7 @@ 
  */

 function geodir_listing_right_section()

 {

-    if (get_option('geodir_show_listing_right_section')) { ?>

+	if (get_option('geodir_show_listing_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_listing_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -1912,20 +1912,20 @@ 
  */

 function geodir_action_listings_sidebar_right()

 {

-    if (get_option('geodir_show_listing_right_section')) {

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

-        do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * Calls the listings page (category) right sidebar content.

-         *

-         * All the content for the listings page right sidebar is added via this hook.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_listings_sidebar_right_inside');

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

-        do_action('geodir_sidebar_right_close', 'listings-page');

-    }

+	if (get_option('geodir_show_listing_right_section')) {

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

+		do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * Calls the listings page (category) right sidebar content.

+		 *

+		 * All the content for the listings page right sidebar is added via this hook.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_listings_sidebar_right_inside');

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

+		do_action('geodir_sidebar_right_close', 'listings-page');

+	}

 }

 

 

@@ -1942,23 +1942,23 @@ 
  */

 function geodir_action_main_content_open($type = '', $id = '', $class = '')

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_main_content_open_replace'])) {

-        $text = $tc['geodir_main_content_open_replace'];

-    } else {

-        $text = '<main id="[id]" class="[class]" role="main">';

-    }

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_main_content_open_replace'])) {

+		$text = $tc['geodir_main_content_open_replace'];

+	} else {

+		$text = '<main id="[id]" class="[class]" role="main">';

+	}

 

-    if (!empty($tc['geodir_main_content_open_id'])) {

-        $id = $tc['geodir_main_content_open_id'];

-    }

-    if (!empty($tc['geodir_main_content_open_class'])) {

-        $class = $tc['geodir_main_content_open_class'];

-    }

+	if (!empty($tc['geodir_main_content_open_id'])) {

+		$id = $tc['geodir_main_content_open_id'];

+	}

+	if (!empty($tc['geodir_main_content_open_class'])) {

+		$class = $tc['geodir_main_content_open_class'];

+	}

 

-    $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

+	$text = str_replace(array("[id]", "[class]"), array($id, $class), $text);

 

-    echo $text;

+	echo $text;

 }

 

 // action for adding the primary div closing tag

@@ -1971,13 +1971,13 @@ 
  */

 function geodir_action_main_content_close()

 {

-    $tc = get_option('theme_compatibility_setting');

-    if (!empty($tc['geodir_main_content_close_replace'])) {

-        $text = $tc['geodir_main_content_close_replace'];

-    } else {

-        $text = '</main><!-- main ends here-->';

-    }

-    echo $text;

+	$tc = get_option('theme_compatibility_setting');

+	if (!empty($tc['geodir_main_content_close_replace'])) {

+		$text = $tc['geodir_main_content_close_replace'];

+	} else {

+		$text = '</main><!-- main ends here-->';

+	}

+	echo $text;

 }

 

 /**

@@ -1989,14 +1989,14 @@ 
  */

 function geodir_action_listings_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_listing_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_listing_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_listings_content_inside', 'geodir_action_listings_content_inside', 10);

@@ -2012,47 +2012,47 @@ 
  */

 function geodir_action_listings_content()

 {

-    /**

-     * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc.

-     *

-     * @since 1.0.0

-     * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

-     * @param string $id The id for the div. Usually 'geodir-main-content'.

-     * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

-     * @see 'geodir_main_content_close' Where the oposing closing tag is added.

-     */

-    do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');

-    $extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');

-    echo '<div class="clearfix '.$extra_class.'">';

-    /**

-     * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_listing');

-    echo '</div>';

-

-    /**

-     * This actions calls the listings list content. Used on listings pages and search and author pages.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_listings_content_inside');

-

-    /**

-     * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_listing');

-

-    /**

-     * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc.

-     *

-     * @since 1.0.0

-     * @see 'geodir_main_content_open' Where the oposing opening tag is added.

-     */

-    do_action('geodir_main_content_close', 'listings-page');

+	/**

+	 * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc.

+	 *

+	 * @since 1.0.0

+	 * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

+	 * @param string $id The id for the div. Usually 'geodir-main-content'.

+	 * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'.

+	 * @see 'geodir_main_content_close' Where the oposing closing tag is added.

+	 */

+	do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');

+	$extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');

+	echo '<div class="clearfix '.$extra_class.'">';

+	/**

+	 * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_listing');

+	echo '</div>';

+

+	/**

+	 * This actions calls the listings list content. Used on listings pages and search and author pages.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_listings_content_inside');

+

+	/**

+	 * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_listing');

+

+	/**

+	 * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_main_content_open' Where the oposing opening tag is added.

+	 */

+	do_action('geodir_main_content_close', 'listings-page');

 }

 

 

@@ -2067,10 +2067,10 @@ 
  */

 function geodir_action_sidebar_listings_bottom_section()

 {

-    if (get_option('geodir_show_listing_bottom_section')) { ?>

+	if (get_option('geodir_show_listing_bottom_section')) { ?>

         <div class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">

             <?php dynamic_sidebar('geodir_listing_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -2090,38 +2090,38 @@ 
  */

 function geodir_action_add_listing_page_title()

 {

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

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

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

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

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

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-

-    $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

-

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

-        $gd_page = 'add-listing';

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

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

-        }elseif(isset($listing_type)){

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

-        }

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

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

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

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

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

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+

+	$title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

+

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

+		$gd_page = 'add-listing';

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

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

+		}elseif(isset($listing_type)){

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

+		}

 

-    }

+	}

 

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

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

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

-     */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

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

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

+	 */

+	$title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

-    echo $title;

-    echo '</h1></header>';

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

+	echo $title;

+	echo '</h1></header>';

 }

 

 add_action('geodir_add_listing_page_mandatory', 'geodir_action_add_listing_page_mandatory', 10);

@@ -2152,61 +2152,61 @@ 
  */

 function geodir_action_add_listing_form()

 {

-    global $cat_display, $post_cat, $current_user, $gd_session;

-    $page_id = get_the_ID();

-    $post = '';

-    $title = '';

-    $desc = '';

-    $kw_tags = '';

-    $required_msg = '';

-    $submit_button = '';

-

-    $ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add';

-

-    $thumb_img_arr = array();

-    $curImages = '';

-

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

-        global $post;

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

-        $listing_type = $post->listing_type;

-        $title = $post->post_title;

-        $desc = $post->post_desc;

-        $post_cat = isset($post->post_category) ? $post->post_category : '';

-

-        $kw_tags = $post->post_tags;

-        $curImages = isset($post->post_images) ? $post->post_images : '';

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

-        global $post, $post_images;

-

-        $post = geodir_get_post_info($_REQUEST['pid']);

-        $thumb_img_arr = geodir_get_images($post->ID);

-        if ($thumb_img_arr) {

-            foreach ($thumb_img_arr as $post_img) {

-                $curImages .= $post_img->src . ',';

-            }

-        }

+	global $cat_display, $post_cat, $current_user, $gd_session;

+	$page_id = get_the_ID();

+	$post = '';

+	$title = '';

+	$desc = '';

+	$kw_tags = '';

+	$required_msg = '';

+	$submit_button = '';

+

+	$ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add';

+

+	$thumb_img_arr = array();

+	$curImages = '';

+

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

+		global $post;

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

+		$listing_type = $post->listing_type;

+		$title = $post->post_title;

+		$desc = $post->post_desc;

+		$post_cat = isset($post->post_category) ? $post->post_category : '';

+

+		$kw_tags = $post->post_tags;

+		$curImages = isset($post->post_images) ? $post->post_images : '';

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

+		global $post, $post_images;

+

+		$post = geodir_get_post_info($_REQUEST['pid']);

+		$thumb_img_arr = geodir_get_images($post->ID);

+		if ($thumb_img_arr) {

+			foreach ($thumb_img_arr as $post_img) {

+				$curImages .= $post_img->src . ',';

+			}

+		}

 

-        $listing_type = $post->post_type;

-        $title = $post->post_title;

-        $desc = $post->post_content;

-        $kw_tags = $post->post_tags;

-        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

-    } else {

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

-    }

+		$listing_type = $post->post_type;

+		$title = $post->post_title;

+		$desc = $post->post_content;

+		$kw_tags = $post->post_tags;

+		$kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

+	} else {

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

+	}

 

-    if ($current_user->ID != '0') {

-        $user_login = true;

-    }

+	if ($current_user->ID != '0') {

+		$user_login = true;

+	}

 

-    $post_type_info = geodir_get_posttype_info($listing_type);

+	$post_type_info = geodir_get_posttype_info($listing_type);

 

-    $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');

+	$cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');

     

-    $package_info = array();

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

-    ?>

+	$package_info = array();

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

+	?>

     <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>" method="post" enctype="multipart/form-data">

         <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/>

         <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/>

@@ -2217,114 +2217,114 @@ 
         <?php } if (isset($_REQUEST['backandedit'])) { ?>

             <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/>

         <?php

-        } 

-        /**

-         * Called at the very top of the add listing page form for frontend.

-         *

-         * This is called just before the "Enter Listing Details" text.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_detail_fields');

-        ?>

+		} 

+		/**

+		 * Called at the very top of the add listing page form for frontend.

+		 *

+		 * This is called just before the "Enter Listing Details" text.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_before_detail_fields');

+		?>

         <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5>

         <?php

-        /**

-         * Called at the top of the add listing page form for frontend.

-         *

-         * This is called after the "Enter Listing Details" text.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_main_form_fields');

-        ?>

+		/**

+		 * Called at the top of the add listing page form for frontend.

+		 *

+		 * This is called after the "Enter Listing Details" text.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_before_main_form_fields');

+		?>

         <div id="geodir_post_title_row" class="required_field geodir_form_row clearfix gd-fieldset-details">

             <label><?php

-                /**

-                 * Filter the add listing page title input label.

-                 *

-                 * @since 1.6.11

-                 * @param string $title The title to be output.

-                 * @param string $cpt_singular_name The singular title of the curent CPT.

-                 * @param string $listing_type The CPT being requested. ie: gd_place.

-                 */

-                echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>

+				/**

+				 * Filter the add listing page title input label.

+				 *

+				 * @since 1.6.11

+				 * @param string $title The title to be output.

+				 * @param string $cpt_singular_name The singular title of the curent CPT.

+				 * @param string $listing_type The CPT being requested. ie: gd_place.

+				 */

+				echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>

             <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield"

                    value="<?php echo esc_attr(stripslashes($title)); ?>"/>

             <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span>

         </div>

         <?php

-        $show_editor = get_option('geodir_tiny_editor_on_add_listing');

-        $show_editor = !empty($show_editor) && in_array($listing_type, $show_editor) ? true : false;

-        /**

-         * Filter whether to show or don't show the editor.

-         *

-         * @since 1.6.16

-         * @param bool $show_editor If true the editor will be available for description field.

-         * @param object $package_info The listing package.

-         * @param string $listing_type The current post type.

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

-         */

-        $show_editor = apply_filters('geodir_description_field_show_editor', $show_editor, $package_info, $listing_type, $post);

-

-        $desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc));

-        $desc_limit = '';

-        /**

-         * Filter the add listing description field character limit number.

-         *

-         * @since 1.0.0

-         * @param int $desc_limit The amount of characters to limit the description to.

-         */

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

-        /**

-         * Filter the add listing description field text.

-         *

-         * @since 1.0.0

-         * @param string $desc The text for the description field.

-         * @param int $desc_limit The character limit number if any.

-         */

-        $desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);

-        $desc_limit_msg = '';

-        /**

-         * Filter the add listing description limit message.

-         *

-         * This is the message shown if there is a limit applied to the amount of characters the description can use.

-         *

-         * @since 1.0.0

-         * @param string $desc_limit_msg The limit message string if any.

-         * @param int $desc_limit The character limit numer if any.

-         */

-        $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

+		$show_editor = get_option('geodir_tiny_editor_on_add_listing');

+		$show_editor = !empty($show_editor) && in_array($listing_type, $show_editor) ? true : false;

+		/**

+		 * Filter whether to show or don't show the editor.

+		 *

+		 * @since 1.6.16

+		 * @param bool $show_editor If true the editor will be available for description field.

+		 * @param object $package_info The listing package.

+		 * @param string $listing_type The current post type.

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

+		 */

+		$show_editor = apply_filters('geodir_description_field_show_editor', $show_editor, $package_info, $listing_type, $post);

+

+		$desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc));

+		$desc_limit = '';

+		/**

+		 * Filter the add listing description field character limit number.

+		 *

+		 * @since 1.0.0

+		 * @param int $desc_limit The amount of characters to limit the description to.

+		 */

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

+		/**

+		 * Filter the add listing description field text.

+		 *

+		 * @since 1.0.0

+		 * @param string $desc The text for the description field.

+		 * @param int $desc_limit The character limit number if any.

+		 */

+		$desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);

+		$desc_limit_msg = '';

+		/**

+		 * Filter the add listing description limit message.

+		 *

+		 * This is the message shown if there is a limit applied to the amount of characters the description can use.

+		 *

+		 * @since 1.0.0

+		 * @param string $desc_limit_msg The limit message string if any.

+		 * @param int $desc_limit The character limit numer if any.

+		 */

+		$desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

         

-        $desc_class = '';

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

-            /**

-             * Called on the add listing page form for frontend just before the description field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_before_description_field');

+		$desc_class = '';

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

+			/**

+			 * Called on the add listing page form for frontend just before the description field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_before_description_field');

             

-            $desc_class = ' required_field';

-        } else {

-            $desc_class = ' hidden';

-        }

-        ?>

+			$desc_class = ' required_field';

+		} else {

+			$desc_class = ' hidden';

+		}

+		?>

         <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>">

             <label><?php

-                /**

-                 * Filter the add listing page description input label.

-                 *

-                 * @since 1.6.11

-                 * @param string $title The title to be output.

-                 * @param string $cpt_singular_name The singular title of the curent CPT.

-                 * @param string $listing_type The CPT being requested. ie: gd_place.

-                 */

-                echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

+				/**

+				 * Filter the add listing page description input label.

+				 *

+				 * @since 1.6.11

+				 * @param string $title The title to be output.

+				 * @param string $cpt_singular_name The singular title of the curent CPT.

+				 * @param string $listing_type The CPT being requested. ie: gd_place.

+				 */

+				echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

             <?php

-            if ($show_editor) {

-                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

-            ?>

+			if ($show_editor) {

+				$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

+			?>

                 <div class="editor" field_id="post_desc" field_type="editor">

                     <?php wp_editor($desc, "post_desc", $editor_settings); ?>

                 </div>

@@ -2338,56 +2338,56 @@ 
             <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span>

         </div>

         <?php

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

-            /**

-             * Called on the add listing page form for frontend just after the description field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_after_description_field');

-        }

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

+			/**

+			 * Called on the add listing page form for frontend just after the description field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_after_description_field');

+		}

         

-        $kw_tags = esc_attr(stripslashes($kw_tags));

-        $kw_tags_count = TAGKW_TEXT_COUNT;

-        $kw_tags_msg = TAGKW_MSG;

-        /**

-         * Filter the add listing tags character limit.

-         *

-         * @since 1.0.0

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);

-        /**

-         * Filter the add listing tags field value.

-         *

-         * You can use the $_REQUEST values to check if this is a go back and edit value etc.

-         *

-         * @since 1.0.0

-         * @param string $kw_tags The tag field value, usually a comma separated list of tags.

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);

-        /**

-         * Filter the add listing tags field message text.

-         *

-         * @since 1.0.0

-         * @param string $kw_tags_msg The message shown under the field.

-         * @param int $kw_tags_count The character count limit if any.

-         */

-        $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

+		$kw_tags = esc_attr(stripslashes($kw_tags));

+		$kw_tags_count = TAGKW_TEXT_COUNT;

+		$kw_tags_msg = TAGKW_MSG;

+		/**

+		 * Filter the add listing tags character limit.

+		 *

+		 * @since 1.0.0

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);

+		/**

+		 * Filter the add listing tags field value.

+		 *

+		 * You can use the $_REQUEST values to check if this is a go back and edit value etc.

+		 *

+		 * @since 1.0.0

+		 * @param string $kw_tags The tag field value, usually a comma separated list of tags.

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);

+		/**

+		 * Filter the add listing tags field message text.

+		 *

+		 * @since 1.0.0

+		 * @param string $kw_tags_msg The message shown under the field.

+		 * @param int $kw_tags_count The character count limit if any.

+		 */

+		$kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

         

-        $tags_class = '';

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

-            /**

-             * Called on the add listing page form for frontend just before the tags field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_before_listing_tags_field');

-        } else {

-            $tags_class = ' hidden';

-        }

-        ?>

+		$tags_class = '';

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

+			/**

+			 * Called on the add listing page form for frontend just before the tags field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_before_listing_tags_field');

+		} else {

+			$tags_class = ' hidden';

+		}

+		?>

         <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>">

             <label><?php echo TAGKW_TEXT; ?></label>

             <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield"

@@ -2395,90 +2395,90 @@ 
             <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span>

         </div>

         <?php

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

-            /**

-             * Called on the add listing page form for frontend just after the tags field.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_after_listing_tags_field');

-        }

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

+			/**

+			 * Called on the add listing page form for frontend just after the tags field.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_after_listing_tags_field');

+		}

         

-        $package_info = array();

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

+		$package_info = array();

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

         

-        geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type);

+		geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type);

         

-        // adjust values here

-        $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

+		// adjust values here

+		$id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

 

-        $multiple = true; // allow multiple files upload

+		$multiple = true; // allow multiple files upload

 

-        $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

+		$width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

-        $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

+		$height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

 

-        $thumb_img_arr = array();

-        $totImg = 0;

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

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

-            if (isset($post->post_images))

-                $curImages = trim($post->post_images, ",");

+		$thumb_img_arr = array();

+		$totImg = 0;

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

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

+			if (isset($post->post_images))

+				$curImages = trim($post->post_images, ",");

 

 

-            if ($curImages != '') {

-                $curImages_array = explode(',', $curImages);

-                $totImg = count($curImages_array);

-            }

+			if ($curImages != '') {

+				$curImages_array = explode(',', $curImages);

+				$totImg = count($curImages_array);

+			}

 

-            $listing_type = $post->listing_type;

+			$listing_type = $post->listing_type;

 

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

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

-            $listing_type = $post->post_type;

-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

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

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

+			$listing_type = $post->post_type;

+			$thumb_img_arr = geodir_get_images($_REQUEST['pid']);

 

-        } else {

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

-        }

+		} else {

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

+		}

 

 

-        if (!empty($thumb_img_arr)) {

-            foreach ($thumb_img_arr as $img) {

-                //$curImages = $img->src.",";

-            }

-

-            $totImg = count((array)$thumb_img_arr);

-        }

+		if (!empty($thumb_img_arr)) {

+			foreach ($thumb_img_arr as $img) {

+				//$curImages = $img->src.",";

+			}

 

-        if ($curImages != '')

-            $svalue = $curImages; // this will be initial value of the above form field. Image urls.

-        else

-            $svalue = '';

-

-        $image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0';

-        $show_image_input_box = ($image_limit != '0');

-        /**

-         * Filter to be able to show/hide the image upload section of the add listing form.

-         *

-         * @since 1.0.0

-         * @param bool $show_image_input_box Set true to show. Set false to not show.

-         * @param string $listing_type The custom post type slug.

-         */

-        $show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);

-        if ($show_image_input_box) {

-            ?>

+			$totImg = count((array)$thumb_img_arr);

+		}

+

+		if ($curImages != '')

+			$svalue = $curImages; // this will be initial value of the above form field. Image urls.

+		else

+			$svalue = '';

+

+		$image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0';

+		$show_image_input_box = ($image_limit != '0');

+		/**

+		 * Filter to be able to show/hide the image upload section of the add listing form.

+		 *

+		 * @since 1.0.0

+		 * @param bool $show_image_input_box Set true to show. Set false to not show.

+		 * @param string $listing_type The custom post type slug.

+		 */

+		$show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);

+		if ($show_image_input_box) {

+			?>

 

             <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?>

                 <?php if ($image_limit == 1) {

-                    echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

-                } ?>

+					echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+				} ?>

                 <?php if ($image_limit > 1) {

-                    echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

-                } ?>

+					echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+				} ?>

                 <?php if ($image_limit == '') {

-                    echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

-                } ?>

+					echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+				} ?>

             </h5>

 

             <div class="geodir_form_row clearfix" id="<?php echo $id; ?>dropbox"

@@ -2516,12 +2516,12 @@ 
         <?php } ?>

 

         <?php

-        /**

-         * Called on the add listing page form for frontend just after the image upload field.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_after_main_form_fields');?>

+		/**

+		 * Called on the add listing page form for frontend just after the image upload field.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_after_main_form_fields');?>

 

 

         <!-- add captcha code -->

@@ -2550,7 +2550,7 @@ 
 

     </form>

     <?php

-    wp_reset_query();

+	wp_reset_query();

 }

 

 /**

@@ -2561,7 +2561,7 @@ 
  */

 function geodir_add_listing_sidebar_widget_area()

 {

-    dynamic_sidebar('geodir_add_listing_sidebar');

+	dynamic_sidebar('geodir_add_listing_sidebar');

 }

 

 add_action('geodir_add_listing_sidebar_inside', 'geodir_add_listing_sidebar_widget_area', 10);

@@ -2576,16 +2576,16 @@ 
  */

 function geodir_action_add_listing_sidebar()

 {

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

-    do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');

-    /**

-     * This is used to add the content to the add listing page sidebar.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_add_listing_sidebar_inside');

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

-    do_action('geodir_sidebar_right_close', 'details-page');

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

+	do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');

+	/**

+	 * This is used to add the content to the add listing page sidebar.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_add_listing_sidebar_inside');

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

+	do_action('geodir_sidebar_right_close', 'details-page');

 }

 

 ###############################################

@@ -2602,11 +2602,11 @@ 
  */

 function geodir_action_geodir_sidebar_signup_top()

 {

-    ?>

+	?>

     <div

         class="<?php

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

-        echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

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

+		echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

         <?php dynamic_sidebar('Reg/Login Top Section');?>

     </div><!-- clearfix ends here-->

 <?php

@@ -2625,11 +2625,11 @@ 
 function geodir_action_signup_forms()

 {

 

-    global $user_login;

+	global $user_login;

     

-    $is_enable_signup = get_option( 'users_can_register' );

+	$is_enable_signup = get_option( 'users_can_register' );

     

-    ?>

+	?>

     <script type="text/javascript">

         <?php if ( $user_login ) { ?>

         setTimeout(function () {

@@ -2665,67 +2665,67 @@ 
         <?php } ?>

     </script><?php

 

-    global $errors;

-    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim')

-        $errors->add('claim_login', LOGIN_CLAIM);

-

-    if (!empty($errors)) {

-        foreach ($errors as $errorsObj) {

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

-                for ($i = 0; $i < count($val); $i++) {

-                    echo "<div class=error_msg_fix>" . $val[$i] . '</div>';

-                    $registration_error_msg = 1;

-                }

-            }

-        }

-    }

+	global $errors;

+	if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim')

+		$errors->add('claim_login', LOGIN_CLAIM);

+

+	if (!empty($errors)) {

+		foreach ($errors as $errorsObj) {

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

+				for ($i = 0; $i < count($val); $i++) {

+					echo "<div class=error_msg_fix>" . $val[$i] . '</div>';

+					$registration_error_msg = 1;

+				}

+			}

+		}

+	}

 

-    if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {

-        ?>

+	if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {

+		?>

 

         <div class="login_form">

             <?php

-            /**

-             * Contains login form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+			/**

+			 * Contains login form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

         </div>

 

     <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup ) { ?>

 

         <div class="registration_form">

             <?php

-            /**

-             * Contains registration form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+			/**

+			 * Contains registration form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

         </div>

 

     <?php } else { ?>

 

         <div class="login_form_l">

             <?php

-            /**

-             * Contains login form template.

-             *

-             * @since 1.0.0

-             */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+			/**

+			 * Contains login form template.

+			 *

+			 * @since 1.0.0

+			 */

+			include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

         </div>

         

         <?php if ( $is_enable_signup ) { ?>

             <div class="registration_form_r">

                 <?php

-                /**

-                 * Contains registration form template.

-                 *

-                 * @since 1.0.0

-                 */

-                include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+				/**

+				 * Contains registration form template.

+				 *

+				 * @since 1.0.0

+				 */

+				include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

             </div>

         <?php } ?>

 

@@ -2757,66 +2757,66 @@ 
  */

 function geodir_action_author_page_title()

 {

-    global $term;

+	global $term;

 

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

-    }

+	$add_string_in_title = __('All', 'geodirectory') . ' ';

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

+		$add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+	}

 

-    $list_title = $add_string_in_title . $post_type_info->labels->name;

-    $single_name = $post_type_info->labels->singular_name;

+	$list_title = $add_string_in_title . $post_type_info->labels->name;

+	$single_name = $post_type_info->labels->singular_name;

 

-    $taxonomy = geodir_get_taxonomies($gd_post_type);

+	$taxonomy = geodir_get_taxonomies($gd_post_type);

 

-    if (!empty($term)) {

-        $current_term = get_term_by('slug', $term, $taxonomy[0]);

-        if (!empty($current_term))

-            $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

-    }

+	if (!empty($term)) {

+		$current_term = get_term_by('slug', $term, $taxonomy[0]);

+		if (!empty($current_term))

+			$list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

+	}

 

 

-    if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

 

-    }

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

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

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

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+	}

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

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

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

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

 

-    $title = $list_title;

-    if(geodir_is_page('author')){

-        $gd_page = 'author';

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

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

-        }else{

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

-        }

+	$title = $list_title;

+	if(geodir_is_page('author')){

+		$gd_page = 'author';

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

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

+		}else{

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

+		}

 

-    }

+	}

 

 

-    /**

-     * Filter page title to replace variables.

-     *

-     * @since 1.5.4

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

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

-     */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+	/**

+	 * Filter page title to replace variables.

+	 *

+	 * @since 1.5.4

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

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

+	 */

+	$title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

-        /**

-         * Filter the author page title text.

-         *

-         * @since 1.0.0

-         * @param string $list_title The title for the page.

-         */

-        apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+		/**

+		 * Filter the author page title text.

+		 *

+		 * @since 1.0.0

+		 * @param string $list_title The title for the page.

+		 */

+		apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

 }

 

 

@@ -2834,11 +2834,11 @@ 
  */

 function geodir_action_geodir_sidebar_author_top()

 {

-    if (get_option('geodir_show_author_top_section')) { ?>

+	if (get_option('geodir_show_author_top_section')) { ?>

         <div

             class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">

             <?php dynamic_sidebar('geodir_author_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -2854,7 +2854,7 @@ 
  */

 function geodir_author_left_section()

 {

-    if (get_option('geodir_show_author_left_section')) { ?>

+	if (get_option('geodir_show_author_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_author_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -2875,19 +2875,19 @@ 
  */

 function geodir_action_author_sidebar_left()

 {

-    if (get_option('geodir_show_author_left_section')) {

+	if (get_option('geodir_show_author_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

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

-        do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the author page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_author_sidebar_left_inside');

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

-        do_action('geodir_sidebar_left_close', 'author-page');

-    }

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

+		do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the author page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_author_sidebar_left_inside');

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

+		do_action('geodir_sidebar_left_close', 'author-page');

+	}

 }

 

 /**

@@ -2900,7 +2900,7 @@ 
  */

 function geodir_author_right_section()

 {

-    if (get_option('geodir_show_author_right_section')) { ?>

+	if (get_option('geodir_show_author_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_author_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -2920,18 +2920,18 @@ 
  */

 function geodir_action_author_sidebar_right()

 {

-    if (get_option('geodir_show_author_right_section')) {

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

-        do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the author page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_author_sidebar_right_inside');

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

-        do_action('geodir_sidebar_right_close', 'author-page');

-    }

+	if (get_option('geodir_show_author_right_section')) {

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

+		do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the author page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_author_sidebar_right_inside');

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

+		do_action('geodir_sidebar_right_close', 'author-page');

+	}

 }

 

 /**

@@ -2943,14 +2943,14 @@ 
  */

 function geodir_action_author_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_author_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_author_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_author_content_inside', 'geodir_action_author_content_inside', 10);

@@ -2965,22 +2965,22 @@ 
  */

 function geodir_action_author_content()

 {

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

-    do_action('geodir_main_content_open', 'author-page', 'geodir-main-content', 'author-page');

-    echo '<div class="clearfix">';

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

-    do_action('geodir_before_listing');

-    echo '</div>';

-    /**

-     * This is used to add the content to the author page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_author_content_inside');

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

-    do_action('geodir_after_listing');

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

-    do_action('geodir_main_content_close', 'author-page');

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

+	do_action('geodir_main_content_open', 'author-page', 'geodir-main-content', 'author-page');

+	echo '<div class="clearfix">';

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

+	do_action('geodir_before_listing');

+	echo '</div>';

+	/**

+	 * This is used to add the content to the author page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_author_content_inside');

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

+	do_action('geodir_after_listing');

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

+	do_action('geodir_main_content_close', 'author-page');

 }

 

 add_action('geodir_sidebar_author_bottom_section', 'geodir_action_sidebar_author_bottom_section', 10);

@@ -2994,11 +2994,11 @@ 
  */

 function geodir_action_sidebar_author_bottom_section()

 {

-    if (get_option('geodir_show_author_bottom_section')) { ?>

+	if (get_option('geodir_show_author_bottom_section')) { ?>

         <div

             class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">

             <?php dynamic_sidebar('geodir_author_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3017,23 +3017,23 @@ 
  */

 function geodir_action_search_page_title()

 {

-    $gd_post_type = geodir_get_current_posttype();

-    $post_type_info = get_post_type_object($gd_post_type);

+	$gd_post_type = geodir_get_current_posttype();

+	$post_type_info = get_post_type_object($gd_post_type);

 

-    $pt_name = '';

-    if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

+	$pt_name = '';

+	if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

 

-    if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+	if (is_search()) {

+		$list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

 

-    }

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

-    $class = apply_filters('geodir_page_title_class', 'entry-title fn');

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

-    $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

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

-        apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

+	}

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

+	$class = apply_filters('geodir_page_title_class', 'entry-title fn');

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

+	$class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

+	echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

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

+		apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

 }

 

 // action for adding the listings page top widget area

@@ -3049,11 +3049,11 @@ 
  */

 function geodir_action_geodir_sidebar_search_top()

 {

-    if (get_option('geodir_show_search_top_section')) { ?>

+	if (get_option('geodir_show_search_top_section')) { ?>

         <div

             class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">

             <?php dynamic_sidebar('geodir_search_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3069,7 +3069,7 @@ 
  */

 function geodir_search_left_section()

 {

-    if (get_option('geodir_show_search_left_section')) { ?>

+	if (get_option('geodir_show_search_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_search_left_sidebar'); ?>

         </div><!-- end geodir-content-left -->

@@ -3089,19 +3089,19 @@ 
  */

 function geodir_action_search_sidebar_left()

 {

-    if (get_option('geodir_show_search_left_section')) {

+	if (get_option('geodir_show_search_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

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

-        do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the search page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_search_sidebar_left_inside');

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

-        do_action('geodir_sidebar_left_close', 'search-page');

-    }

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

+		do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the search page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_search_sidebar_left_inside');

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

+		do_action('geodir_sidebar_left_close', 'search-page');

+	}

 }

 

 /**

@@ -3114,7 +3114,7 @@ 
  */

 function geodir_search_right_section()

 {

-    if (get_option('geodir_show_search_right_section')) { ?>

+	if (get_option('geodir_show_search_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_search_right_sidebar'); ?>

         </div><!-- end geodir-content-right -->

@@ -3134,18 +3134,18 @@ 
  */

 function geodir_action_search_sidebar_right()

 {

-    if (get_option('geodir_show_search_right_section')) {

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

-        do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the search page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_search_sidebar_right_inside');

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

-        do_action('geodir_sidebar_right_close', 'search-page');

-    }

+	if (get_option('geodir_show_search_right_section')) {

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

+		do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the search page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_search_sidebar_right_inside');

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

+		do_action('geodir_sidebar_right_close', 'search-page');

+	}

 }

 

 

@@ -3160,11 +3160,11 @@ 
  */

 function geodir_action_sidebar_search_bottom_section()

 {

-    if (get_option('geodir_show_search_bottom_section')) { ?>

+	if (get_option('geodir_show_search_bottom_section')) { ?>

         <div

             class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">

             <?php dynamic_sidebar('geodir_search_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3179,14 +3179,14 @@ 
  */

 function geodir_action_search_content_inside()

 {

-    global $gridview_columns;

-    $listing_view = get_option('geodir_search_view');

-    if (strstr($listing_view, 'gridview')) {

-        $gridview_columns = $listing_view;

-        $listing_view_exp = explode('_', $listing_view);

-        $listing_view = $listing_view_exp[0];

-    }

-    geodir_get_template_part('listing', 'listview');

+	global $gridview_columns;

+	$listing_view = get_option('geodir_search_view');

+	if (strstr($listing_view, 'gridview')) {

+		$gridview_columns = $listing_view;

+		$listing_view_exp = explode('_', $listing_view);

+		$listing_view = $listing_view_exp[0];

+	}

+	geodir_get_template_part('listing', 'listview');

 }

 

 add_action('geodir_search_content_inside', 'geodir_action_search_content_inside', 10);

@@ -3202,22 +3202,22 @@ 
  */

 function geodir_action_search_content()

 {

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

-    do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');

-    echo '<div class="clearfix">';

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

-    do_action('geodir_before_listing');

-    echo '</div>';

-    /**

-     * This is used to add the content to the search page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_search_content_inside');

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

-    do_action('geodir_after_listing');

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

-    do_action('geodir_main_content_close', 'search-page');

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

+	do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');

+	echo '<div class="clearfix">';

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

+	do_action('geodir_before_listing');

+	echo '</div>';

+	/**

+	 * This is used to add the content to the search page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_search_content_inside');

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

+	do_action('geodir_after_listing');

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

+	do_action('geodir_main_content_close', 'search-page');

 }

 

 ###############################################

@@ -3240,11 +3240,11 @@ 
  */

 function geodir_action_geodir_sidebar_home_top()

 {

-    if (get_option('geodir_show_home_top_section')) { ?>

+	if (get_option('geodir_show_home_top_section')) { ?>

         <div

             class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">

             <?php dynamic_sidebar('geodir_home_top'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3260,7 +3260,7 @@ 
  */

 function geodir_home_left_section()

 {

-    if (get_option('geodir_show_home_left_section')) { ?>

+	if (get_option('geodir_show_home_left_section')) { ?>

         <div class="geodir-content-left geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_home_left'); ?>

         </div><!-- end geodir-content-left -->

@@ -3282,19 +3282,19 @@ 
  */

 function geodir_action_home_sidebar_left()

 {

-    if (get_option('geodir_show_home_left_section')) {

+	if (get_option('geodir_show_home_left_section')) {

 // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='')

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

-        do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the home page left sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_home_sidebar_left_inside');

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

-        do_action('geodir_sidebar_left_close', 'home-page');

-    }

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

+		do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the home page left sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_home_sidebar_left_inside');

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

+		do_action('geodir_sidebar_left_close', 'home-page');

+	}

 }

 

 /**

@@ -3307,7 +3307,7 @@ 
  */

 function geodir_home_right_section()

 {

-    if (get_option('geodir_show_home_right_section')) { ?>

+	if (get_option('geodir_show_home_right_section')) { ?>

         <div class="geodir-content-right geodir-sidebar-wrap">

             <?php dynamic_sidebar('geodir_home_right'); ?>

         </div><!-- end geodir-content-right -->

@@ -3328,18 +3328,18 @@ 
  */

 function geodir_action_home_sidebar_right()

 {

-    if (get_option('geodir_show_home_right_section')) {

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

-        do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

-        /**

-         * This is used to add the content to the home page right sidebar (if active).

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_home_sidebar_right_inside');

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

-        do_action('geodir_sidebar_right_close', 'home-page');

-    }

+	if (get_option('geodir_show_home_right_section')) {

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

+		do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');

+		/**

+		 * This is used to add the content to the home page right sidebar (if active).

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_home_sidebar_right_inside');

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

+		do_action('geodir_sidebar_right_close', 'home-page');

+	}

 }

 

 /**

@@ -3350,7 +3350,7 @@ 
  */

 function geodir_action_home_content_inside()

 {

-    dynamic_sidebar('geodir_home_content');

+	dynamic_sidebar('geodir_home_content');

 }

 

 add_action('geodir_home_content_inside', 'geodir_action_home_content_inside', 10);

@@ -3365,28 +3365,28 @@ 
  */

 function geodir_action_home_content()

 {

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

-    do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');

-    /**

-     * This called before the home page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_home_content');

-    /**

-     * This is used to add the content to the home page main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_home_content_inside');

-    /**

-     * This is called after the homepage main content.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_home_content');

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

-    do_action('geodir_main_content_close', 'home-page');

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

+	do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');

+	/**

+	 * This called before the home page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_home_content');

+	/**

+	 * This is used to add the content to the home page main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_home_content_inside');

+	/**

+	 * This is called after the homepage main content.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_home_content');

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

+	do_action('geodir_main_content_close', 'home-page');

 }

 

 add_action('geodir_sidebar_location_bottom_section', 'geodir_action_sidebar_home_bottom_section', 10);

@@ -3401,11 +3401,11 @@ 
  */

 function geodir_action_sidebar_home_bottom_section()

 {

-    if (get_option('geodir_show_home_bottom_section')) { ?>

+	if (get_option('geodir_show_home_bottom_section')) { ?>

         <div

             class="<?php

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

-            echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">

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

+			echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">

             <?php dynamic_sidebar('geodir_home_bottom'); ?>

         </div><!-- clearfix ends here-->

     <?php }

@@ -3433,13 +3433,13 @@ 
  */

 function geodir_filter_listing_page_title($list_title)

 {

-    if (is_search() && trim(get_search_query()) == '') {

-        $gd_post_type = geodir_get_current_posttype();

-        $post_type_info = get_post_type_object($gd_post_type);

+	if (is_search() && trim(get_search_query()) == '') {

+		$gd_post_type = geodir_get_current_posttype();

+		$post_type_info = get_post_type_object($gd_post_type);

 

-        $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

-    }

-    return $list_title;

+		$list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

+	}

+	return $list_title;

 }

 

 add_action('geodir_message_not_found_on_listing', 'geodir_display_message_not_found_on_listing');

@@ -3454,62 +3454,62 @@ 
  * @param string $gd_page The geodirectory page type. Default null.

  */

 function geodir_add_page_content( $position = 'before', $gd_page = '' ) {

-    global $post;

-

-    $gd_page_id = NULL;

-    if ($gd_page == 'home-page' && geodir_is_page('home')) {

-        $gd_page_id = geodir_home_page_id();

-    } else if ($gd_page == 'details-page' && geodir_is_page('preview')) {

-        $gd_page_id = geodir_preview_page_id();

-    } else if ($gd_page == 'add-listing-page' && geodir_is_page('add-listing')) {

-        $gd_page_id = geodir_add_listing_page_id();

-    } else if ($gd_page == 'success-page' && geodir_is_page('listing-success')) {

-        $gd_page_id = geodir_success_page_id();

-    } else if ($gd_page == 'location-page' && geodir_is_page('location')) {

-        $gd_page_id = geodir_location_page_id();

-    } else if ($gd_page == 'info-page' && geodir_is_page('info')) {

-        $gd_page_id = geodir_info_page_id();

-    } else if ($gd_page == 'signup-page' && geodir_is_page('login')) {

-        $gd_page_id = geodir_login_page_id();

-    } else if ($gd_page == 'checkout-page' && geodir_is_page('checkout')) {

-        $gd_page_id = geodir_payment_checkout_page_id();

-    } else if ($gd_page == 'invoices-page' && geodir_is_page('invoices')) {

-        $gd_page_id = geodir_payment_invoices_page_id();

-    }

-

-    if (!$gd_page_id > 0) {

-        return;

-    }

+	global $post;

+

+	$gd_page_id = NULL;

+	if ($gd_page == 'home-page' && geodir_is_page('home')) {

+		$gd_page_id = geodir_home_page_id();

+	} else if ($gd_page == 'details-page' && geodir_is_page('preview')) {

+		$gd_page_id = geodir_preview_page_id();

+	} else if ($gd_page == 'add-listing-page' && geodir_is_page('add-listing')) {

+		$gd_page_id = geodir_add_listing_page_id();

+	} else if ($gd_page == 'success-page' && geodir_is_page('listing-success')) {

+		$gd_page_id = geodir_success_page_id();

+	} else if ($gd_page == 'location-page' && geodir_is_page('location')) {

+		$gd_page_id = geodir_location_page_id();

+	} else if ($gd_page == 'info-page' && geodir_is_page('info')) {

+		$gd_page_id = geodir_info_page_id();

+	} else if ($gd_page == 'signup-page' && geodir_is_page('login')) {

+		$gd_page_id = geodir_login_page_id();

+	} else if ($gd_page == 'checkout-page' && geodir_is_page('checkout')) {

+		$gd_page_id = geodir_payment_checkout_page_id();

+	} else if ($gd_page == 'invoices-page' && geodir_is_page('invoices')) {

+		$gd_page_id = geodir_payment_invoices_page_id();

+	}

+

+	if (!$gd_page_id > 0) {

+		return;

+	}

     

-    $display = 'before';

-    /**

-     * Filter the position to display the page content.

-     *

-     * @since 1.6.3

-     *

-     * @param string $display Position to add the post content.

-     * @param string $gd_page The geodirectory page type.

-     */

-    $display = apply_filters('geodir_add_page_content_position', $display, $gd_page);

-

-    if ($position !== $display) {

-        return;

-    }

-

-    $gd_post = $post;

+	$display = 'before';

+	/**

+	 * Filter the position to display the page content.

+	 *

+	 * @since 1.6.3

+	 *

+	 * @param string $display Position to add the post content.

+	 * @param string $gd_page The geodirectory page type.

+	 */

+	$display = apply_filters('geodir_add_page_content_position', $display, $gd_page);

+

+	if ($position !== $display) {

+		return;

+	}

+

+	$gd_post = $post;

     

-    setup_postdata(get_post($gd_page_id));

+	setup_postdata(get_post($gd_page_id));

 

-    if (get_the_content()) {

-        ?>

+	if (get_the_content()) {

+		?>

         <section class="entry-content clearfix" itemprop="articleBody"><?php the_content(); ?></section>

         <?php

-    }

+	}

 

-    $post = $gd_post;

-    if (!empty($gd_post) && is_object($gd_post)) {

-        setup_postdata($gd_post);

-    }

+	$post = $gd_post;

+	if (!empty($gd_post) && is_object($gd_post)) {

+		setup_postdata($gd_post);

+	}

 

 }

 add_action('geodir_add_page_content', 'geodir_add_page_content', 10, 2);

@@ -3530,13 +3530,13 @@ 
  * @return string Filtered SQL JOIN clause.

  */

 function geodir_previous_next_post_join( $join, $in_same_term, $excluded_terms, $taxonomy, $post ) {

-    global $plugin_prefix;

+	global $plugin_prefix;

 

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

-        $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID";

-    }

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

+		$join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID";

+	}

     

-    return $join;

+	return $join;

 }

 add_filter( 'get_previous_post_join', 'geodir_previous_next_post_join', 10, 5 );

 add_filter( 'get_next_post_join', 'geodir_previous_next_post_join', 10, 5 );

@@ -3558,31 +3558,31 @@ 
  * @return string Filtered SQL WHERE clause.

  */

 function geodir_previous_next_post_where( $where, $in_same_term, $excluded_terms, $taxonomy, $post ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

-        $post_locations = '';

-        $post_locations_var = array();

+	if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+		$post_locations = '';

+		$post_locations_var = array();

         

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

-            $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->country_slug . "]";

-        }

-

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

-            $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->region_slug . "],%";

-        }

-

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

-            $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "[" . $post->city_slug . "],%";

-        }

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

+			$post_locations .= " AND post_locations LIKE %s";

+			$post_locations_var[] = "%,[" . $post->country_slug . "]";

+		}

+

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

+			$post_locations .= " AND post_locations LIKE %s";

+			$post_locations_var[] = "%,[" . $post->region_slug . "],%";

+		}

+

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

+			$post_locations .= " AND post_locations LIKE %s";

+			$post_locations_var[] = "[" . $post->city_slug . "],%";

+		}

         

-        $where .= $wpdb->prepare( $post_locations, $post_locations_var );

-    }

+		$where .= $wpdb->prepare( $post_locations, $post_locations_var );

+	}

     

-    return $where;

+	return $where;

 }

 add_filter( 'get_previous_post_where', 'geodir_previous_next_post_where', 10, 5 );

 add_filter( 'get_next_post_where', 'geodir_previous_next_post_where', 10, 5 );
\ No newline at end of file

Spacing +186 added lines, -186 removed lines

@@ -283,7 +283,7 @@ 
 

     //php

     if (!empty($tc['geodir_theme_compat_code'])) {

-        include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');

+        include_once('geodirectory-functions/compatibility/'.$tc['geodir_theme_compat_code'].'.php');

     }

 

     //geodir_full_page_class

@@ -453,13 +453,13 @@ 
 function geodir_action_wrapper_content_open($type = '', $id = '', $class = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -573,13 +573,13 @@ 
 function geodir_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -677,7 +677,7 @@ 
         }

     }

 

-    $post = (object)$_REQUEST;

+    $post = (object) $_REQUEST;

 

 

     if (isset($post->video)) {

@@ -736,10 +736,10 @@ 
 

     $json = '{';

     $json .= '"post_preview": "1",';

-    $json .= '"t": "' . $json_title . '",';

-    $json .= '"lt": "' . $post_latitude . '",';

-    $json .= '"ln": "' . $post_longitude . '",';

-    $json .= '"i":"' . $term_icon . '"';

+    $json .= '"t": "'.$json_title.'",';

+    $json .= '"lt": "'.$post_latitude.'",';

+    $json .= '"ln": "'.$post_longitude.'",';

+    $json .= '"i":"'.$term_icon.'"';

     $json .= '}';

 

     $post->marker_json = $json;

@@ -966,7 +966,7 @@ 
      * @param string $class The class to use. Default is 'entry-header'.

      */

     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>';

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.stripslashes(get_the_title()).'</h1></header>';

 }

 

 

@@ -1004,7 +1004,7 @@ 
     $package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : ''));

     $image_limit = '';

     if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {

-        $image_limit = (int)$package_info->image_limit;

+        $image_limit = (int) $package_info->image_limit;

     }

 

     if ($preview) {

@@ -1020,7 +1020,7 @@ 
 

         if (!empty($post_images)) {

             foreach ($post_images as $image) {

-                if ($image_limit !== '' && ($slides+1) > $image_limit) {

+                if ($image_limit !== '' && ($slides + 1) > $image_limit) {

                      break;

                 }

                 if (!empty($image)) {

@@ -1029,7 +1029,7 @@ 
                     $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0;

 

                     if ($image && $width && $height) {

-                        $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

+                        $image = (object) array('src' => $image, 'width' => $width, 'height' => $height);

                     }

 

                     if (isset($image->src)) {

@@ -1041,9 +1041,9 @@ 
 

                         $image_title = isset($image->title) ? $image->title : '';

 

-                        $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                        $main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>';

-                        $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>';

+                        $main_slides .= '<li><img src="'.geodir_plugin_url()."/geodirectory-assets/images/spacer.gif".'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:'.$spacer_height.'px;margin:0 auto;" />';

+                        $main_slides .= '<img src="'.$image->src.'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:400px;margin:0 auto;" /></li>';

+                        $nav_slides .= '<li><img src="'.$image->src.'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:48px;margin:0 auto;" /></li>';

                         $slides++;

                     }

                 }

@@ -1064,7 +1064,7 @@ 
 

         if (!empty($post_images)) {

             foreach ($post_images as $image) {

-                if ($image_limit !== '' && ($slides+1) > $image_limit) {

+                if ($image_limit !== '' && ($slides + 1) > $image_limit) {

                      break;

                 }

                 if ($image->height >= 400) {

@@ -1073,9 +1073,9 @@ 
                     $spacer_height = ((400 - $image->height) / 2);

                 }

 

-                $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

-                $main_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

-                $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

+                $caption = ''; //(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

+                $main_slides .= '<li><img src="'.$image->src.'" alt="'.$image->title.'" title="'.$image->title.'" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

+                $nav_slides .= '<li><img src="'.$image->src.'" alt="'.$image->title.'" title="'.$image->title.'" style="max-height:48px;margin:0 auto;" /></li>';

                 $slides++;

             }

         }// endfore

@@ -1110,7 +1110,7 @@ 
  */

 function geodir_action_details_taxonomies()

 {

-    global $preview, $post;?>

+    global $preview, $post; ?>

     <p class="geodir_post_taxomomies clearfix">

     <?php

     $taxonomies = array();

@@ -1119,11 +1119,11 @@ 
 

     if ($preview && !$is_backend_preview) {

         $post_type = $post->listing_type;

-        $post_taxonomy = $post_type . 'category';

+        $post_taxonomy = $post_type.'category';

         $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];

     } else {

         $post_type = $post->post_type;

-        $post_taxonomy = $post_type . 'category';

+        $post_taxonomy = $post_type.'category';

     }

 //{	

     $post_type_info = get_post_type_object($post_type);

@@ -1131,7 +1131,7 @@ 
 

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

 

-        if (taxonomy_exists($post_type . '_tags')):

+        if (taxonomy_exists($post_type.'_tags')):

             $links = array();

             $terms = array();

             // to limit post tags

@@ -1158,8 +1158,8 @@ 
                 $post_term = trim($post_term);

 

                 $priority_location = false;

-                if ($insert_term = term_exists($post_term, $post_type . '_tags')) {

-                    $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');

+                if ($insert_term = term_exists($post_term, $post_type.'_tags')) {

+                    $term = get_term_by('id', $insert_term['term_id'], $post_type.'_tags');

                 } else {

                     $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL;

                     $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL;

@@ -1169,10 +1169,10 @@ 
                     $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false;

                     if ($match_country || $match_region || $match_city) {

                         $priority_location = true;

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

+                        $term = get_term_by('name', $post_term, $post_type.'_tags');

                     } else {

-                        $insert_term = wp_insert_term($post_term, $post_type . '_tags');

-                        $term = get_term_by('name', $post_term, $post_type . '_tags');

+                        $insert_term = wp_insert_term($post_term, $post_type.'_tags');

+                        $term = get_term_by('name', $post_term, $post_type.'_tags');

                     }

                 }

 

@@ -1189,12 +1189,12 @@ 
                          * @param string $tag_link The tag link html.

                          * @param object $term The tag term object.

                          */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     } else {

-                        $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

+                        $tag_link = "<a href='".esc_attr(get_term_link($term->term_id, $term->taxonomy))."'>$term->name</a>";

                         /** This action is documented in geodirectory-template_actions.php */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     }

                     $terms[] = $term;

@@ -1204,7 +1204,7 @@ 
             if (!isset($listing_label)) {

                 $listing_label = '';

             }

-            $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+            $taxonomies[$post_type.'_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);

         endif;

 

     }

@@ -1232,7 +1232,7 @@ 
                     $term = get_term_by('id', $post_term, $post_taxonomy);

 

                     if (is_object($term)) {

-                        $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>";

+                        $term_link = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>$term->name</a>";

                         /**

                          * Filter the category name on the details page.

                          *

@@ -1240,7 +1240,7 @@ 
                          * @param string $term_link The link html to the category.

                          * @param object $term The category term object.

                          */

-                        $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

+                        $term_link = apply_filters('geodir_details_taxonomies_cat_link', $term_link, $term);

                         $links[] = $term_link;

                         $terms[] = $term;

                     }

@@ -1258,7 +1258,7 @@ 
         if (!isset($listing_label)) {

             $listing_label = '';

         }

-        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);

+        $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);

 

     }

 

@@ -1271,14 +1271,14 @@ 
      * @param string $listing_label The post type label.

      * @param string $listing_label The post type label with ucwords function.

      */

-    $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));

+    $taxonomies = apply_filters('geodir_details_taxonomies_output', $taxonomies, $post_type, $listing_label, geodir_ucwords($listing_label));

 

     if (isset($taxonomies[$post_taxonomy])) {

-        echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

+        echo '<span class="geodir-category">'.$taxonomies[$post_taxonomy].'</span>';

     }

 

-    if (isset($taxonomies[$post_type . '_tags']))

-        echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

+    if (isset($taxonomies[$post_type.'_tags']))

+        echo '<span class="geodir-tags">'.$taxonomies[$post_type.'_tags'].'</span>';

 

     ?>

     </p><?php

@@ -1299,11 +1299,11 @@ 
  * @param object $post Optional. The post object or blank.

  * @package GeoDirectory

  */

-function geodir_action_details_micordata($post='')

+function geodir_action_details_micordata($post = '')

 {

 

     global $preview;

-    if(empty($post)){global $post;}

+    if (empty($post)) {global $post; }

     if ($preview || !geodir_is_page('detail')) {

         return;

     }

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

         foreach ($post_reviews as $review) {

 

-            if($rating_value = geodir_get_commentoverall($review->comment_ID)){

+            if ($rating_value = geodir_get_commentoverall($review->comment_ID)) {

                 $reviews[] = array(

                     "@type" => "Review",

                     "author" => $review->comment_author,

@@ -1326,7 +1326,7 @@ 
                     "description" => $review->comment_content,

                     "reviewRating" => array(

                         "@type" => "Rating",

-                        "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

+                        "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

                         "ratingValue" => $rating_value,

                         "worstRating" => "1"

                     )

@@ -1356,13 +1356,13 @@ 
     }

     //print_r($post);

     // external links

-    $external_links =  array();

+    $external_links = array();

     $external_links[] = $post->geodir_website;

     $external_links[] = $post->geodir_twitter;

     $external_links[] = $post->geodir_facebook;

     $external_links = array_filter($external_links);

 

-    if(!empty($external_links)){

+    if (!empty($external_links)) {

         $external_links = array_values($external_links);

     }

 

@@ -1372,17 +1372,17 @@ 
 

     // schema type

     $schema_type = 'LocalBusiness';

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

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

         $cat_schema = geodir_get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

-        if($cat_schema){$schema_type = $cat_schema;}

-        if(!$cat_schema && $schema_type=='LocalBusiness' && $post->post_type=='gd_event'){$schema_type = 'Event';}

+        if ($cat_schema) {$schema_type = $cat_schema; }

+        if (!$cat_schema && $schema_type == 'LocalBusiness' && $post->post_type == 'gd_event') {$schema_type = 'Event'; }

     }

 

     $schema = array();

     $schema['@context'] = "https://schema.org";

     $schema['@type'] = $schema_type;

     $schema['name'] = $post->post_title;

-    $schema['description'] = wp_strip_all_tags( $post->post_content, true );

+    $schema['description'] = wp_strip_all_tags($post->post_content, true);

     $schema['telephone'] = $post->geodir_contact;

     $schema['url'] = $c_url;

     $schema['sameAs'] = $external_links;

@@ -1396,7 +1396,7 @@ 
         "postalCode" => $post->post_zip

     );

 

-    if($post->post_latitude && $post->post_longitude) {

+    if ($post->post_latitude && $post->post_longitude) {

         $schema['geo'] = array(

             "@type" => "GeoCoordinates",

             "latitude" => $post->post_latitude,

@@ -1404,7 +1404,7 @@ 
         );

     }

 

-    if($post_avgratings) {

+    if ($post_avgratings) {

         $schema['aggregateRating'] = array(

             "@type" => "AggregateRating",

             "ratingValue" => $post_avgratings,

@@ -1423,10 +1423,10 @@ 
      * @param array $schema The array of schema data to be filtered.

      * @param object $post The post object.

      */

-    $schema = apply_filters('geodir_details_schema', $schema,$post);

+    $schema = apply_filters('geodir_details_schema', $schema, $post);

 

 

-    echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

+    echo '<script type="application/ld+json">'.json_encode($schema).'</script>';

 

 

     $uploads = wp_upload_dir();

@@ -1439,7 +1439,7 @@ 
      * @param string $facebook_og The open graph html to be filtered.

      * @param object $post The post object.

      */

-    echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);

+    echo apply_filters('geodir_details_facebook_og', $facebook_og, $post);

 

 

 

@@ -1462,9 +1462,9 @@ 
     ?>

     <div class="geodir-pos_navigation clearfix">

     <div

-        class="geodir-post_left"><?php previous_post_link('%link', '' . __('Previous', 'geodirectory'), false) ?></div>

+        class="geodir-post_left"><?php previous_post_link('%link', ''.__('Previous', 'geodirectory'), false) ?></div>

     <div

-        class="geodir-post_right"><?php next_post_link('%link', __('Next', 'geodirectory') . '', false) ?></div>

+        class="geodir-post_right"><?php next_post_link('%link', __('Next', 'geodirectory').'', false) ?></div>

     </div><?php

 }

 

@@ -1533,12 +1533,12 @@ 
     $gd_post_type = geodir_get_current_posttype();

     $post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

+    $add_string_in_title = __('All', 'geodirectory').' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+        $add_string_in_title = __('My Favorite', 'geodirectory').' ';

     }

 

-    $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory');

+    $list_title = $add_string_in_title.__($post_type_info->labels->name, 'geodirectory');

     $single_name = $post_type_info->labels->singular_name;

 

     $taxonomy = geodir_get_taxonomies($gd_post_type, true);

@@ -1566,12 +1566,12 @@ 
         $current_term = get_term_by('slug', $term, $taxonomy[0]);

         if (!empty($current_term)) {

             $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

-            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+            if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type.'category') {

                 $location_last_char = substr($location_name, -1);

                 $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+                $list_title .= __(' in', 'geodirectory').' '.$location_name.$location_name_attach.' '.$current_term_name;

             } else {

-                $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+                $list_title .= __(' in', 'geodirectory')." '".$current_term_name."'";

             }

         } else {

             if (count($taxonomy) > 1) {

@@ -1579,12 +1579,12 @@ 
 

                 if (!empty($current_term)) {

                     $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory');

-                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {

+                    if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type.'category') {

                         $location_last_char = substr($location_name, -1);

                         $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');

-                        $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;

+                        $list_title .= __(' in', 'geodirectory').' '.$location_name.$location_name_attach.' '.$current_term_name;

                     } else {

-                        $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";

+                        $list_title .= __(' in', 'geodirectory')." '".$current_term_name."'";

                     }

                 }

             }

@@ -1612,7 +1612,7 @@ 
                 $gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_city."'";

         } else if ($gd_region != '') {

             if ($gd_region_actual != '') {

                 $gd_region = $gd_region_actual;

@@ -1622,7 +1622,7 @@ 
                 $gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_region."'";

         } else if ($gd_country != '') {

             if ($gd_country_actual != '') {

                 $gd_country = $gd_country_actual;

@@ -1632,12 +1632,12 @@ 
                 $gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

             }

 

-            $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";

+            $list_title .= __(' in', 'geodirectory')." '".$gd_country."'";

         }

     }

 

     if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

     }

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

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

@@ -1647,26 +1647,26 @@ 
 

     $title = $list_title;

     $gd_page = '';

-    if(geodir_is_page('pt')){

+    if (geodir_is_page('pt')) {

         $gd_page = 'pt';

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

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

     }

-    elseif(geodir_is_page('listing')){

+    elseif (geodir_is_page('listing')) {

         $gd_page = 'listing';

         global $wp_query;

         $current_term = $wp_query->get_queried_object();

-        if (strpos($current_term->taxonomy,'_tags') !== false) {

+        if (strpos($current_term->taxonomy, '_tags') !== false) {

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

-        }else{

+        } else {

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

         }

 

     }

-    elseif(geodir_is_page('author')){

+    elseif (geodir_is_page('author')) {

         $gd_page = 'author';

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

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -1680,16 +1680,16 @@ 
      * @param string $title The page title including variables.

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

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

         /**

          * Filter the listing page title.

          *

          * @since 1.0.0

          * @param string $list_title The title for the category page.

          */

-        apply_filters('geodir_listing_page_title', $title) . '</h1></header>';

+        apply_filters('geodir_listing_page_title', $title).'</h1></header>';

 }

 

 add_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);

@@ -1708,16 +1708,16 @@ 
     $gd_post_type = geodir_get_current_posttype();

     if (isset($current_term->term_id) && $current_term->term_id != '') {

 

-        $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags');

+        $term_desc = term_description($current_term->term_id, $gd_post_type.'_tags');

         $saved_data = stripslashes(geodir_get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type));

         if ($term_desc && !$saved_data) {

             $saved_data = $term_desc;

         }

 

         // stop payment manager filtering content length

-        $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' );

-        if ( false !== $filter_priority ) {

-            remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+        $filter_priority = has_filter('the_content', 'geodir_payments_the_content');

+        if (false !== $filter_priority) {

+            remove_filter('the_content', 'geodir_payments_the_content', $filter_priority);

         }

 

         /**

@@ -1731,14 +1731,14 @@ 
         $cat_description = apply_filters('the_content', $saved_data);

 

 

-        if ( false !== $filter_priority ) {

-            add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority );

+        if (false !== $filter_priority) {

+            add_filter('the_content', 'geodir_payments_the_content', $filter_priority);

         }

 

         if ($cat_description) {

             ?>

 

-            <div class="term_description"><?php echo $cat_description;?></div> <?php

+            <div class="term_description"><?php echo $cat_description; ?></div> <?php

         }

 

     }

@@ -1788,13 +1788,13 @@ 
 function geodir_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '')

 {

     if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {

-        $width_css = 'style="width:' . $width . '%;"';

+        $width_css = 'style="width:'.$width.'%;"';

     } else {

         $width_css = '';

     }

@@ -2099,11 +2099,11 @@ 
 

     $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

 

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

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

         $gd_page = 'add-listing';

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

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

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

-        }elseif(isset($listing_type)){

+        }elseif (isset($listing_type)) {

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

         }

 

@@ -2117,9 +2117,9 @@ 
      * @param string $title The page title including variables.

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

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">';

     echo $title;

     echo '</h1></header>';

 }

@@ -2133,7 +2133,7 @@ 
  */

 function geodir_action_add_listing_page_mandatory()

 {?>

-    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT;?></p>

+    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT; ?></p>

 <?php

 }

 

@@ -2168,7 +2168,7 @@ 
 

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

         global $post;

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

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

         $listing_type = $post->listing_type;

         $title = $post->post_title;

         $desc = $post->post_desc;

@@ -2183,7 +2183,7 @@ 
         $thumb_img_arr = geodir_get_images($post->ID);

         if ($thumb_img_arr) {

             foreach ($thumb_img_arr as $post_img) {

-                $curImages .= $post_img->src . ',';

+                $curImages .= $post_img->src.',';

             }

         }

 

@@ -2191,7 +2191,7 @@ 
         $title = $post->post_title;

         $desc = $post->post_content;

         $kw_tags = $post->post_tags;

-        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));

+        $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type.'_tags', array('fields' => 'names')));

     } else {

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

     }

@@ -2202,20 +2202,20 @@ 
 

     $post_type_info = geodir_get_posttype_info($listing_type);

 

-    $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');

+    $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing', 'geodirectory');

     

     $package_info = array();

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

     ?>

-    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>" method="post" enctype="multipart/form-data">

-        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/>

-        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/>

+    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id()); ?>" method="post" enctype="multipart/form-data">

+        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type); ?>"/>

+        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type); ?>"/>

         <?php if ($page_id) { ?>

-        <input type="hidden" name="add_listing_page_id" value="<?php echo $page_id;?>"/>

+        <input type="hidden" name="add_listing_page_id" value="<?php echo $page_id; ?>"/>

         <?php } if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { ?>

-            <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']);?>"/>

+            <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']); ?>"/>

         <?php } if (isset($_REQUEST['backandedit'])) { ?>

-            <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/>

+            <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']); ?>"/>

         <?php

         } 

         /**

@@ -2227,7 +2227,7 @@ 
          */

         do_action('geodir_before_detail_fields');

         ?>

-        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5>

+        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT; ?></h5>

         <?php

         /**

          * Called at the top of the add listing page form for frontend.

@@ -2248,10 +2248,10 @@ 
                  * @param string $cpt_singular_name The singular title of the curent CPT.

                  * @param string $listing_type The CPT being requested. ie: gd_place.

                  */

-                echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>

+                echo apply_filters('geodir_add_listing_title_label', sprintf(__('%s Title', 'geodirectory'), $cpt_singular_name), $cpt_singular_name, $listing_type); ?><span>*</span> </label>

             <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield"

                    value="<?php echo esc_attr(stripslashes($title)); ?>"/>

-            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

         </div>

         <?php

         $show_editor = get_option('geodir_tiny_editor_on_add_listing');

@@ -2297,7 +2297,7 @@ 
         $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);

         

         $desc_class = '';

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

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

             /**

              * Called on the add listing page form for frontend just before the description field.

              *

@@ -2310,7 +2310,7 @@ 
             $desc_class = ' hidden';

         }

         ?>

-        <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>">

+        <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class; ?>">

             <label><?php

                 /**

                  * Filter the add listing page description input label.

@@ -2320,7 +2320,7 @@ 
                  * @param string $cpt_singular_name The singular title of the curent CPT.

                  * @param string $listing_type The CPT being requested. ie: gd_place.

                  */

-                echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

+                echo apply_filters('geodir_add_listing_description_label', sprintf(__('%s Description', 'geodirectory'), $cpt_singular_name), $cpt_singular_name, $listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>

             <?php

             if ($show_editor) {

                 $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

@@ -2329,16 +2329,16 @@ 
                     <?php wp_editor($desc, "post_desc", $editor_settings); ?>

                 </div>

             <?php if ($desc_limit != '') { ?>

-                <script type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit;?>");</script>

+                <script type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit; ?>");</script>

             <?php } } else { ?>

                 <textarea field_type="textarea" name="post_desc" id="post_desc" class="geodir_textarea" maxlength="<?php echo $desc_limit; ?>"><?php echo $desc; ?></textarea>

             <?php } if ($desc_limit_msg != '') { ?>

                 <span class="geodir_message_note"><?php echo $desc_limit_msg; ?></span>

             <?php } ?>

-            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory'); ?></span>

         </div>

         <?php

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

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

             /**

              * Called on the add listing page form for frontend just after the description field.

              *

@@ -2377,7 +2377,7 @@ 
         $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);

         

         $tags_class = '';

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

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

             /**

              * Called on the add listing page form for frontend just before the tags field.

              *

@@ -2388,14 +2388,14 @@ 
             $tags_class = ' hidden';

         }

         ?>

-        <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>">

+        <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class; ?>">

             <label><?php echo TAGKW_TEXT; ?></label>

             <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield"

-                   maxlength="<?php echo $kw_tags_count;?>"/>

-            <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span>

+                   maxlength="<?php echo $kw_tags_count; ?>"/>

+            <span class="geodir_message_note"><?php echo $kw_tags_msg; ?></span>

         </div>

         <?php

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

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

             /**

              * Called on the add listing page form for frontend just after the tags field.

              *

@@ -2421,7 +2421,7 @@ 
         $thumb_img_arr = array();

         $totImg = 0;

         if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

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

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

             if (isset($post->post_images))

                 $curImages = trim($post->post_images, ",");

 

@@ -2434,7 +2434,7 @@ 
             $listing_type = $post->listing_type;

 

         } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

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

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

             $listing_type = $post->post_type;

             $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

 

@@ -2448,7 +2448,7 @@ 
                 //$curImages = $img->src.",";

             }

 

-            $totImg = count((array)$thumb_img_arr);

+            $totImg = count((array) $thumb_img_arr);

         }

 

         if ($curImages != '')

@@ -2469,15 +2469,15 @@ 
         if ($show_image_input_box) {

             ?>

 

-            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?>

+            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT; ?>

                 <?php if ($image_limit == 1) {

-                    echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+                    echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';

                 } ?>

                 <?php if ($image_limit > 1) {

-                    echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+                    echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';

                 } ?>

                 <?php if ($image_limit == '') {

-                    echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+                    echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';

                 } ?>

             </h5>

 

@@ -2492,11 +2492,11 @@ 
                 <div

                     class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

                     id="<?php echo $id; ?>plupload-upload-ui">

-                    <h4><?php _e('Drop files to upload', 'geodirectory');?></h4><br/>

+                    <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4><br/>

                     <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                            value="<?php esc_attr_e('Select Files', 'geodirectory'); ?>" class="geodir_button"/>

                     <span class="ajaxnonceplu"

-                          id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>

+                          id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span>

                     <?php if ($width && $height): ?>

                         <span class="plupload-resize"></span>

                         <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span>

@@ -2509,7 +2509,7 @@ 
                      id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">

                 </div>

                 <span

-                    id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>

+                    id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>

                 <span id="<?php echo $id; ?>upload-error" style="display:none"></span>

             </div>

 

@@ -2521,7 +2521,7 @@ 
          *

          * @since 1.0.0

          */

-        do_action('geodir_after_main_form_fields');?>

+        do_action('geodir_after_main_form_fields'); ?>

 

 

         <!-- add captcha code -->

@@ -2532,7 +2532,7 @@ 
         </script>

         <noscript>

             <div>

-                <label><?php _e('Type 64 into this box', 'geodirectory');?></label>

+                <label><?php _e('Type 64 into this box', 'geodirectory'); ?></label>

                 <input type="text" id="geodir_spamblocker_top_form" name="geodir_spamblocker" value="" maxlength="10"/>

             </div>

         </noscript>

@@ -2542,10 +2542,10 @@ 
         <!-- end captcha code -->

 

         <div id="geodir-add-listing-submit" class="geodir_form_row clear_both" style="padding:2px;text-align:center;">

-            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON;?>"

-                   class="geodir_button" <?php echo $submit_button;?>/>

+            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON; ?>"

+                   class="geodir_button" <?php echo $submit_button; ?>/>

             <span class="geodir_message_note"

-                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory');?></span>

+                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory'); ?></span>

         </div>

 

     </form>

@@ -2607,7 +2607,7 @@ 
         class="<?php

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

         echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

-        <?php dynamic_sidebar('Reg/Login Top Section');?>

+        <?php dynamic_sidebar('Reg/Login Top Section'); ?>

     </div><!-- clearfix ends here-->

 <?php

 }

@@ -2627,11 +2627,11 @@ 
 

     global $user_login;

     

-    $is_enable_signup = get_option( 'users_can_register' );

+    $is_enable_signup = get_option('users_can_register');

     

     ?>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2648,7 +2648,7 @@ 
         <?php } ?>

     </script>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2673,7 +2673,7 @@ 
         foreach ($errors as $errorsObj) {

             foreach ($errorsObj as $key => $val) {

                 for ($i = 0; $i < count($val); $i++) {

-                    echo "<div class=error_msg_fix>" . $val[$i] . '</div>';

+                    echo "<div class=error_msg_fix>".$val[$i].'</div>';

                     $registration_error_msg = 1;

                 }

             }

@@ -2690,10 +2690,10 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/login_frm.php"); ?>

         </div>

 

-    <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup ) { ?>

+    <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup) { ?>

 

         <div class="registration_form">

             <?php

@@ -2702,7 +2702,7 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/reg_frm.php"); ?>

         </div>

 

     <?php } else { ?>

@@ -2714,10 +2714,10 @@ 
              *

              * @since 1.0.0

              */

-            include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?>

+            include(geodir_plugin_path()."/geodirectory-templates/login_frm.php"); ?>

         </div>

         

-        <?php if ( $is_enable_signup ) { ?>

+        <?php if ($is_enable_signup) { ?>

             <div class="registration_form_r">

                 <?php

                 /**

@@ -2725,7 +2725,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?>

+                include(geodir_plugin_path()."/geodirectory-templates/reg_frm.php"); ?>

             </div>

         <?php } ?>

 

@@ -2762,12 +2762,12 @@ 
     $gd_post_type = geodir_get_current_posttype();

     $post_type_info = get_post_type_object($gd_post_type);

 

-    $add_string_in_title = __('All', 'geodirectory') . ' ';

+    $add_string_in_title = __('All', 'geodirectory').' ';

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

-        $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';

+        $add_string_in_title = __('My Favorite', 'geodirectory').' ';

     }

 

-    $list_title = $add_string_in_title . $post_type_info->labels->name;

+    $list_title = $add_string_in_title.$post_type_info->labels->name;

     $single_name = $post_type_info->labels->singular_name;

 

     $taxonomy = geodir_get_taxonomies($gd_post_type);

@@ -2775,12 +2775,12 @@ 
     if (!empty($term)) {

         $current_term = get_term_by('slug', $term, $taxonomy[0]);

         if (!empty($current_term))

-            $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

+            $list_title .= __(' in', 'geodirectory')." '".geodir_ucwords($current_term->name)."'";

     }

 

 

     if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__($post_type_info->labels->name, 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

 

     }

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

@@ -2789,11 +2789,11 @@ 
     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

 

     $title = $list_title;

-    if(geodir_is_page('author')){

+    if (geodir_is_page('author')) {

         $gd_page = 'author';

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

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -2807,16 +2807,16 @@ 
      * @param string $title The page title including variables.

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

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

         /**

          * Filter the author page title text.

          *

          * @since 1.0.0

          * @param string $list_title The title for the page.

          */

-        apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';

+        apply_filters('geodir_author_page_title_text', $title).'</h1></header>';

 }

 

 

@@ -3021,19 +3021,19 @@ 
     $post_type_info = get_post_type_object($gd_post_type);

 

     $pt_name = '';

-    if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

+    if (isset($post_type_info->labels->name)) {$pt_name = $post_type_info->labels->name; }

 

     if (is_search()) {

-        $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

+        $list_title = __('Search', 'geodirectory').' '.__($pt_name, 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";

 

     }

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

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

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

     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

-    echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

+    echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.

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

-        apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';

+        apply_filters('geodir_listing_page_title', wptexturize($list_title)).'</h1></header>';

 }

 

 // action for adding the listings page top widget area

@@ -3437,7 +3437,7 @@ 
         $gd_post_type = geodir_get_current_posttype();

         $post_type_info = get_post_type_object($gd_post_type);

 

-        $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');

+        $list_title = __('Search', 'geodirectory').' '.__(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory').__(' :', 'geodirectory');

     }

     return $list_title;

 }

@@ -3453,7 +3453,7 @@ 
  * @param string $position Position to add the post content. 'before' or 'after'. Default 'before'.

  * @param string $gd_page The geodirectory page type. Default null.

  */

-function geodir_add_page_content( $position = 'before', $gd_page = '' ) {

+function geodir_add_page_content($position = 'before', $gd_page = '') {

     global $post;

 

     $gd_page_id = NULL;

@@ -3529,17 +3529,17 @@ 
  * @param WP_Post $post           WP_Post object.

  * @return string Filtered SQL JOIN clause.

  */

-function geodir_previous_next_post_join( $join, $in_same_term, $excluded_terms, $taxonomy, $post ) {

+function geodir_previous_next_post_join($join, $in_same_term, $excluded_terms, $taxonomy, $post) {

     global $plugin_prefix;

 

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

-        $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID";

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

+        $join .= " INNER JOIN ".$plugin_prefix.$post->post_type."_detail AS gd ON gd.post_id = p.ID";

     }

     

     return $join;

 }

-add_filter( 'get_previous_post_join', 'geodir_previous_next_post_join', 10, 5 );

-add_filter( 'get_next_post_join', 'geodir_previous_next_post_join', 10, 5 );

+add_filter('get_previous_post_join', 'geodir_previous_next_post_join', 10, 5);

+add_filter('get_next_post_join', 'geodir_previous_next_post_join', 10, 5);

 

 /**

  * Filters the WHERE clause in the SQL for an adjacent post query.

@@ -3557,32 +3557,32 @@ 
  * @param WP_Post $post          WP_Post object.

  * @return string Filtered SQL WHERE clause.

  */

-function geodir_previous_next_post_where( $where, $in_same_term, $excluded_terms, $taxonomy, $post ) {

+function geodir_previous_next_post_where($where, $in_same_term, $excluded_terms, $taxonomy, $post) {

     global $wpdb, $plugin_prefix;

 

-    if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+    if (!empty($post->post_type) && (!empty($post->country_slug) || !empty($post->region_slug) || !empty($post->city_slug)) && in_array($post->post_type, geodir_get_posttypes())) {

         $post_locations = '';

         $post_locations_var = array();

         

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

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

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->country_slug . "]";

+            $post_locations_var[] = "%,[".$post->country_slug."]";

         }

 

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

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

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "%,[" . $post->region_slug . "],%";

+            $post_locations_var[] = "%,[".$post->region_slug."],%";

         }

 

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

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

             $post_locations .= " AND post_locations LIKE %s";

-            $post_locations_var[] = "[" . $post->city_slug . "],%";

+            $post_locations_var[] = "[".$post->city_slug."],%";

         }

         

-        $where .= $wpdb->prepare( $post_locations, $post_locations_var );

+        $where .= $wpdb->prepare($post_locations, $post_locations_var);

     }

     

     return $where;

 }

-add_filter( 'get_previous_post_where', 'geodir_previous_next_post_where', 10, 5 );

-add_filter( 'get_next_post_where', 'geodir_previous_next_post_where', 10, 5 );
\ No newline at end of file
+add_filter('get_previous_post_where', 'geodir_previous_next_post_where', 10, 5);

+add_filter('get_next_post_where', 'geodir_previous_next_post_where', 10, 5);
\ No newline at end of file